Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

2651 files changed, 74771 insertions, 41601 deletions

diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s
deleted file mode 100644
index f82a657b9..000000000
--- a/data/battle_anim_80A9C70.s
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "constants/battle_anim.h"
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-
-    .align 2
-gUnknown_0853EDE4:: @ 853EDE4
-	.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0xfffe, 0x0000
-
-    .align 2
-gUnknown_0853EDF8:: @ 853EDF8
-	.4byte gUnknown_0853EDE4
-
-    .align 2
-gUnknown_0853EDFC:: @ 853EDFC
-	spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
-	spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C
-
-    .align 2
-gUnknown_0853EE2C:: @ 853EE2C
-	.2byte 0x0000, 0x0003, 0xfffe, 0x0000
-
-    .align 2
-gUnknown_0853EE34:: @ 853EE34
-	.4byte gUnknown_0853EE2C
-
-    .align 2
-gUnknown_0853EE38:: @ 853EE38
-	spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
-	
-	.align 2
-gUnknown_0853EE50:: @ 853EE50
-	spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
-
-    .align 2
-gUnknown_0853EE68:: @ 853EE68
-	.2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0040, 0x0003, 0xffff, 0x0000
-
-    .align 2
-gUnknown_0853EE80:: @ 853EE80
-	.4byte gUnknown_0853EE68
-
-    .align 2
-gUnknown_0853EE84:: @ 853EE84
-	spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64
-	spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
-
-    .align 2
-gUnknown_0853EEB4:: @ 853EEB4
-	.2byte 0x0000, 0x0005, 0xfffe, 0x0000
-
-    .align 2
-gUnknown_0853EEBC:: @ 853EEBC
-	.2byte 0x0000, 0x0005, 0xfffe, 0x0000
-
-    .align 2
-gUnknown_0853EEC4:: @ 853EEC4
-	.2byte 0x0000, 0x0005, 0xfffe, 0x0000
-
-    .align 2
-gUnknown_0853EECC:: @ 853EECC
-	.4byte gUnknown_0853EEB4
-	.4byte gUnknown_0853EEBC
-	.4byte gUnknown_0853EEC4
-
-    .align 2
-gUnknown_0853EED8:: @ 853EED8
-	spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
-
-    .align 2
-gUnknown_0853EEF0:: @ 853EEF0
-	.2byte 0x0000, 0x000f, 0xfffe, 0x0000
-
-    .align 2
-gUnknown_0853EEF8:: @ 853EEF8
-	.4byte gUnknown_0853EEF0
-
-    .align 2
-gUnknown_0853EEFC:: @ 853EEFC
-	.2byte 0x0060, 0x0060, 0x0000, 0x0000, 0x0002, 0x0002, 0x0100, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
-
-    .align 2
-gUnknown_0853EF14:: @ 853EF14
-	.4byte gUnknown_0853EEFC
-
-    .align 2
-gUnknown_0853EF18:: @ 853EF18
-	spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 8ddf56ef8..b0c753752 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2538,7 +2538,7 @@ BattleScript_EffectImprison::
 	attackcanceler
 	attackstring
 	ppreduce
-	tryimprision BattleScript_ButItFailed
+	tryimprison BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	printstring STRINGID_PKMNSEALEDOPPONENTMOVE
@@ -3684,11 +3684,11 @@ BattleScript_MoveUsedIsImprisoned::
 	waitmessage 0x40
 	goto BattleScript_MoveEnd
 
-BattleScript_SelectingImprisionedMove::
+BattleScript_SelectingImprisonedMove::
 	printselectionstring STRINGID_PKMNCANTUSEMOVESEALED
 	endselectionscript
 
-BattleScript_SelectingImprisionedMoveInPalace::
+BattleScript_SelectingImprisonedMoveInPalace::
 	printstring STRINGID_PKMNCANTUSEMOVESEALED
 	goto BattleScript_SelectingUnusableMoveInPalace
 
@@ -3876,7 +3876,7 @@ BattleScript_MoveUsedIsInLove::
 	status2animation BS_ATTACKER, STATUS2_INFATUATION
 	return
 
-BattleScript_MoveUsedIsParalyzedCantAttack::
+BattleScript_MoveUsedIsInLoveCantAttack::
 	printstring STRINGID_PKMNIMMOBILIZEDBYLOVE
 	waitmessage 0x40
 	goto BattleScript_MoveEnd
diff --git a/data/easy_chat.s b/data/easy_chat.s
deleted file mode 100644
index ce416dfbc..000000000
--- a/data/easy_chat.s
+++ /dev/null
@@ -1,473 +0,0 @@
-#include "constants/easy_chat.h"
-#include "constants/moves.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_08597530:: @ 8597530
-	.4byte 0x0000001a
-	.4byte sub_811A8CC
-	.4byte 0x00000019
-	.4byte sub_811A8F0
-	.4byte 0x0000001c
-	.4byte sub_811A914
-	.4byte 0x0000001b
-	.4byte sub_811A938
-
-gUnknown_08597550:: @ 8597550
-	.byte 0x00, 0x02, 0x02, 0x00
-
-	.align 2
-	.4byte gText_Profile
-	.4byte gText_CombineFourWordsOrPhrases
-	.4byte gText_AndMakeYourProfile
-	.4byte gText_YourProfile
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x01, 0x02, 0x03, 0x01
-
-	.align 2
-	.4byte gText_AtTheBattlesStart
-	.4byte gText_CombineSixWordsOrPhrases
-	.4byte gText_AndMakeAMessage
-	.4byte gText_YourFeelingAtTheBattlesStart
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x02, 0x02, 0x03, 0x01
-
-	.align 2
-	.4byte gText_UponWinningABattle
-	.4byte gText_CombineSixWordsOrPhrases
-	.4byte gText_AndMakeAMessage
-	.4byte gText_WhatYouSayIfYouWin
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x03, 0x02, 0x03, 0x01
-
-	.align 2
-	.4byte gText_UponLosingABattle
-	.4byte gText_CombineSixWordsOrPhrases
-	.4byte gText_AndMakeAMessage
-	.4byte gText_WhatYouSayIfYouLose
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x04, 0x02, 0x05, 0x02
-
-	.align 2
-	.4byte NULL
-	.4byte gText_CombineNineWordsOrPhrases
-	.4byte gText_AndMakeAMessage2
-	.4byte gText_TheMailMessage
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x05, 0x02, 0x02, 0x05
-
-	.align 2
-	.4byte gText_Interview
-	.4byte gText_CombineFourWordsOrPhrases
-	.4byte gText_LetsReplyToTheInterview
-	.4byte gText_TheAnswer
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x06, 0x02, 0x03, 0x01
-
-	.align 2
-	.4byte gText_TheBardsSong
-	.4byte gText_ChangeJustOneWordOrPhrase
-	.4byte gText_AndImproveTheBardsSong
-	.4byte gText_TheBardsSong2
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x07, 0x01, 0x01, 0x04
-
-	.align 2
-	.4byte gText_Interview
-	.4byte gText_FindWordsThatDescribeYour
-	.4byte gText_FeelingsRightNow
-	.4byte gText_TheAnswer
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x09, 0x02, 0x01, 0x03
-
-	.align 2
-	.4byte gText_WhatsHipAndHappening
-	.4byte gText_CombineTwoWordsOrPhrases
-	.4byte gText_AndMakeATrendySaying
-	.4byte gText_TheTrendySaying
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x10, 0x02, 0x05, 0x87
-
-	.align 2
-	.4byte NULL
-	.4byte gText_AfterYouHaveReadTheQuiz
-	.4byte gText_QuestionPressTheAButton
-	.4byte NULL
-	.4byte NULL
-
-	.byte 0x0f, 0x01, 0x01, 0x86
-
-	.align 2
-	.4byte gText_TheQuizAnswerIs
-	.4byte gText_OutOfTheListedChoices
-	.4byte gText_SelectTheAnswerToTheQuiz
-	.4byte gText_TheAnswerColon
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x11, 0x02, 0x05, 0x88
-
-	.align 2
-	.4byte NULL
-	.4byte gText_CombineNineWordsOrPhrases
-	.4byte gText_AndCreateAQuiz
-	.4byte gText_IsThisQuizOK
-	.4byte NULL
-
-	.byte 0x12, 0x01, 0x01, 0x86
-
-	.align 2
-	.4byte gText_TheQuizAnswerIs
-	.4byte gText_PickAWordOrPhraseAnd
-	.4byte gText_SetTheQuizAnswer
-	.4byte gText_IsThisQuizOK
-	.4byte NULL
-
-	.byte 0x06, 0x02, 0x03, 0x01
-
-	.align 2
-	.4byte gText_TheBardsSong
-	.4byte gText_ChangeJustOneWordOrPhrase
-	.4byte gText_AndImproveTheBardsSong
-	.4byte gText_TheBardsSong2
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x13, 0x02, 0x03, 0x01
-
-	.align 2
-	.4byte gText_ApprenticesPhrase
-	.4byte gText_FindWordsWhichFit
-	.4byte gText_TheTrainersImage
-	.4byte gText_ApprenticePhrase
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x0d, 0x02, 0x01, 0x03
-
-	.align 2
-	.4byte gText_GoodSaying
-	.4byte gText_CombineTwoWordsOrPhrases2
-	.4byte gText_ToTeachHerAGoodSaying
-	.4byte gText_TheAnswer
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x0a, 0x01, 0x01, 0x04
-
-	.align 2
-	.4byte gText_Interview
-	.4byte gText_FindWordsThatDescribeYour
-	.4byte gText_FeelingsRightNow
-	.4byte gText_TheAnswer
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x0c, 0x01, 0x01, 0x04
-
-	.align 2
-	.4byte gText_Interview
-	.4byte gText_FindWordsThatDescribeYour
-	.4byte gText_FeelingsRightNow
-	.4byte gText_TheAnswer
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x0b, 0x01, 0x01, 0x04
-
-	.align 2
-	.4byte gText_Interview
-	.4byte gText_FindWordsThatDescribeYour
-	.4byte gText_FeelingsRightNow
-	.4byte gText_TheAnswer
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x0e, 0x01, 0x01, 0x04
-
-	.align 2
-	.4byte gText_FansQuestion
-	.4byte gText_FindWordsWhichFit
-	.4byte gText_TheTrainersImage
-	.4byte gText_TheImage
-	.4byte gText_IsAsShownOkay
-
-	.byte 0x14, 0x02, 0x02, 0x00
-
-	.align 2
-	.4byte gText_Questionnaire
-	.4byte gText_CombineFourWordsOrPhrases
-	.4byte gText_AndFillOutTheQuestionnaire
-	.4byte gText_TheAnswer
-	.4byte gText_IsAsShownOkay
-
-gUnknown_08597748:: @ 8597748
-	.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
-
-gUnknown_08597764:: @ 8597764
-	.2byte 0x0209, 0x140b, 0x1030, 0x102a
-
-gUnknown_0859776C:: @ 859776C
-	.2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449
-
-	.align 2
-gUnknown_08597780:: @ 8597780
-	.incbin "graphics/misc/interview_triangle_cursor.gbapal"
-
-	.align 2
-gUnknown_085977A0:: @ 85977A0
-	.incbin "graphics/misc/interview_triangle_cursor.4bpp"
-
-	.align 2
-gUnknown_085977C0:: @ 85977C0
-	.incbin "graphics/misc/interview_arrow.4bpp"
-
-	.align 2
-gUnknown_085978C0:: @ 85978C0
-	.incbin "graphics/misc/interview_buttons.4bpp"
-
-	.align 2
-gUnknown_085979C0:: @ 85979C0
-	.incbin "graphics/misc/interview_frame.gbapal"
-
-	.align 2
-gUnknown_085979E0:: @ 85979E0
-	.incbin "graphics/misc/interview_frame.4bpp.lz"
-
-	.align 2
-gUnknown_08597B14:: @ 8597B14
-	.incbin "graphics/misc/interview_frame_orange.gbapal"
-
-	.align 2
-gUnknown_08597B34:: @ 8597B34
-	.incbin "graphics/misc/interview_frame_green.gbapal"
-
-	.align 2
-gUnknown_08597B54:: @ 8597B54
-	.incbin "graphics/misc/interview_frame_2.4bpp.lz"
-
-	.align 2
-gUnknown_08597C1C:: @ 8597C1C
-	.incbin "graphics/misc/8597C1C.gbapal"
-
-	.align 2
-gUnknown_08597C24:: @ 8597C24
-	.incbin "graphics/misc/8597C24.gbapal"
-
-gUnknown_08597C30:: @ 8597C30
-	.byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03
-	.byte 0x03, 0x18, 0x0a, 0x02
-
-	.align 2
-gUnknown_08597C54:: @ 8597C54
-	.4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb
-
-	.align 2
-gUnknown_08597C64:: @ 8597C64
-	window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
-	window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
-	window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
-	null_window_template
-
-	.align 2
-gUnknown_08597C84:: @ 8597C84
-	window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a
-
-gUnknown_08597C8C:: @ 8597C8C
-	.string "{CLEAR 17}$"
-
-	.align 2
-gUnknown_08597C90:: @ 8597C90
-	.4byte gUnknown_862B810
-	.4byte gUnknown_862B832
-	.4byte gUnknown_862B84B
-	.4byte gUnknown_862B86C
-
-	.align 2
-gUnknown_08597CA0:: @ 8597CA0
-	obj_tiles gUnknown_085977A0, 0x0020, 0x0000
-	obj_tiles gUnknown_085977C0, 0x0100, 0x0002
-	obj_tiles gUnknown_085978C0, 0x0100, 0x0003
-	null_obj_tiles
-
-	.align 2
-gUnknown_08597CC0:: @ 8597CC0
-	obj_pal gUnknown_08597780, 0x0000
-	obj_pal gEasyChatCursor_Pal, 0x0001
-	obj_pal gEasyChatRightWindow_Pal, 0x0002
-	obj_pal gUnknown_085979C0, 0x0003
-	null_obj_pal
-
-	.align 2
-gUnknown_08597CE8:: @ 8597CE8
-	obj_tiles gUnknown_085979E0, 0x0800, 0x0005
-	obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001
-	obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006
-	obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004
-
-gUnknown_08597D08:: @ 8597D08
-	.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
-
-	.align 2
-gOamData_8597D10:: @ 8597D10
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0C00
-
-	.align 2
-gUnknown_08597D18:: @ 8597D18
-	spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28
-
-	.align 2
-gUnknown_08597D30:: @ 8597D30
-	.2byte 0x4000, 0xc000, 0x0400, 0x0000
-
-	.align 2
-gUnknown_08597D38:: @ 8597D38
-	.2byte 0x0000, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597D40:: @ 8597D40
-	.2byte 0x0020, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597D48:: @ 8597D48
-	.2byte 0x0040, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597D50:: @ 8597D50
-	.2byte 0x0060, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597D58:: @ 8597D58
-	.4byte gUnknown_08597D38
-	.4byte gUnknown_08597D40
-	.4byte gUnknown_08597D48
-	.4byte gUnknown_08597D50
-
-	.align 2
-gUnknown_08597D68:: @ 8597D68
-	spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28
-
-	.align 2
-gUnknown_08597D80:: @ 8597D80
-	.2byte 0x4000, 0xc000, 0x0400, 0x0000
-
-	.align 2
-gUnknown_08597D88:: @ 8597D88
-	.2byte 0x0060, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597D90:: @ 8597D90
-	.2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597D9C:: @ 8597D9C
-	.2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597DA8:: @ 8597DA8
-	.2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597DB4:: @ 8597DB4
-	.2byte 0x0040, 0x0004, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597DBC:: @ 8597DBC
-	.4byte gUnknown_08597D88
-	.4byte gUnknown_08597D90
-	.4byte gUnknown_08597D9C
-	.4byte gUnknown_08597DA8
-	.4byte gUnknown_08597DB4
-
-	.align 2
-gUnknown_08597DD0:: @ 8597DD0
-	spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08597DE8:: @ 8597DE8
-	.2byte 0x0000, 0xc000, 0x0c00, 0x0000
-
-	.align 2
-gUnknown_08597DF0:: @ 8597DF0
-	spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08597E08:: @ 8597E08
-	.2byte 0x4000, 0x4000, 0x0400, 0x0000
-
-	.align 2
-gUnknown_08597E10:: @ 8597E10
-	.2byte 0x0000, 0x4000, 0x0400, 0x0000
-
-	.align 2
-gUnknown_08597E18:: @ 8597E18
-	.2byte 0x0000, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597E20:: @ 8597E20
-	.2byte 0x0004, 0x0000, 0xffff, 0x0000
-
-	.align 2
-gUnknown_08597E28:: @ 8597E28
-	.4byte gUnknown_08597E18
-	.4byte gUnknown_08597E20
-
-	.align 2
-gUnknown_08597E30:: @ 8597E30
-	spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08597E48:: @ 8597E48
-	spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08597E60:: @ 8597E60
-	.byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa
-
-	.align 2
-gUnknown_08597E6C:: @ 8597E6C
-	.4byte gText_DelAll
-	.4byte gText_Cancel5
-	.4byte gText_Ok2
-	.4byte NULL
-
-	.4byte gText_DelAll
-	.4byte gText_Cancel5
-	.4byte gText_Ok2
-	.4byte gText_Quiz
-
-	.4byte gText_DelAll
-	.4byte gText_Cancel5
-	.4byte gText_Ok2
-	.4byte gText_Answer
-
-@ 8597E9C
-	.include "data/text/easy_chat/easy_chat_groups.inc"
-
-@ 859D0B4
-	.include "data/text/easy_chat/easy_chat_words_by_letter.inc"
-
-@ 859E5D4
-	.include "data/text/easy_chat/easy_chat_group_name_pointers.inc"
-
-gUnknown_0859E62C:: @ 859E62C
-	.2byte 0x0a29, 0x1020, 0x020e, 0x0a33
-
-gUnknown_0859E634:: @ 859E634
-	.2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00
-
-gUnknown_0859E640:: @ 859E640
-	.2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
-
-gUnknown_0859E64C:: @ 859E64C
-	.2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04
-
-gUnknown_0859E658:: @ 859E658
-	.2byte 0x019a, 0x0000
diff --git a/data/ereader_helpers.s b/data/ereader_helpers.s
new file mode 100644
index 000000000..0ddddbc08
--- /dev/null
+++ b/data/ereader_helpers.s
@@ -0,0 +1,48 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_08625B6C:: @ 8625B6C
+@ apparently e-reader trainer data? idk
+.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
+.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
+.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
+.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
+.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
+.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a
+.byte 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e
+.byte 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64
+.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01
+.byte 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
+.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00
+.byte 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02, 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16
+.byte 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00
+.byte 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+.byte 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00
+.byte 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00
+.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff
+.byte 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18, 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff
+.byte 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00
+.byte 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10
+.byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01
+.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
diff --git a/data/ereader_screen.s b/data/ereader_screen.s
new file mode 100755
index 000000000..3d6572a49
--- /dev/null
+++ b/data/ereader_screen.s
@@ -0,0 +1,7 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_0862609C:: @ 862609C
+	.incbin "data/unknown_jp_62609C.bin"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 3c3c38eb9..67351d184 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,12 +1,15 @@
 #include "constants/global.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_setup.h"
+#include "constants/easy_chat.h"
 #include "constants/event_objects.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 #include "constants/flags.h"
 #include "constants/items.h"
 #include "constants/heal_locations.h"
+#include "constants/layouts.h"
+#include "constants/map_scripts.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
@@ -14,6 +17,8 @@
 #include "constants/trainers.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
+#include "constants/trainer_hill.h"
+#include "constants/battle.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
@@ -44,7 +49,7 @@ gSpecialVars:: @ 81DBA0C
 	.4byte gSpecialVar_ContestCategory
 	.4byte gSpecialVar_MonBoxId
 	.4byte gSpecialVar_MonBoxPos
-	.4byte gSpecialVar_0x8014
+	.4byte gSpecialVar_Unused_0x8014
 	.4byte gTrainerBattleOpponent_A
 
 	.include "data/specials.inc"
@@ -635,12 +640,12 @@ SecretBase_RedCave1_Text_23B759: @ 823B759
 	.include "data/maps/RecordCorner/scripts.inc"
 	.include "data/maps/DoubleBattleColosseum/scripts.inc"
 	.include "data/maps/LinkContestRoom1/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/UnknownLinkContestRoom_25_29/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc"
 	.include "data/maps/LinkContestRoom2/scripts.inc"
 	.include "data/maps/LinkContestRoom3/scripts.inc"
 	.include "data/maps/LinkContestRoom4/scripts.inc"
@@ -823,27 +828,12 @@ Std_10: @ 8271347
 EventScript_27134E: @ 827134E
 	return
 
-BattleFrontier_BattleArenaLobby_EventScript_27134F:: @ 827134F
-BattleFrontier_BattleDomeLobby_EventScript_27134F:: @ 827134F
-BattleFrontier_BattleFactoryLobby_EventScript_27134F:: @ 827134F
-BattleFrontier_BattlePalaceLobby_EventScript_27134F:: @ 827134F
-BattleFrontier_BattlePikeLobby_EventScript_27134F:: @ 827134F
-BattleFrontier_BattlePyramidLobby_EventScript_27134F:: @ 827134F
-BattleFrontier_BattleTowerLobby_EventScript_27134F:: @ 827134F
-FallarborTown_BattleTentLobby_EventScript_27134F:: @ 827134F
-LilycoveCity_ContestLobby_EventScript_27134F:: @ 827134F
-MossdeepCity_GameCorner_1F_EventScript_27134F:: @ 827134F
-OldaleTown_PokemonCenter_2F_EventScript_27134F:: @ 827134F
-SecretBase_RedCave1_EventScript_27134F:: @ 827134F
-SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F
-SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F
-TrainerHill_Entrance_EventScript_27134F:: @ 827134F
-VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F
+Common_EventScript_SaveGame:: @ 827134F
 	special SaveGame
 	waitstate
 	return
 
-	EventScript_271354:: @ 8271354
+EventScript_271354:: @ 8271354
 	cmdD8
 	cmdD9
 
@@ -939,7 +929,7 @@ EventScript_27149D:: @ 827149D
 	setberrytree 82, 36, 5
 	return
 
-EventScript_2715DE:: @ 82715DE
+EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_LINK_CONTEST_POKE_BALL
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
@@ -1106,14 +1096,14 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
 	special sub_81AFDD0
 	setflag FLAG_IS_CHAMPION
 	call EverGrandeCity_HallOfFame_EventScript_271829
-	compare VAR_0x40CC, 0
+	compare VAR_FOSSIL_MANIAC_STATE, 0
 	call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
 	clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
 	call EverGrandeCity_HallOfFame_EventScript_2718CC
 	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
 	clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
-	setvar VAR_0x40C6, 2
+	setvar VAR_STEVENS_HOUSE_STATE, 2
 	setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
@@ -1139,7 +1129,7 @@ EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829
 	return
 
 EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839
-	setvar VAR_0x40CC, 1
+	setvar VAR_FOSSIL_MANIAC_STATE, 1
 	return
 
 EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
@@ -1147,8 +1137,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
 	return
 
 EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
-	setvar VAR_0x4082, 3
-	setvar VAR_0x408C, 3
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 3
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
 	clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
 	return
 
@@ -1158,19 +1148,19 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
 
 EventScript_WhiteOut:: @ 8271857
 	call EverGrandeCity_HallOfFame_EventScript_2718CC
-	goto EventScript_271862
+	goto EventScript_ResetMrBriney
 	end
 
-EventScript_271862:: @ 8271862
-	compare VAR_0x4096, 1
-	goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884
-	compare VAR_0x4096, 2
-	goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A
-	compare VAR_0x4096, 3
-	goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3
+EventScript_ResetMrBriney:: @ 8271862
+	compare VAR_BRINEY_LOCATION, 1
+	goto_if_eq EventScript_MoveMrBrineyToHouse
+	compare VAR_BRINEY_LOCATION, 2
+	goto_if_eq EventScript_MoveMrBrineyToDewford
+	compare VAR_BRINEY_LOCATION, 3
+	goto_if_eq EventScript_MoveMrBrineyToRoute108
 	end
 
-EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
+EventScript_MoveMrBrineyToHouse:: @ 8271884
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
@@ -1180,7 +1170,7 @@ EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	end
 
-EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
+EventScript_MoveMrBrineyToDewford:: @ 827189A
 	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
@@ -1191,7 +1181,7 @@ EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	end
 
-EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3
+EventScript_MoveMrBrineyToRoute108:: @ 82718B3
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -1207,7 +1197,7 @@ EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC
 	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
 	clearflag FLAG_DEFEATED_ELITE_4_DRAKE
-	setvar VAR_0x409C, 0
+	setvar VAR_ELITE_4_STATE, 0
 	return
 
 DewfordTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
@@ -1219,23 +1209,23 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
 RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
 SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
 VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
-	goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_27374E
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_27374E
+	goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn
 	goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C
 	goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912
 	goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C
-	setvar VAR_0x4096, 1
+	setvar VAR_BRINEY_LOCATION, 1
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_271912:: @ 8271912
-	setvar VAR_0x4096, 2
+	setvar VAR_BRINEY_LOCATION, 2
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_271918:: @ 8271918
-	setvar VAR_0x4096, 3
+	setvar VAR_BRINEY_LOCATION, 3
 	return
 
 BattleFrontier_PokemonCenter_1F_EventScript_27191E:: @ 827191E
@@ -1294,11 +1284,11 @@ OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993
-	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725A4
+	applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	dofieldeffect FLDEFF_POKECENTER_HEAL
 	waitfieldeffect FLDEFF_POKECENTER_HEAL
-	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA
+	applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	special HealPlayerParty
 	return
@@ -1362,9 +1352,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68
 	setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD
 	msgbox gUnknown_082727F5, MSGBOX_DEFAULT
 	playse SE_PIN
-	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598
+	applymovement VAR_0x800B, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A
+	applymovement VAR_0x800B, Common_Movement_Delay48
 	waitmovement 0
 	msgbox gUnknown_08272860, MSGBOX_YESNO
 	compare VAR_RESULT, 1
@@ -1541,7 +1531,7 @@ EventScript_271C9B:: @ 8271C9B
 
 EventScript_271CA1:: @ 8271CA1
 	msgbox gUnknown_08272A78, MSGBOX_DEFAULT
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	return
 
@@ -1593,7 +1583,7 @@ EventScript_271D2A:: @ 8271D2A
 
 EventScript_271D47:: @ 8271D47
 	msgbox gUnknown_08272ABF, MSGBOX_DEFAULT
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	releaseall
 	end
@@ -1609,7 +1599,7 @@ EventScript_271D5E:: @ 8271D5E
 	goto EventScript_271D89
 
 EventScript_271D83:: @ 8271D83
-	special sub_80E6BE8
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	lock
 	faceplayer
@@ -1688,52 +1678,17 @@ EventScript_271E54:: @ 8271E54
 	goto EventScript_271DBC
 	end
 
-BattleFrontier_OutsideWest_EventScript_271E6A:: @ 8271E6A
-FallarborTown_EventScript_271E6A:: @ 8271E6A
-FortreeCity_EventScript_271E6A:: @ 8271E6A
-LavaridgeTown_EventScript_271E6A:: @ 8271E6A
-MauvilleCity_EventScript_271E6A:: @ 8271E6A
-MossdeepCity_EventScript_271E6A:: @ 8271E6A
-OldaleTown_EventScript_271E6A:: @ 8271E6A
-PetalburgCity_EventScript_271E6A:: @ 8271E6A
-RustboroCity_EventScript_271E6A:: @ 8271E6A
-SlateportCity_EventScript_271E6A:: @ 8271E6A
-SootopolisCity_EventScript_271E6A:: @ 8271E6A
-VerdanturfTown_EventScript_271E6A:: @ 8271E6A
-	msgbox gUnknown_08272B6A, MSGBOX_SIGN
-	end
-
-BattleFrontier_OutsideEast_EventScript_271E73:: @ 8271E73
-DewfordTown_EventScript_271E73:: @ 8271E73
-EverGrandeCity_EventScript_271E73:: @ 8271E73
-FallarborTown_EventScript_271E73:: @ 8271E73
-FortreeCity_EventScript_271E73:: @ 8271E73
-LavaridgeTown_EventScript_271E73:: @ 8271E73
-LilycoveCity_EventScript_271E73:: @ 8271E73
-MauvilleCity_EventScript_271E73:: @ 8271E73
-MossdeepCity_EventScript_271E73:: @ 8271E73
-OldaleTown_EventScript_271E73:: @ 8271E73
-PacifidlogTown_EventScript_271E73:: @ 8271E73
-PetalburgCity_EventScript_271E73:: @ 8271E73
-RustboroCity_EventScript_271E73:: @ 8271E73
-SlateportCity_EventScript_271E73:: @ 8271E73
-SootopolisCity_EventScript_271E73:: @ 8271E73
-VerdanturfTown_EventScript_271E73:: @ 8271E73
-	msgbox gUnknown_08272B9E, MSGBOX_SIGN
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C
-DewfordTown_EventScript_271E7C:: @ 8271E7C
-LilycoveCity_ContestLobby_EventScript_271E7C:: @ 8271E7C
-LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C:: @ 8271E7C
-MauvilleCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
-PetalburgCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
-Route111_EventScript_271E7C:: @ 8271E7C
-Route123_BerryMastersHouse_EventScript_271E7C:: @ 8271E7C
-SlateportCity_OceanicMuseum_1F_EventScript_271E7C:: @ 8271E7C
-SlateportCity_PokemonFanClub_EventScript_271E7C:: @ 8271E7C
+Common_EventScript_ShowPokemartSign:: @ 8271E6A
+	msgbox gText_PokemartSign, MSGBOX_SIGN
+	end
+
+Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
+	msgbox gText_PokemonCenterSign, MSGBOX_SIGN
+	end
+
+Common_ShowEasyChatScreen:: @ 8271E7C
 	fadescreen 1
-	special easy_chat_input_maybe
+	special ShowEasyChatScreen
 	fadescreen 0
 	return
 
@@ -1747,7 +1702,7 @@ RustboroCity_Gym_EventScript_271E84:: @ 8271E84
 
 DewfordTown_EventScript_271E8B:: @ 8271E8B
 DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B
-	dodailyevents
+	dotimebasedevents
 	setvar VAR_0x8004, 0
 	special BufferTrendyPhraseString
 	return
@@ -1755,8 +1710,8 @@ DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B
 DewfordTown_EventScript_271E95:: @ 8271E95
 Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95
 Route109_EventScript_271E95:: @ 8271E95
-	copyvar VAR_0x8008, VAR_0x4096
-	setvar VAR_0x4096, 0
+	copyvar VAR_0x8008, VAR_BRINEY_LOCATION
+	setvar VAR_BRINEY_LOCATION, 0
 	return
 
 EventScript_UseSurf:: @ 8271EA0
@@ -1778,17 +1733,7 @@ EventScript_271ED5:: @ 8271ED5
 EventScript_271ED6:: @ 8271ED6
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_271ED7:: @ 8271ED7
-LavaridgeTown_EventScript_271ED7:: @ 8271ED7
-LilycoveCity_EventScript_271ED7:: @ 8271ED7
-LittlerootTown_EventScript_271ED7:: @ 8271ED7
-LittlerootTown_ProfessorBirchsLab_EventScript_271ED7:: @ 8271ED7
-OldaleTown_EventScript_271ED7:: @ 8271ED7
-Route103_EventScript_271ED7:: @ 8271ED7
-Route104_EventScript_271ED7:: @ 8271ED7
-Route110_EventScript_271ED7:: @ 8271ED7
-Route119_EventScript_271ED7:: @ 8271ED7
-RustboroCity_EventScript_271ED7:: @ 8271ED7
+Common_EventScript_SetupRivalGender:: @ 8271ED7
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq RustboroCity_EventScript_271EEF
@@ -1804,9 +1749,7 @@ RustboroCity_EventScript_271EF5:: @ 8271EF5
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-LavaridgeTown_EventScript_271EFB:: @ 8271EFB
-Route110_EventScript_271EFB:: @ 8271EFB
-Route119_EventScript_271EFB:: @ 8271EFB
+Common_EventScript_SetupRivalOnBikeGender:: @ 8271EFB
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq LavaridgeTown_EventScript_271F13
@@ -1938,119 +1881,34 @@ DewfordTown_Gym_EventScript_272035:: @ 8272035
 	settrainerflag TRAINER_DAPHNE
 	return
 
-DewfordTown_Gym_EventScript_272054:: @ 8272054
-DewfordTown_Hall_EventScript_272054:: @ 8272054
-FallarborTown_House1_EventScript_272054:: @ 8272054
-FortreeCity_Gym_EventScript_272054:: @ 8272054
-FortreeCity_House2_EventScript_272054:: @ 8272054
-FortreeCity_House4_EventScript_272054:: @ 8272054
-LavaridgeTown_Gym_1F_EventScript_272054:: @ 8272054
-LavaridgeTown_HerbShop_EventScript_272054:: @ 8272054
-LilycoveCity_EventScript_272054:: @ 8272054
-LilycoveCity_House2_EventScript_272054:: @ 8272054
-LittlerootTown_BrendansHouse_1F_EventScript_272054:: @ 8272054
-MauvilleCity_EventScript_272054:: @ 8272054
-MauvilleCity_Gym_EventScript_272054:: @ 8272054
-MossdeepCity_EventScript_272054:: @ 8272054
-MossdeepCity_Gym_EventScript_272054:: @ 8272054
-MossdeepCity_SpaceCenter_1F_EventScript_272054:: @ 8272054
-MtPyre_1F_EventScript_272054:: @ 8272054
-PacifidlogTown_House2_EventScript_272054:: @ 8272054
-PetalburgCity_Gym_EventScript_272054:: @ 8272054
-PetalburgWoods_EventScript_272054:: @ 8272054
-Route104_EventScript_272054:: @ 8272054
-Route104_PrettyPetalFlowerShop_EventScript_272054:: @ 8272054
-Route109_EventScript_272054:: @ 8272054
-Route111_EventScript_272054:: @ 8272054
-Route111_WinstrateFamilysHouse_EventScript_272054:: @ 8272054
-Route114_EventScript_272054:: @ 8272054
-Route114_FossilManiacsHouse_EventScript_272054:: @ 8272054
-Route120_EventScript_272054:: @ 8272054
-Route123_BerryMastersHouse_EventScript_272054:: @ 8272054
-Route123_EventScript_272054:: @ 8272054
-RustboroCity_DevonCorp_3F_EventScript_272054:: @ 8272054
-RustboroCity_Flat2_2F_EventScript_272054:: @ 8272054
-RustboroCity_Gym_EventScript_272054:: @ 8272054
-RustboroCity_PokemonSchool_EventScript_272054:: @ 8272054
-SSTidalRooms_EventScript_272054:: @ 8272054
-ShoalCave_LowTideEntranceRoom_EventScript_272054:: @ 8272054
-ShoalCave_LowTideInnerRoom_EventScript_272054:: @ 8272054
-ShoalCave_LowTideLowerRoom_EventScript_272054:: @ 8272054
-ShoalCave_LowTideStairsRoom_EventScript_272054:: @ 8272054
-SlateportCity_BattleTentLobby_EventScript_272054:: @ 8272054
-SlateportCity_Harbor_EventScript_272054:: @ 8272054
-SlateportCity_PokemonFanClub_EventScript_272054:: @ 8272054
-SootopolisCity_EventScript_272054:: @ 8272054
-SootopolisCity_Gym_1F_EventScript_272054:: @ 8272054
-SootopolisCity_House1_EventScript_272054:: @ 8272054
-VerdanturfTown_BattleTentLobby_EventScript_272054:: @ 8272054
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+Common_EventScript_ShowBagIsFull:: @ 8272054
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_27205E:: @ 827205E
-FortreeCity_Gym_EventScript_27205E:: @ 827205E
-LavaridgeTown_Gym_1F_EventScript_27205E:: @ 827205E
-LilycoveCity_ContestLobby_EventScript_27205E:: @ 827205E
-LinkContestRoom1_EventScript_27205E:: @ 827205E
-MauvilleCity_GameCorner_EventScript_27205E:: @ 827205E
-MauvilleCity_Gym_EventScript_27205E:: @ 827205E
-MossdeepCity_Gym_EventScript_27205E:: @ 827205E
-PetalburgCity_Gym_EventScript_27205E:: @ 827205E
-Route110_TrickHouseEnd_EventScript_27205E:: @ 827205E
-Route110_TrickHouseEntrance_EventScript_27205E:: @ 827205E
-Route113_GlassWorkshop_EventScript_27205E:: @ 827205E
-SootopolisCity_Gym_1F_EventScript_27205E:: @ 827205E
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+Common_EventScript_BagIsFull:: @ 827205E
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	return
 
 Route114_LanettesHouse_EventScript_272067:: @ 8272067
-	msgbox gUnknown_08272B1A, MSGBOX_DEFAULT
+	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_272071:: @ 8272071
-MauvilleCity_GameCorner_EventScript_272071:: @ 8272071
-Route110_TrickHouseEnd_EventScript_272071:: @ 8272071
-Route110_TrickHouseEntrance_EventScript_272071:: @ 8272071
-Route113_GlassWorkshop_EventScript_272071:: @ 8272071
-	msgbox gUnknown_08272B1A, MSGBOX_DEFAULT
-	return
-
-EverGrandeCity_EventScript_27207A:: @ 827207A
-LilycoveCity_EventScript_27207A:: @ 827207A
-MossdeepCity_EventScript_27207A:: @ 827207A
-Route124_EventScript_27207A:: @ 827207A
-Route125_EventScript_27207A:: @ 827207A
-Route126_EventScript_27207A:: @ 827207A
-Route127_EventScript_27207A:: @ 827207A
-Route128_EventScript_27207A:: @ 827207A
-Route129_EventScript_27207A:: @ 827207A
-Route130_EventScript_27207A:: @ 827207A
-Route131_EventScript_27207A:: @ 827207A
-SkyPillar_Outside_EventScript_27207A:: @ 827207A
-SootopolisCity_EventScript_27207A:: @ 827207A
-	setweather 15
-	return
-
-DewfordTown_Gym_EventScript_27207E:: @ 827207E
-FortreeCity_Gym_EventScript_27207E:: @ 827207E
-LavaridgeTown_Gym_1F_EventScript_27207E:: @ 827207E
-LilycoveCity_CoveLilyMotel_2F_EventScript_27207E:: @ 827207E
-MauvilleCity_Gym_EventScript_27207E:: @ 827207E
-MossdeepCity_Gym_EventScript_27207E:: @ 827207E
-PetalburgCity_Gym_EventScript_27207E:: @ 827207E
-RustboroCity_Gym_EventScript_27207E:: @ 827207E
-SootopolisCity_Gym_1F_EventScript_27207E:: @ 827207E
+Common_EventScript_NoRoomLeftForAnother:: @ 8272071
+	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
+	return
+
+Common_EventScript_SetWeather15:: @ 827207A
+	setweather WEATHER_ALTERNATING
+	return
+
+Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
 	playfanfare MUS_ME_BACHI
 	waitfanfare
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_272083:: @ 8272083
-Route111_OldLadysRestStop_EventScript_272083:: @ 8272083
-Route119_WeatherInstitute_1F_EventScript_272083:: @ 8272083
-RustboroCity_DevonCorp_3F_EventScript_272083:: @ 8272083
-SSTidalRooms_EventScript_272083:: @ 8272083
+Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
 	fadescreen 1
 	playfanfare MUS_ME_ASA
 	waitfanfare
@@ -2060,7 +1918,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083
 
 EventScript_RegionMap:: @ 827208F
 	lockall
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, MSGBOX_DEFAULT
+	msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT
 	fadescreen 1
 	special FieldShowRegionMap
 	waitstate
@@ -2084,8 +1942,8 @@ Route109_EventScript_2720A8:: @ 82720A8
 LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
 Route101_EventScript_2720AD:: @ 82720AD
 Route103_EventScript_2720AD:: @ 82720AD
-	compare VAR_0x4085, 0
-	goto_if_eq Route101_EventScript_27374E
+	compare VAR_PETALBURG_GYM_STATE, 0
+	goto_if_eq Common_EventScript_NopReturn
 	goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
 	compare VAR_BIRCH_STATE, 0
 	call_if_eq Route101_EventScript_27211A
@@ -2166,7 +2024,7 @@ Route101_EventScript_272184:: @ 8272184
 	msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT
 	call Route101_EventScript_272179
 	compare VAR_0x800A, 0
-	goto_if_eq Route101_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, ScriptGetPokedexInfo
 	copyvar VAR_0x8008, VAR_0x8005
@@ -2203,7 +2061,7 @@ PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
-	setvar VAR_0x4096, 0
+	setvar VAR_BRINEY_LOCATION, 0
 	return
 
 RusturfTunnel_EventScript_272216:: @ 8272216
@@ -2217,7 +2075,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216
 
 EventScript_27222B:: @ 827222B
 	delay 30
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	showobjectat 255, MAP_PETALBURG_CITY
 	delay 30
@@ -2360,7 +2218,7 @@ Route119_EventScript_272350:: @ 8272350
 Route119_EventScript_272365:: @ 8272365
 	msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	applymovement VAR_LAST_TALKED, Route119_Movement_2723C7
 	waitmovement 0
@@ -2412,11 +2270,7 @@ Route120_Movement_2723C7: @ 82723C7
 	set_visible
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD
-MossdeepCity_StevensHouse_EventScript_2723DD:: @ 82723DD
-Route119_WeatherInstitute_2F_EventScript_2723DD:: @ 82723DD
-RustboroCity_DevonCorp_2F_EventScript_2723DD:: @ 82723DD
-SlateportCity_House1_EventScript_2723DD:: @ 82723DD
+Common_EventScript_NameReceivedPokemon:: @ 82723DD
 	fadescreen 1
 	special ChangePokemonNickname
 	waitstate
@@ -2511,354 +2365,41 @@ SlateportCity_Movement_272596: @ 8272596
 	emote_question_mark
 	step_end
 
-AquaHideout_B2F_Movement_272598: @ 8272598
-BattleFrontier_BattleTowerBattleRoom_Movement_272598: @ 8272598
-BattleFrontier_ReceptionGate_Movement_272598: @ 8272598
-CaveOfOrigin_B1F_Movement_272598: @ 8272598
-EverGrandeCity_ChampionsRoom_Movement_272598: @ 8272598
-FarawayIsland_Interior_Movement_272598: @ 8272598
-JaggedPass_Movement_272598: @ 8272598
-LavaridgeTown_Movement_272598: @ 8272598
-LilycoveCity_ContestLobby_Movement_272598: @ 8272598
-LilycoveCity_CoveLilyMotel_1F_Movement_272598: @ 8272598
-LilycoveCity_Harbor_Movement_272598: @ 8272598
-LittlerootTown_BrendansHouse_1F_Movement_272598: @ 8272598
-LittlerootTown_BrendansHouse_2F_Movement_272598: @ 8272598
-LittlerootTown_MaysHouse_1F_Movement_272598: @ 8272598
-LittlerootTown_MaysHouse_2F_Movement_272598: @ 8272598
-LittlerootTown_Movement_272598: @ 8272598
-MauvilleCity_House2_Movement_272598: @ 8272598
-MauvilleCity_Movement_272598: @ 8272598
-MeteorFalls_1F_1R_Movement_272598: @ 8272598
-MeteorFalls_StevensCave_Movement_272598: @ 8272598
-MossdeepCity_SpaceCenter_2F_Movement_272598: @ 8272598
-MossdeepCity_StevensHouse_Movement_272598: @ 8272598
-MtChimney_Movement_272598: @ 8272598
-MtPyre_Summit_Movement_272598: @ 8272598
-OldaleTown_PokemonCenter_1F_Movement_272598: @ 8272598
-PetalburgCity_Gym_Movement_272598: @ 8272598
-PetalburgCity_Movement_272598: @ 8272598
-Route103_Movement_272598: @ 8272598
-Route104_Movement_272598: @ 8272598
-Route110_Movement_272598: @ 8272598
-Route110_TrickHouseEnd_Movement_272598: @ 8272598
-Route110_TrickHouseEntrance_Movement_272598: @ 8272598
-Route110_TrickHousePuzzle5_Movement_272598: @ 8272598
-Route119_WeatherInstitute_2F_Movement_272598: @ 8272598
-RustboroCity_DevonCorp_2F_Movement_272598: @ 8272598
-RustboroCity_Movement_272598: @ 8272598
-RusturfTunnel_Movement_272598: @ 8272598
-SeafloorCavern_Entrance_Movement_272598: @ 8272598
-SeafloorCavern_Room9_Movement_272598: @ 8272598
-SlateportCity_Movement_272598: @ 8272598
-SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598
-SlateportCity_PokemonFanClub_Movement_272598: @ 8272598
+Common_Movement_ExclamationMark: @ 8272598
 	emote_exclamation_mark
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A
-BattleFrontier_ReceptionGate_Movement_27259A: @ 827259A
-CaveOfOrigin_B1F_Movement_27259A: @ 827259A
-EverGrandeCity_ChampionsRoom_Movement_27259A: @ 827259A
-FarawayIsland_Interior_Movement_27259A: @ 827259A
-JaggedPass_Movement_27259A: @ 827259A
-LavaridgeTown_Movement_27259A: @ 827259A
-LilycoveCity_CoveLilyMotel_1F_Movement_27259A: @ 827259A
-LilycoveCity_Harbor_Movement_27259A: @ 827259A
-LittlerootTown_BrendansHouse_1F_Movement_27259A: @ 827259A
-LittlerootTown_BrendansHouse_2F_Movement_27259A: @ 827259A
-LittlerootTown_MaysHouse_1F_Movement_27259A: @ 827259A
-LittlerootTown_MaysHouse_2F_Movement_27259A: @ 827259A
-MauvilleCity_House2_Movement_27259A: @ 827259A
-MauvilleCity_Movement_27259A: @ 827259A
-MeteorFalls_1F_1R_Movement_27259A: @ 827259A
-MeteorFalls_StevensCave_Movement_27259A: @ 827259A
-MossdeepCity_SpaceCenter_2F_Movement_27259A: @ 827259A
-MossdeepCity_StevensHouse_Movement_27259A: @ 827259A
-MtChimney_Movement_27259A: @ 827259A
-MtPyre_Summit_Movement_27259A: @ 827259A
-OldaleTown_PokemonCenter_1F_Movement_27259A: @ 827259A
-PetalburgCity_Gym_Movement_27259A: @ 827259A
-PetalburgCity_Movement_27259A: @ 827259A
-Route103_Movement_27259A: @ 827259A
-Route104_Movement_27259A: @ 827259A
-Route110_Movement_27259A: @ 827259A
-Route110_TrickHouseEntrance_Movement_27259A: @ 827259A
-Route110_TrickHousePuzzle5_Movement_27259A: @ 827259A
-Route119_WeatherInstitute_2F_Movement_27259A: @ 827259A
-RustboroCity_DevonCorp_2F_Movement_27259A: @ 827259A
-RustboroCity_Movement_27259A: @ 827259A
-RusturfTunnel_Movement_27259A: @ 827259A
-SeafloorCavern_Entrance_Movement_27259A: @ 827259A
-SeafloorCavern_Room9_Movement_27259A: @ 827259A
-SlateportCity_Movement_27259A: @ 827259A
-SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A
-SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A
+Common_Movement_Delay48: @ 827259A
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-AquaHideout_B2F_Movement_27259E: @ 827259E
-BattleFrontier_BattlePyramidLobby_Movement_27259E: @ 827259E
-BattleFrontier_ScottsHouse_Movement_27259E: @ 827259E
-CaveOfOrigin_B1F_Movement_27259E: @ 827259E
-EverGrandeCity_PokemonLeague_1F_Movement_27259E: @ 827259E
-FallarborTown_House2_Movement_27259E: @ 827259E
-FortreeCity_House4_Movement_27259E: @ 827259E
-JaggedPass_Movement_27259E: @ 827259E
-LilycoveCity_ContestHall_Movement_27259E: @ 827259E
-LilycoveCity_CoveLilyMotel_1F_Movement_27259E: @ 827259E
-LilycoveCity_DepartmentStore_1F_Movement_27259E: @ 827259E
-LilycoveCity_DepartmentStore_5F_Movement_27259E: @ 827259E
-LilycoveCity_Harbor_Movement_27259E: @ 827259E
-LilycoveCity_LilycoveMuseum_1F_Movement_27259E: @ 827259E
-LilycoveCity_LilycoveMuseum_2F_Movement_27259E: @ 827259E
-LilycoveCity_MoveDeletersHouse_Movement_27259E: @ 827259E
-LilycoveCity_Movement_27259E: @ 827259E
-LittlerootTown_BrendansHouse_1F_Movement_27259E: @ 827259E
-LittlerootTown_BrendansHouse_2F_Movement_27259E: @ 827259E
-MagmaHideout_4F_Movement_27259E: @ 827259E
-MauvilleCity_Movement_27259E: @ 827259E
-MeteorFalls_StevensCave_Movement_27259E: @ 827259E
-MossdeepCity_SpaceCenter_2F_Movement_27259E: @ 827259E
-MtChimney_Movement_27259E: @ 827259E
-OldaleTown_Movement_27259E: @ 827259E
-PetalburgCity_Gym_Movement_27259E: @ 827259E
-PetalburgCity_Movement_27259E: @ 827259E
-Route103_Movement_27259E: @ 827259E
-Route104_Movement_27259E: @ 827259E
-Route110_TrickHouseEnd_Movement_27259E: @ 827259E
-Route110_TrickHouseEntrance_Movement_27259E: @ 827259E
-Route110_TrickHousePuzzle5_Movement_27259E: @ 827259E
-Route111_Movement_27259E: @ 827259E
-Route119_Movement_27259E: @ 827259E
-RustboroCity_Flat1_2F_Movement_27259E: @ 827259E
-RustboroCity_Movement_27259E: @ 827259E
-RusturfTunnel_Movement_27259E: @ 827259E
-SeafloorCavern_Room9_Movement_27259E: @ 827259E
-SlateportCity_Movement_27259E: @ 827259E
-SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E
-SootopolisCity_Movement_27259E: @ 827259E
+Common_Movement_FacePlayer: @ 827259E
 	face_player
 	step_end
 
-BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0
+Common_Movement_FaceAwayPlayer: @ 82725A0
 	face_away_player
 	step_end
 
-BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2
-BattleFrontier_OutsideWest_Movement_2725A2: @ 82725A2
-EverGrandeCity_PokemonLeague_1F_Movement_2725A2: @ 82725A2
-JaggedPass_Movement_2725A2: @ 82725A2
-LilycoveCity_ContestHall_Movement_2725A2: @ 82725A2
-LilycoveCity_ContestLobby_Movement_2725A2: @ 82725A2
-LilycoveCity_CoveLilyMotel_1F_Movement_2725A2: @ 82725A2
-LilycoveCity_House3_Movement_2725A2: @ 82725A2
-LilycoveCity_LilycoveMuseum_1F_Movement_2725A2: @ 82725A2
-LilycoveCity_Movement_2725A2: @ 82725A2
-LittlerootTown_Movement_2725A2: @ 82725A2
-MauvilleCity_GameCorner_Movement_2725A2: @ 82725A2
-MauvilleCity_Movement_2725A2: @ 82725A2
-MossdeepCity_Movement_2725A2: @ 82725A2
-MossdeepCity_SpaceCenter_1F_Movement_2725A2: @ 82725A2
-MossdeepCity_SpaceCenter_2F_Movement_2725A2: @ 82725A2
-MtChimney_Movement_2725A2: @ 82725A2
-OldaleTown_Movement_2725A2: @ 82725A2
-PetalburgCity_Movement_2725A2: @ 82725A2
-Route109_Movement_2725A2: @ 82725A2
-Route110_Movement_2725A2: @ 82725A2
-Route111_Movement_2725A2: @ 82725A2
-Route111_WinstrateFamilysHouse_Movement_2725A2: @ 82725A2
-Route112_Movement_2725A2: @ 82725A2
-Route119_Movement_2725A2: @ 82725A2
-RustboroCity_DevonCorp_3F_Movement_2725A2: @ 82725A2
-RustboroCity_Movement_2725A2: @ 82725A2
-RusturfTunnel_Movement_2725A2: @ 82725A2
-SlateportCity_Harbor_Movement_2725A2: @ 82725A2
-SlateportCity_Movement_2725A2: @ 82725A2
-SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2
-SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2
-SootopolisCity_Movement_2725A2: @ 82725A2
-VerdanturfTown_Movement_2725A2: @ 82725A2
+Common_Movement_FaceOriginalDirection: @ 82725A2
 	face_original_direction
 	step_end
 
-AquaHideout_B2F_Movement_2725A4: @ 82725A4
-BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4: @ 82725A4
-BattleFrontier_OutsideWest_Movement_2725A4: @ 82725A4
-BattleFrontier_ScottsHouse_Movement_2725A4: @ 82725A4
-DewfordTown_Hall_Movement_2725A4: @ 82725A4
-EverGrandeCity_ChampionsRoom_Movement_2725A4: @ 82725A4
-EverGrandeCity_HallOfFame_Movement_2725A4: @ 82725A4
-LavaridgeTown_Movement_2725A4: @ 82725A4
-LilycoveCity_Harbor_Movement_2725A4: @ 82725A4
-LilycoveCity_PokemonTrainerFanClub_Movement_2725A4: @ 82725A4
-LittlerootTown_BrendansHouse_1F_Movement_2725A4: @ 82725A4
-LittlerootTown_BrendansHouse_2F_Movement_2725A4: @ 82725A4
-LittlerootTown_MaysHouse_1F_Movement_2725A4: @ 82725A4
-LittlerootTown_MaysHouse_2F_Movement_2725A4: @ 82725A4
-LittlerootTown_Movement_2725A4: @ 82725A4
-LittlerootTown_ProfessorBirchsLab_Movement_2725A4: @ 82725A4
-MeteorFalls_1F_1R_Movement_2725A4: @ 82725A4
-MossdeepCity_SpaceCenter_2F_Movement_2725A4: @ 82725A4
-MossdeepCity_StevensHouse_Movement_2725A4: @ 82725A4
-MtChimney_Movement_2725A4: @ 82725A4
-MtPyre_Summit_Movement_2725A4: @ 82725A4
-OldaleTown_PokemonCenter_1F_Movement_2725A4: @ 82725A4
-PetalburgCity_Gym_Movement_2725A4: @ 82725A4
-PetalburgCity_Movement_2725A4: @ 82725A4
-PetalburgWoods_Movement_2725A4: @ 82725A4
-Route101_Movement_2725A4: @ 82725A4
-Route110_Movement_2725A4: @ 82725A4
-Route110_TrickHouseEnd_Movement_2725A4: @ 82725A4
-Route111_Movement_2725A4: @ 82725A4
-Route112_Movement_2725A4: @ 82725A4
-Route116_Movement_2725A4: @ 82725A4
-Route120_Movement_2725A4: @ 82725A4
-Route128_Movement_2725A4: @ 82725A4
-RustboroCity_Movement_2725A4: @ 82725A4
-SeafloorCavern_Entrance_Movement_2725A4: @ 82725A4
-SeafloorCavern_Room9_Movement_2725A4: @ 82725A4
-SkyPillar_Outside_Movement_2725A4: @ 82725A4
-SlateportCity_Movement_2725A4: @ 82725A4
-SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4
-SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4
-SootopolisCity_Movement_2725A4: @ 82725A4
+Common_Movement_WalkInPlaceLeft: @ 82725A4
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6: @ 82725A6
-BattleFrontier_OutsideWest_Movement_2725A6: @ 82725A6
-BattleFrontier_ReceptionGate_Movement_2725A6: @ 82725A6
-BattleFrontier_ScottsHouse_Movement_2725A6: @ 82725A6
-CaveOfOrigin_B1F_Movement_2725A6: @ 82725A6
-DewfordTown_Hall_Movement_2725A6: @ 82725A6
-EverGrandeCity_ChampionsRoom_Movement_2725A6: @ 82725A6
-EverGrandeCity_HallOfFame_Movement_2725A6: @ 82725A6
-LavaridgeTown_Movement_2725A6: @ 82725A6
-LilycoveCity_DepartmentStore_5F_Movement_2725A6: @ 82725A6
-LilycoveCity_Harbor_Movement_2725A6: @ 82725A6
-LittlerootTown_BrendansHouse_1F_Movement_2725A6: @ 82725A6
-LittlerootTown_BrendansHouse_2F_Movement_2725A6: @ 82725A6
-LittlerootTown_MaysHouse_2F_Movement_2725A6: @ 82725A6
-LittlerootTown_Movement_2725A6: @ 82725A6
-LittlerootTown_ProfessorBirchsLab_Movement_2725A6: @ 82725A6
-MagmaHideout_4F_Movement_2725A6: @ 82725A6
-MeteorFalls_1F_1R_Movement_2725A6: @ 82725A6
-MossdeepCity_SpaceCenter_2F_Movement_2725A6: @ 82725A6
-MtPyre_Summit_Movement_2725A6: @ 82725A6
-NewMauville_Entrance_Movement_2725A6: @ 82725A6
-OldaleTown_PokemonCenter_2F_Movement_2725A6: @ 82725A6
-PetalburgCity_Gym_Movement_2725A6: @ 82725A6
-PetalburgCity_Movement_2725A6: @ 82725A6
-PetalburgWoods_Movement_2725A6: @ 82725A6
-Route104_Movement_2725A6: @ 82725A6
-Route110_TrickHouseEnd_Movement_2725A6: @ 82725A6
-Route110_TrickHouseEntrance_Movement_2725A6: @ 82725A6
-Route111_Movement_2725A6: @ 82725A6
-Route114_FossilManiacsTunnel_Movement_2725A6: @ 82725A6
-Route120_Movement_2725A6: @ 82725A6
-Route121_SafariZoneEntrance_Movement_2725A6: @ 82725A6
-Route128_Movement_2725A6: @ 82725A6
-RustboroCity_Movement_2725A6: @ 82725A6
-RusturfTunnel_Movement_2725A6: @ 82725A6
-SeafloorCavern_Entrance_Movement_2725A6: @ 82725A6
-SeafloorCavern_Room9_Movement_2725A6: @ 82725A6
-SlateportCity_BattleTentCorridor_Movement_2725A6: @ 82725A6
-SlateportCity_Harbor_Movement_2725A6: @ 82725A6
-SlateportCity_Movement_2725A6: @ 82725A6
-SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6
-SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6
-VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6
+Common_Movement_WalkInPlaceUp: @ 82725A6
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8
-BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8: @ 82725A8
-BattleFrontier_OutsideWest_Movement_2725A8: @ 82725A8
-BattleFrontier_ScottsHouse_Movement_2725A8: @ 82725A8
-DewfordTown_Hall_Movement_2725A8: @ 82725A8
-EverGrandeCity_ChampionsRoom_Movement_2725A8: @ 82725A8
-EverGrandeCity_HallOfFame_Movement_2725A8: @ 82725A8
-LavaridgeTown_Movement_2725A8: @ 82725A8
-LilycoveCity_DepartmentStore_1F_Movement_2725A8: @ 82725A8
-LilycoveCity_PokemonTrainerFanClub_Movement_2725A8: @ 82725A8
-LittlerootTown_BrendansHouse_1F_Movement_2725A8: @ 82725A8
-LittlerootTown_BrendansHouse_2F_Movement_2725A8: @ 82725A8
-LittlerootTown_MaysHouse_1F_Movement_2725A8: @ 82725A8
-LittlerootTown_Movement_2725A8: @ 82725A8
-LittlerootTown_ProfessorBirchsLab_Movement_2725A8: @ 82725A8
-MagmaHideout_4F_Movement_2725A8: @ 82725A8
-MauvilleCity_Movement_2725A8: @ 82725A8
-MossdeepCity_SpaceCenter_1F_Movement_2725A8: @ 82725A8
-MossdeepCity_SpaceCenter_2F_Movement_2725A8: @ 82725A8
-MtPyre_Summit_Movement_2725A8: @ 82725A8
-OldaleTown_Movement_2725A8: @ 82725A8
-PetalburgCity_Gym_Movement_2725A8: @ 82725A8
-PetalburgCity_Movement_2725A8: @ 82725A8
-Route101_Movement_2725A8: @ 82725A8
-Route110_Movement_2725A8: @ 82725A8
-Route110_TrickHouseEnd_Movement_2725A8: @ 82725A8
-Route112_Movement_2725A8: @ 82725A8
-Route116_Movement_2725A8: @ 82725A8
-Route120_Movement_2725A8: @ 82725A8
-Route128_Movement_2725A8: @ 82725A8
-RustboroCity_Movement_2725A8: @ 82725A8
-SSTidalCorridor_Movement_2725A8: @ 82725A8
-SeafloorCavern_Entrance_Movement_2725A8: @ 82725A8
-SkyPillar_Outside_Movement_2725A8: @ 82725A8
-SlateportCity_Harbor_Movement_2725A8: @ 82725A8
-SlateportCity_Movement_2725A8: @ 82725A8
-SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8
-SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8
-SootopolisCity_Movement_2725A8: @ 82725A8
-VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8
+Common_Movement_WalkInPlaceRight: @ 82725A8
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA
-BattleFrontier_ScottsHouse_Movement_2725AA: @ 82725AA
-BirthIsland_Harbor_Movement_2725AA: @ 82725AA
-DewfordTown_Hall_Movement_2725AA: @ 82725AA
-EverGrandeCity_ChampionsRoom_Movement_2725AA: @ 82725AA
-FarawayIsland_Entrance_Movement_2725AA: @ 82725AA
-LilycoveCity_CoveLilyMotel_1F_Movement_2725AA: @ 82725AA
-LilycoveCity_DepartmentStoreElevator_Movement_2725AA: @ 82725AA
-LilycoveCity_Harbor_Movement_2725AA: @ 82725AA
-LilycoveCity_Movement_2725AA: @ 82725AA
-LilycoveCity_PokemonTrainerFanClub_Movement_2725AA: @ 82725AA
-LittlerootTown_BrendansHouse_1F_Movement_2725AA: @ 82725AA
-LittlerootTown_MaysHouse_1F_Movement_2725AA: @ 82725AA
-LittlerootTown_Movement_2725AA: @ 82725AA
-MauvilleCity_Movement_2725AA: @ 82725AA
-MeteorFalls_1F_1R_Movement_2725AA: @ 82725AA
-MossdeepCity_SpaceCenter_2F_Movement_2725AA: @ 82725AA
-MtPyre_Summit_Movement_2725AA: @ 82725AA
-NavelRock_Harbor_Movement_2725AA: @ 82725AA
-OldaleTown_PokemonCenter_1F_Movement_2725AA: @ 82725AA
-PetalburgCity_Gym_Movement_2725AA: @ 82725AA
-PetalburgCity_Movement_2725AA: @ 82725AA
-PetalburgWoods_Movement_2725AA: @ 82725AA
-Route110_Movement_2725AA: @ 82725AA
-Route110_TrickHouseEnd_Movement_2725AA: @ 82725AA
-Route114_FossilManiacsTunnel_Movement_2725AA: @ 82725AA
-Route119_Movement_2725AA: @ 82725AA
-Route120_Movement_2725AA: @ 82725AA
-Route128_Movement_2725AA: @ 82725AA
-RustboroCity_Movement_2725AA: @ 82725AA
-RustboroCity_PokemonSchool_Movement_2725AA: @ 82725AA
-RusturfTunnel_Movement_2725AA: @ 82725AA
-SeafloorCavern_Entrance_Movement_2725AA: @ 82725AA
-SeafloorCavern_Room9_Movement_2725AA: @ 82725AA
-SkyPillar_Outside_Movement_2725AA: @ 82725AA
-SlateportCity_Harbor_Movement_2725AA: @ 82725AA
-SlateportCity_Movement_2725AA: @ 82725AA
-SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA
-SouthernIsland_Exterior_Movement_2725AA: @ 82725AA
-VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA
-VictoryRoad_1F_Movement_2725AA: @ 82725AA
+Common_Movement_WalkInPlaceDown: @ 82725AA
 	walk_in_place_fastest_down
 	step_end
 
@@ -2870,17 +2411,11 @@ RustboroCity_Movement_2725AE: @ 82725AE
 	face_left
 	step_end
 
-BattleFrontier_Mart_Movement_2725B0: @ 82725B0
-MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0
+Common_Movement_FaceDown: @ 82725B0
 	face_down
 	step_end
 
-MarineCave_End_Movement_2725B2: @ 82725B2
-MtPyre_Summit_Movement_2725B2: @ 82725B2
-Route118_Movement_2725B2: @ 82725B2
-SkyPillar_Top_Movement_2725B2: @ 82725B2
-SlateportCity_Movement_2725B2: @ 82725B2
-TerraCave_End_Movement_2725B2: @ 82725B2
+Common_Movement_FaceUp: @ 82725B2
 	face_up
 	step_end
 
@@ -3032,7 +2567,7 @@ gUnknown_08272A9A:: @ 8272A9A
 gUnknown_08272ABF:: @ 8272ABF
 	.string "{PLAYER} found one {STR_VAR_2}!$"
 
-gUnknown_08272AD0:: @ 8272AD0
+gText_TooBadBagIsFull:: @ 8272AD0
 	.string "Too bad!\nThe BAG is full…$"
 
 gUnknown_08272AEA:: @ 8272AEA
@@ -3041,16 +2576,16 @@ gUnknown_08272AEA:: @ 8272AEA
 gUnknown_08272B09:: @ 8272B09
 	.string "Obtained the {STR_VAR_2}!$"
 
-gUnknown_08272B1A:: @ 8272B1A
+gText_NoRoomLeftForAnother:: @ 8272B1A
 	.string "Too bad! There's no room left for\nanother {STR_VAR_2}…$"
 
 gUnknown_08272B48:: @ 8272B48
 	.string "The {STR_VAR_2} was transferred\nto the PC.$"
 
-gUnknown_08272B6A:: @ 8272B6A
+gText_PokemartSign:: @ 8272B6A
 	.string "“Selected items for your convenience!”\nPOKéMON MART$"
 
-gUnknown_08272B9E:: @ 8272B9E
+gText_PokemonCenterSign:: @ 8272B9E
 	.string "“Rejuvenate your tired partners!”\nPOKéMON CENTER$"
 
 gUnknown_08272BCF:: @ 8272BCF
@@ -3166,10 +2701,10 @@ gUnknown_08273594:: @ 8273594
 gUnknown_082735F2:: @ 82735F2
 	.string "It appears to be for use at\nthe LILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
 
-gUnknown_08273656:: @ 8273656
+gText_UnusualWeatherEnded_Rain:: @ 8273656
 	.string "The massive downpour appears to\nhave stopped…$"
 
-gUnknown_08273684:: @ 8273684
+gText_UnusualWeatherEnded_Sun:: @ 8273684
 	.string "The intense sunshine appears to\nhave subsided…$"
 
 EventScript_2736B3:: @ 82736B3
@@ -3217,7 +2752,7 @@ EventScript_2736F8:: @ 82736F8
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_10
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_1F_EventScript_2C83C9
@@ -3228,28 +2763,7 @@ EventScript_2736F8:: @ 82736F8
 	waitstate
 	end
 
-AncientTomb_EventScript_27374E:: @ 827374E
-AquaHideout_B1F_EventScript_27374E:: @ 827374E
-BattleFrontier_BattleDomeBattleRoom_EventScript_27374E:: @ 827374E
-BattleFrontier_OutsideEast_EventScript_27374E:: @ 827374E
-BirthIsland_Exterior_EventScript_27374E:: @ 827374E
-DesertRuins_EventScript_27374E:: @ 827374E
-EverGrandeCity_PokemonCenter_1F_EventScript_27374E:: @ 827374E
-FarawayIsland_Interior_EventScript_27374E:: @ 827374E
-IslandCave_EventScript_27374E:: @ 827374E
-LilycoveCity_Harbor_EventScript_27374E:: @ 827374E
-MarineCave_End_EventScript_27374E:: @ 827374E
-NavelRock_Bottom_EventScript_27374E:: @ 827374E
-NavelRock_Top_EventScript_27374E:: @ 827374E
-NewMauville_Inside_EventScript_27374E:: @ 827374E
-OldaleTown_PokemonCenter_1F_EventScript_27374E:: @ 827374E
-PacifidlogTown_House2_EventScript_27374E:: @ 827374E
-Route101_EventScript_27374E:: @ 827374E
-Route119_EventScript_27374E:: @ 827374E
-Route120_EventScript_27374E:: @ 827374E
-SkyPillar_Top_EventScript_27374E:: @ 827374E
-SouthernIsland_Interior_EventScript_27374E:: @ 827374E
-TerraCave_End_EventScript_27374E:: @ 827374E
+Common_EventScript_NopReturn:: @ 827374E
 	return
 
 EventScript_27374F:: @ 827374F
@@ -3421,8 +2935,8 @@ EventScript_Questionnaire:: @ 827381B
 	msgbox gUnknown_0827339F, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_2738FD
-	setvar VAR_0x8004, 20
-	call MauvilleCity_PokemonCenter_1F_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	specialvar VAR_0x8008, sub_813B490
@@ -3439,12 +2953,12 @@ EventScript_Questionnaire:: @ 827381B
 EventScript_27386D:: @ 827386D
 	goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
 	goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF
-	applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0
+	applymovement VAR_0x8008, Common_Movement_FaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement VAR_0x8008, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A
+	applymovement VAR_0x8008, Common_Movement_Delay48
 	waitmovement 0
 	msgbox gUnknown_08273506, MSGBOX_DEFAULT
 	setflag FLAG_SYS_MYSTERY_EVENT_ENABLE
@@ -3455,12 +2969,12 @@ EventScript_27386D:: @ 827386D
 EventScript_2738B5:: @ 82738B5
 	goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
 	goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF
-	applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0
+	applymovement VAR_0x8008, Common_Movement_FaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement VAR_0x8008, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A
+	applymovement VAR_0x8008, Common_Movement_Delay48
 	waitmovement 0
 	msgbox gUnknown_08273446, MSGBOX_DEFAULT
 	setflag FLAG_SYS_MYSTERY_GIFT_ENABLE
@@ -3473,53 +2987,53 @@ EventScript_2738FD:: @ 82738FD
 	end
 
 EventScript_2738FF:: @ 82738FF
-	applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0
+	applymovement VAR_0x8008, Common_Movement_FaceDown
 	waitmovement 0
 	msgbox gUnknown_082733D8, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route114_EventScript_273913:: @ 8273913
+UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
 	setmetatile 7, 3, 839, 1
 	setmetatile 7, 4, 847, 0
 	return
 
-Route114_EventScript_273926:: @ 8273926
+UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
 	setmetatile 6, 45, 601, 1
 	setmetatile 6, 46, 609, 0
 	return
 
-Route115_EventScript_273939:: @ 8273939
+UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
 	setmetatile 21, 5, 601, 1
 	setmetatile 21, 6, 609, 0
 	return
 
-Route115_EventScript_27394C:: @ 827394C
+UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
 	setmetatile 36, 9, 601, 1
 	setmetatile 36, 10, 609, 0
 	return
 
-Route116_EventScript_27395F:: @ 827395F
+UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
 	setmetatile 59, 12, 159, 1
 	setmetatile 59, 13, 167, 0
 	return
 
-Route116_EventScript_273972:: @ 8273972
+UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
 	setmetatile 79, 5, 159, 1
 	setmetatile 79, 6, 167, 0
 	return
 
-Route118_EventScript_273985:: @ 8273985
+UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
 	setmetatile 42, 5, 159, 1
 	setmetatile 42, 6, 167, 0
 	return
 
-Route118_EventScript_273998:: @ 8273998
+UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
 	setmetatile 9, 5, 159, 1
 	setmetatile 9, 6, 167, 0
 	return
 
-Route105_EventScript_2739AB:: @ 82739AB
+UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
 	setmetatile 10, 28, 334, 0
 	setmetatile 11, 28, 334, 0
 	setmetatile 9, 29, 334, 0
@@ -3534,7 +3048,7 @@ Route105_EventScript_2739AB:: @ 82739AB
 	setmetatile 11, 31, 334, 0
 	return
 
-Route105_EventScript_273A18:: @ 8273A18
+UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
 	setmetatile 20, 53, 334, 0
 	setmetatile 21, 53, 334, 0
 	setmetatile 19, 54, 334, 0
@@ -3549,7 +3063,7 @@ Route105_EventScript_273A18:: @ 8273A18
 	setmetatile 21, 56, 334, 0
 	return
 
-Route125_EventScript_273A85:: @ 8273A85
+UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
 	setmetatile 8, 16, 334, 0
 	setmetatile 9, 16, 334, 0
 	setmetatile 7, 17, 334, 0
@@ -3564,7 +3078,7 @@ Route125_EventScript_273A85:: @ 8273A85
 	setmetatile 9, 19, 334, 0
 	return
 
-Route125_EventScript_273AF2:: @ 8273AF2
+UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
 	setmetatile 53, 18, 334, 0
 	setmetatile 54, 18, 334, 0
 	setmetatile 52, 19, 334, 0
@@ -3579,7 +3093,7 @@ Route125_EventScript_273AF2:: @ 8273AF2
 	setmetatile 54, 21, 334, 0
 	return
 
-Route127_EventScript_273B5F:: @ 8273B5F
+UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
 	setmetatile 57, 9, 334, 0
 	setmetatile 58, 9, 334, 0
 	setmetatile 56, 10, 334, 0
@@ -3594,7 +3108,7 @@ Route127_EventScript_273B5F:: @ 8273B5F
 	setmetatile 58, 12, 334, 0
 	return
 
-Route127_EventScript_273BCC:: @ 8273BCC
+UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
 	setmetatile 61, 30, 334, 0
 	setmetatile 62, 30, 334, 0
 	setmetatile 60, 31, 334, 0
@@ -3609,7 +3123,7 @@ Route127_EventScript_273BCC:: @ 8273BCC
 	setmetatile 62, 33, 334, 0
 	return
 
-Route129_EventScript_273C39:: @ 8273C39
+UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
 	setmetatile 16, 14, 334, 0
 	setmetatile 17, 14, 334, 0
 	setmetatile 15, 15, 334, 0
@@ -3624,7 +3138,7 @@ Route129_EventScript_273C39:: @ 8273C39
 	setmetatile 17, 17, 334, 0
 	return
 
-Route129_EventScript_273CA6:: @ 8273CA6
+UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
 	setmetatile 42, 19, 334, 0
 	setmetatile 43, 19, 334, 0
 	setmetatile 41, 20, 334, 0
@@ -3647,117 +3161,109 @@ Route118_EventScript_273D13:: @ 8273D13
 Route125_EventScript_273D13:: @ 8273D13
 Route127_EventScript_273D13:: @ 8273D13
 Route129_EventScript_273D13:: @ 8273D13
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-Route105_EventScript_273D17:: @ 8273D17
-Route125_EventScript_273D17:: @ 8273D17
-Route127_EventScript_273D17:: @ 8273D17
-Route129_EventScript_273D17:: @ 8273D17
-	setweather 13
+UnusualWeather_StartKyogreWeather:: @ 8273D17
+	setweather WEATHER_RAIN_HEAVY
 	return
 
-Route114_EventScript_273D1B:: @ 8273D1B
-Route115_EventScript_273D1B:: @ 8273D1B
-Route116_EventScript_273D1B:: @ 8273D1B
-Route118_EventScript_273D1B:: @ 8273D1B
-	setweather 12
+UnusualWeather_StartGroudonWeather:: @ 8273D1B
+	setweather WEATHER_DROUGHT
 	return
 
-gUnknown_08273D1F:: @ 8273D1F
-
-gUnknown_08273D1F:: @ 8273D1F
+UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
 	lockall
-	compare VAR_0x4037, 9
-	goto_if_ge Route105_EventScript_273D51
-	goto Route105_EventScript_273D5F
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START
+	goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage
+	goto UnusualWeather_EventScript_ShowSunEndedMessage
 	end
 
-Route105_EventScript_273D31:: @ 8273D31
+UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
 	closemessage
 	fadescreenswapbuffers 1
-	setweather 2
+	setweather WEATHER_SUNNY
 	doweather
-	call Route105_EventScript_273D6D
+	call UnusualWeather_EventScript_CleanupMapTiles
 	special DrawWholeMapView
-	setvar VAR_0x4037, 0
-	setvar VAR_0x4039, 0
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE
+	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadescreenswapbuffers 0
 	releaseall
 	end
 
-Route105_EventScript_273D51:: @ 8273D51
-	msgbox gUnknown_08273656, MSGBOX_DEFAULT
-	goto Route105_EventScript_273D31
+UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51
+	msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT
+	goto UnusualWeather_EventScript_EndEventAndCleanup_2
 	end
 
-Route105_EventScript_273D5F:: @ 8273D5F
-	msgbox gUnknown_08273684, MSGBOX_DEFAULT
-	goto Route105_EventScript_273D31
+UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F
+	msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT
+	goto UnusualWeather_EventScript_EndEventAndCleanup_2
 	end
 
-Route105_EventScript_273D6D:: @ 8273D6D
-	switch VAR_0x4037
-	case 1, Route105_EventScript_273E23
-	case 2, Route105_EventScript_273E36
-	case 3, Route105_EventScript_273E49
-	case 4, Route105_EventScript_273E5C
-	case 5, Route105_EventScript_273E6F
-	case 6, Route105_EventScript_273E82
-	case 7, Route105_EventScript_273E95
-	case 8, Route105_EventScript_273EA8
-	case 9, Route105_EventScript_273EBB
-	case 10, Route105_EventScript_273F28
-	case 11, Route105_EventScript_273F95
-	case 12, Route105_EventScript_274002
-	case 13, Route105_EventScript_27406F
-	case 14, Route105_EventScript_2740DC
-	case 15, Route105_EventScript_274149
-	case 16, Route105_EventScript_2741B6
+UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D
+	switch VAR_UNUSUAL_WEATHER_LOCATION
+	case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North
+	case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South
+	case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West
+	case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East
+	case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North
+	case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South
+	case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East
+	case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West
+	case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North
+	case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South
+	case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West
+	case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East
+	case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North
+	case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South
+	case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West
+	case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East
 	return
 
-Route105_EventScript_273E23:: @ 8273E23
+UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23
 	setmetatile 7, 3, 617, 1
 	setmetatile 7, 4, 617, 1
 	return
 
-Route105_EventScript_273E36:: @ 8273E36
+UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36
 	setmetatile 6, 45, 613, 1
 	setmetatile 6, 46, 613, 1
 	return
 
-Route105_EventScript_273E49:: @ 8273E49
+UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49
 	setmetatile 21, 5, 613, 1
 	setmetatile 21, 6, 613, 1
 	return
 
-Route105_EventScript_273E5C:: @ 8273E5C
+UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C
 	setmetatile 36, 9, 613, 1
 	setmetatile 36, 10, 613, 1
 	return
 
-Route105_EventScript_273E6F:: @ 8273E6F
+UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F
 	setmetatile 59, 12, 124, 1
 	setmetatile 59, 13, 124, 1
 	return
 
-Route105_EventScript_273E82:: @ 8273E82
+UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82
 	setmetatile 79, 5, 124, 1
 	setmetatile 79, 6, 124, 1
 	return
 
-Route105_EventScript_273E95:: @ 8273E95
+UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95
 	setmetatile 42, 5, 124, 1
 	setmetatile 42, 6, 121, 1
 	return
 
-Route105_EventScript_273EA8:: @ 8273EA8
+UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8
 	setmetatile 9, 5, 124, 1
 	setmetatile 9, 6, 121, 1
 	return
 
-Route105_EventScript_273EBB:: @ 8273EBB
+UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB
 	setmetatile 10, 28, 368, 0
 	setmetatile 11, 28, 368, 0
 	setmetatile 9, 29, 368, 0
@@ -3772,7 +3278,7 @@ Route105_EventScript_273EBB:: @ 8273EBB
 	setmetatile 11, 31, 368, 0
 	return
 
-Route105_EventScript_273F28:: @ 8273F28
+UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28
 	setmetatile 20, 53, 368, 0
 	setmetatile 21, 53, 368, 0
 	setmetatile 19, 54, 368, 0
@@ -3787,7 +3293,7 @@ Route105_EventScript_273F28:: @ 8273F28
 	setmetatile 21, 56, 368, 0
 	return
 
-Route105_EventScript_273F95:: @ 8273F95
+UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95
 	setmetatile 8, 16, 368, 0
 	setmetatile 9, 16, 368, 0
 	setmetatile 7, 17, 368, 0
@@ -3802,7 +3308,7 @@ Route105_EventScript_273F95:: @ 8273F95
 	setmetatile 9, 19, 368, 0
 	return
 
-Route105_EventScript_274002:: @ 8274002
+UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002
 	setmetatile 53, 18, 368, 0
 	setmetatile 54, 18, 368, 0
 	setmetatile 52, 19, 368, 0
@@ -3817,7 +3323,7 @@ Route105_EventScript_274002:: @ 8274002
 	setmetatile 54, 21, 368, 0
 	return
 
-Route105_EventScript_27406F:: @ 827406F
+UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F
 	setmetatile 57, 9, 368, 0
 	setmetatile 58, 9, 368, 0
 	setmetatile 56, 10, 368, 0
@@ -3832,7 +3338,7 @@ Route105_EventScript_27406F:: @ 827406F
 	setmetatile 58, 12, 368, 0
 	return
 
-Route105_EventScript_2740DC:: @ 82740DC
+UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC
 	setmetatile 61, 30, 368, 0
 	setmetatile 62, 30, 368, 0
 	setmetatile 60, 31, 368, 0
@@ -3847,7 +3353,7 @@ Route105_EventScript_2740DC:: @ 82740DC
 	setmetatile 62, 33, 368, 0
 	return
 
-Route105_EventScript_274149:: @ 8274149
+UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149
 	setmetatile 16, 14, 368, 0
 	setmetatile 17, 14, 368, 0
 	setmetatile 15, 15, 368, 0
@@ -3862,7 +3368,7 @@ Route105_EventScript_274149:: @ 8274149
 	setmetatile 17, 17, 368, 0
 	return
 
-Route105_EventScript_2741B6:: @ 82741B6
+UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6
 	setmetatile 42, 19, 368, 0
 	setmetatile 43, 19, 368, 0
 	setmetatile 41, 20, 368, 0
@@ -3877,50 +3383,47 @@ Route105_EventScript_2741B6:: @ 82741B6
 	setmetatile 43, 22, 368, 0
 	return
 
-Underwater3_EventScript_274223:: @ 8274223
-Underwater5_EventScript_274223:: @ 8274223
-Underwater6_EventScript_274223:: @ 8274223
-Underwater7_EventScript_274223:: @ 8274223
-	switch VAR_0x4037
-	case 9, Underwater3_EventScript_274281
-	case 10, Underwater3_EventScript_27428A
-	case 11, Underwater3_EventScript_274293
-	case 12, Underwater3_EventScript_27429C
-	case 13, Underwater3_EventScript_2742A5
-	case 14, Underwater3_EventScript_2742AE
-	case 15, Underwater3_EventScript_2742B7
-	case 16, Underwater3_EventScript_2742C0
+UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223
+	switch VAR_UNUSUAL_WEATHER_LOCATION
+	case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North
+	case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South
+	case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West
+	case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East
+	case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North
+	case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South
+	case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West
+	case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East
 	return
 
-Underwater3_EventScript_274281:: @ 8274281
+UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281
 	setescapewarp MAP_ROUTE105, 255, 11, 29
 	return
 
-Underwater3_EventScript_27428A:: @ 827428A
+UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A
 	setescapewarp MAP_ROUTE105, 255, 21, 54
 	return
 
-Underwater3_EventScript_274293:: @ 8274293
+UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293
 	setescapewarp MAP_ROUTE125, 255, 9, 17
 	return
 
-Underwater3_EventScript_27429C:: @ 827429C
+UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C
 	setescapewarp MAP_ROUTE125, 255, 54, 19
 	return
 
-Underwater3_EventScript_2742A5:: @ 82742A5
+UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5
 	setescapewarp MAP_ROUTE127, 255, 58, 10
 	return
 
-Underwater3_EventScript_2742AE:: @ 82742AE
+UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE
 	setescapewarp MAP_ROUTE127, 255, 62, 31
 	return
 
-Underwater3_EventScript_2742B7:: @ 82742B7
+UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7
 	setescapewarp MAP_ROUTE129, 255, 17, 15
 	return
 
-Underwater3_EventScript_2742C0:: @ 82742C0
+UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0
 	setescapewarp MAP_ROUTE129, 255, 43, 20
 	return
 
@@ -4249,10 +3752,10 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0
 
 SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
 	msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
-	setvar VAR_0x8006, 1
-	call SlateportCity_PokemonFanClub_EventScript_271E7C
+	setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4304,10 +3807,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8
 
 SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
 	msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
-	setvar VAR_0x8006, 0
-	call SlateportCity_OceanicMuseum_1F_EventScript_271E7C
+	setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4376,17 +3879,17 @@ SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF
 	end
 
 SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
-	call SlateportCity_PokemonFanClub_EventScript_271E7C
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
 	msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT
 	setvar VAR_0x8006, 1
-	call SlateportCity_PokemonFanClub_EventScript_271E7C
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
@@ -4425,10 +3928,10 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
 
 LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
 	msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
-	call LilycoveCity_ContestLobby_EventScript_271E7C
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4446,10 +3949,10 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
 	setvar VAR_0x8004, 24
 	special SetContestCategoryStringVarForInterview
 	msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 1
-	call LilycoveCity_ContestLobby_EventScript_271E7C
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
@@ -4466,13 +3969,13 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21
 	end
 
 LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B
-	compare VAR_0x4086, 2
+	compare VAR_LINK_CONTEST_ROOM_STATE, 2
 	goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95
 	setvar VAR_0x8005, 6
 	special InterviewBefore
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95
-	switch VAR_0x4088
+	switch VAR_CONTEST_LOCATION
 	case 0, LilycoveCity_ContestLobby_EventScript_28CB95
 	case 2, LilycoveCity_ContestLobby_EventScript_28CB91
 	case 1, LilycoveCity_ContestLobby_EventScript_28CB91
@@ -4514,9 +4017,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41
 	msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4559,7 +4062,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84
-	compare VAR_0x40BC, 0
+	compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
 	setvar VAR_0x8005, 7
 	special InterviewBefore
@@ -4986,7 +4489,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C
 	special sub_818E3BC
 	compare VAR_0x8004, 0
 	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C
-	compare VAR_0x8004, 15
+	compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER
 	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656
 
 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635
@@ -5630,351 +5133,351 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E
 	.include "data/text/match_call.inc"
 	.include "data/scripts/apprentice.inc"
 
-gBattleDomeOpponentPotential1::
+gBattleDomeOpponentPotentialText1::
 	.string "The best candidate to be a champ!$"
 
-gBattleDomeOpponentPotential2::
+gBattleDomeOpponentPotentialText2::
 	.string "A sure-finalist team.$"
 
-gBattleDomeOpponentPotential3::
+gBattleDomeOpponentPotentialText3::
 	.string "A likely top-three finisher.$"
 
-gBattleDomeOpponentPotential4::
+gBattleDomeOpponentPotentialText4::
 	.string "A candidate to finish first.$"
 
-gBattleDomeOpponentPotential5::
+gBattleDomeOpponentPotentialText5::
 	.string "A team with top-class potential.$"
 
-gBattleDomeOpponentPotential6::
+gBattleDomeOpponentPotentialText6::
 	.string "The dark horse team this tournament.$"
 
-gBattleDomeOpponentPotential7::
+gBattleDomeOpponentPotentialText7::
 	.string "A better-than-average team.$"
 
-gBattleDomeOpponentPotential8::
+gBattleDomeOpponentPotentialText8::
 	.string "This tournament's average team.$"
 
-gBattleDomeOpponentPotential9::
+gBattleDomeOpponentPotentialText9::
 	.string "A team with average potential.$"
 
-gBattleDomeOpponentPotential10::
+gBattleDomeOpponentPotentialText10::
 	.string "A weaker-than-average team.$"
 
-gBattleDomeOpponentPotential11::
+gBattleDomeOpponentPotentialText11::
 	.string "A team looking for its first win.$"
 
-gBattleDomeOpponentPotential12::
+gBattleDomeOpponentPotentialText12::
 	.string "One win will make this team proud.$"
 
-gBattleDomeOpponentPotential13::
+gBattleDomeOpponentPotentialText13::
 	.string "Overall, a weak team.$"
 
-gBattleDomeOpponentPotential14::
+gBattleDomeOpponentPotentialText14::
 	.string "A team with very low potential.$"
 
-gBattleDomeOpponentPotential15::
+gBattleDomeOpponentPotentialText15::
 	.string "A team unlikely to win the tournament.$"
 
-gBattleDomeOpponentPotential16::
+gBattleDomeOpponentPotentialText16::
 	.string "The team most unlikely to win.$"
 
-gBattleDomeOpponentPotential17::
+gBattleDomeOpponentPotentialText17::
 	.string "The perfect, invincible superstar!$"
 
-gBattleDomeOpponentStyle1::
+gBattleDomeOpponentStyleText1::
 	.string "Willing to risk total disaster at times.$"
 
-gBattleDomeOpponentStyle2::
+gBattleDomeOpponentStyleText2::
 	.string "Skilled at enduring long battles.$"
 
-gBattleDomeOpponentStyle3::
+gBattleDomeOpponentStyleText3::
 	.string "Varies tactics to suit the opponent.$"
 
-gBattleDomeOpponentStyle4::
+gBattleDomeOpponentStyleText4::
 	.string "Has a tough winning pattern.$"
 
-gBattleDomeOpponentStyle5::
+gBattleDomeOpponentStyleText5::
 	.string "Occasionally uses a very rare move.$"
 
-gBattleDomeOpponentStyle6::
+gBattleDomeOpponentStyleText6::
 	.string "Uses startling and disruptive moves.$"
 
-gBattleDomeOpponentStyle7::
+gBattleDomeOpponentStyleText7::
 	.string "Constantly watches HP in battle.$"
 
-gBattleDomeOpponentStyle8::
+gBattleDomeOpponentStyleText8::
 	.string "Good at storing then loosing power.$"
 
-gBattleDomeOpponentStyle9::
+gBattleDomeOpponentStyleText9::
 	.string "Skilled at enfeebling foes.$"
 
-gBattleDomeOpponentStyle10::
+gBattleDomeOpponentStyleText10::
 	.string "Prefers tactics that rely on luck.$"
 
-gBattleDomeOpponentStyle11::
+gBattleDomeOpponentStyleText11::
 	.string "Attacks with a regal atmosphere.$"
 
-gBattleDomeOpponentStyle12::
+gBattleDomeOpponentStyleText12::
 	.string "Attacks with powerful, low-PP moves.$"
 
-gBattleDomeOpponentStyle13::
+gBattleDomeOpponentStyleText13::
 	.string "Skilled at enfeebling, then attacking.$"
 
-gBattleDomeOpponentStyle14::
+gBattleDomeOpponentStyleText14::
 	.string "Battles while enduring all attacks.$"
 
-gBattleDomeOpponentStyle15::
+gBattleDomeOpponentStyleText15::
 	.string "Skilled at upsetting foes emotionally.$"
 
-gBattleDomeOpponentStyle16::
+gBattleDomeOpponentStyleText16::
 	.string "Uses strong and straightforward moves.$"
 
-gBattleDomeOpponentStyle17::
+gBattleDomeOpponentStyleText17::
 	.string "Aggressively uses strong moves.$"
 
-gBattleDomeOpponentStyle18::
+gBattleDomeOpponentStyleText18::
 	.string "Battles while cleverly dodging attacks.$"
 
-gBattleDomeOpponentStyle19::
+gBattleDomeOpponentStyleText19::
 	.string "Skilled at using upsetting attacks.$"
 
-gBattleDomeOpponentStyle20::
+gBattleDomeOpponentStyleText20::
 	.string "Uses many popular moves.$"
 
-gBattleDomeOpponentStyle21::
+gBattleDomeOpponentStyleText21::
 	.string "Has moves for powerful combinations.$"
 
-gBattleDomeOpponentStyle22::
+gBattleDomeOpponentStyleText22::
 	.string "Uses high-probability attacks.$"
 
-gBattleDomeOpponentStyle23::
+gBattleDomeOpponentStyleText23::
 	.string "Aggressively uses spectacular moves.$"
 
-gBattleDomeOpponentStyle24::
+gBattleDomeOpponentStyleText24::
 	.string "Emphasizes offense over defense.$"
 
-gBattleDomeOpponentStyle25::
+gBattleDomeOpponentStyleText25::
 	.string "Emphasizes defense over offense.$"
 
-gBattleDomeOpponentStyle26::
+gBattleDomeOpponentStyleText26::
 	.string "Attacks quickly with strong moves.$"
 
-gBattleDomeOpponentStyle27::
+gBattleDomeOpponentStyleText27::
 	.string "Often uses moves with added effects.$"
 
-gBattleDomeOpponentStyle28::
+gBattleDomeOpponentStyleText28::
 	.string "Uses a well-balanced mix of moves.$"
 
-gBattleDomeOpponentStyleUnused1::
+gBattleDomeOpponentStyleTextUnused1::
 	.string "This is sample message 1.$"
 
-gBattleDomeOpponentStyleUnused2::
+gBattleDomeOpponentStyleTextUnused2::
 	.string "This is sample message 2.$"
 
-gBattleDomeOpponentStyleUnused3::
+gBattleDomeOpponentStyleTextUnused3::
 	.string "This is sample message 3.$"
 
-gBattleDomeOpponentStyleUnused4::
+gBattleDomeOpponentStyleTextUnused4::
 	.string "This is sample message 4.$"
 
-gBattleDomeOpponentStats1::
+gBattleDomeOpponentStatsText1::
 	.string "Emphasizes HP and ATTACK.$"
 
-gBattleDomeOpponentStats2::
+gBattleDomeOpponentStatsText2::
 	.string "Emphasizes HP and DEFENSE.$"
 
-gBattleDomeOpponentStats3::
+gBattleDomeOpponentStatsText3::
 	.string "Emphasizes HP and SPEED.$"
 
-gBattleDomeOpponentStats4::
+gBattleDomeOpponentStatsText4::
 	.string "Emphasizes HP and SP. ATTACK.$"
 
-gBattleDomeOpponentStats5::
+gBattleDomeOpponentStatsText5::
 	.string "Emphasizes HP and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats6::
+gBattleDomeOpponentStatsText6::
 	.string "Emphasizes ATTACK and DEFENSE.$"
 
-gBattleDomeOpponentStats7::
+gBattleDomeOpponentStatsText7::
 	.string "Emphasizes ATTACK and SPEED.$"
 
-gBattleDomeOpponentStats8::
+gBattleDomeOpponentStatsText8::
 	.string "Emphasizes ATTACK and SP. ATTACK.$"
 
-gBattleDomeOpponentStats9::
+gBattleDomeOpponentStatsText9::
 	.string "Emphasizes ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats10::
+gBattleDomeOpponentStatsText10::
 	.string "Emphasizes DEFENSE and SPEED.$"
 
-gBattleDomeOpponentStats11::
+gBattleDomeOpponentStatsText11::
 	.string "Emphasizes DEFENSE and SP. ATTACK.$"
 
-gBattleDomeOpponentStats12::
+gBattleDomeOpponentStatsText12::
 	.string "Emphasizes DEFENSE and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats13::
+gBattleDomeOpponentStatsText13::
 	.string "Emphasizes SPEED and SP. ATTACK.$"
 
-gBattleDomeOpponentStats14::
+gBattleDomeOpponentStatsText14::
 	.string "Emphasizes SPEED and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats15::
+gBattleDomeOpponentStatsText15::
 	.string "Emphasizes SP. ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats16::
+gBattleDomeOpponentStatsText16::
 	.string "Emphasizes HP.$"
 
-gBattleDomeOpponentStats17::
+gBattleDomeOpponentStatsText17::
 	.string "Emphasizes ATTACK.$"
 
-gBattleDomeOpponentStats18::
+gBattleDomeOpponentStatsText18::
 	.string "Emphasizes DEFENSE.$"
 
-gBattleDomeOpponentStats19::
+gBattleDomeOpponentStatsText19::
 	.string "Emphasizes SPEED.$"
 
-gBattleDomeOpponentStats20::
+gBattleDomeOpponentStatsText20::
 	.string "Emphasizes SP. ATTACK.$"
 
-gBattleDomeOpponentStats21::
+gBattleDomeOpponentStatsText21::
 	.string "Emphasizes SP. DEFENSE.$"
 
-gBattleDomeOpponentStats22::
+gBattleDomeOpponentStatsText22::
 	.string "Neglects HP and ATTACK.$"
 
-gBattleDomeOpponentStats23::
+gBattleDomeOpponentStatsText23::
 	.string "Neglects HP and DEFENSE.$"
 
-gBattleDomeOpponentStats24::
+gBattleDomeOpponentStatsText24::
 	.string "Neglects HP and SPEED.$"
 
-gBattleDomeOpponentStats25::
+gBattleDomeOpponentStatsText25::
 	.string "Neglects HP and SP. ATTACK.$"
 
-gBattleDomeOpponentStats26::
+gBattleDomeOpponentStatsText26::
 	.string "Neglects HP and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats27::
+gBattleDomeOpponentStatsText27::
 	.string "Neglects ATTACK and DEFENSE.$"
 
-gBattleDomeOpponentStats28::
+gBattleDomeOpponentStatsText28::
 	.string "Neglects ATTACK and SPEED.$"
 
-gBattleDomeOpponentStats29::
+gBattleDomeOpponentStatsText29::
 	.string "Neglects ATTACK and SP. ATTACK.$"
 
-gBattleDomeOpponentStats30::
+gBattleDomeOpponentStatsText30::
 	.string "Neglects ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats31::
+gBattleDomeOpponentStatsText31::
 	.string "Neglects DEFENSE and SPEED.$"
 
-gBattleDomeOpponentStats32::
+gBattleDomeOpponentStatsText32::
 	.string "Neglects DEFENSE and SP. ATTACK.$"
 
-gBattleDomeOpponentStats33::
+gBattleDomeOpponentStatsText33::
 	.string "Neglects DEFENSE and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats34::
+gBattleDomeOpponentStatsText34::
 	.string "Neglects SPEED and SP. ATTACK.$"
 
-gBattleDomeOpponentStats35::
+gBattleDomeOpponentStatsText35::
 	.string "Neglects SPEED and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats36::
+gBattleDomeOpponentStatsText36::
 	.string "Neglects SP. ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats37::
+gBattleDomeOpponentStatsText37::
 	.string "Neglects HP.$"
 
-gBattleDomeOpponentStats38::
+gBattleDomeOpponentStatsText38::
 	.string "Neglects ATTACK.$"
 
-gBattleDomeOpponentStats39::
+gBattleDomeOpponentStatsText39::
 	.string "Neglects DEFENSE.$"
 
-gBattleDomeOpponentStats40::
+gBattleDomeOpponentStatsText40::
 	.string "Neglects SPEED.$"
 
-gBattleDomeOpponentStats41::
+gBattleDomeOpponentStatsText41::
 	.string "Neglects SP. ATTACK.$"
 
-gBattleDomeOpponentStats42::
+gBattleDomeOpponentStatsText42::
 	.string "Neglects SP. DEFENSE.$"
 
-gBattleDomeOpponentStats43::
+gBattleDomeOpponentStatsText43::
 	.string "Raises POKéMON in a well-balanced way.$"
 
-gBattleDomeWinStrings1::
+gBattleDomeWinText1::
 	.string "Let the battle begin!$"
 
-gBattleDomeWinStrings2::
+gBattleDomeWinText2::
 	.string "{STR_VAR_1} won using {STR_VAR_2}!$"
 
-gBattleDomeWinStrings3::
+gBattleDomeWinText3::
 	.string "{STR_VAR_1} became the champ!$"
 
-gBattleDomeWinStrings4::
+gBattleDomeWinText4::
 	.string "{STR_VAR_1} won by default!$"
 
-gBattleDomeWinStrings5::
+gBattleDomeWinText5::
 	.string "{STR_VAR_1} won outright by default!$"
 
-gBattleDomeWinStrings6::
+gBattleDomeWinText6::
 	.string "{STR_VAR_1} won without using a move!$"
 
-gBattleDomeWinStrings7::
+gBattleDomeWinText7::
 	.string "{STR_VAR_1} won outright with no moves!$"
 
-gBattleDomeMatchNumber1::
+gBattleDomeMatchNumberText1::
 	.string "Round 1, Match 1$"
 
-gBattleDomeMatchNumber2::
+gBattleDomeMatchNumberText2::
 	.string "Round 1, Match 2$"
 
-gBattleDomeMatchNumber3::
+gBattleDomeMatchNumberText3::
 	.string "Round 1, Match 3$"
 
-gBattleDomeMatchNumber4::
+gBattleDomeMatchNumberText4::
 	.string "Round 1, Match 4$"
 
-gBattleDomeMatchNumber5::
+gBattleDomeMatchNumberText5::
 	.string "Round 1, Match 5$"
 
-gBattleDomeMatchNumber6::
+gBattleDomeMatchNumberText6::
 	.string "Round 1, Match 6$"
 
-gBattleDomeMatchNumber7::
+gBattleDomeMatchNumberText7::
 	.string "Round 1, Match 7$"
 
-gBattleDomeMatchNumber8::
+gBattleDomeMatchNumberText8::
 	.string "Round 1, Match 8$"
 
-gBattleDomeMatchNumber9::
+gBattleDomeMatchNumberText9::
 	.string "Round 2, Match 1$"
 
-gBattleDomeMatchNumber10::
+gBattleDomeMatchNumberText10::
 	.string "Round 2, Match 2$"
 
-gBattleDomeMatchNumber11::
+gBattleDomeMatchNumberText11::
 	.string "Round 2, Match 3$"
 
-gBattleDomeMatchNumber12::
+gBattleDomeMatchNumberText12::
 	.string "Round 2, Match 4$"
 
-gBattleDomeMatchNumber13::
+gBattleDomeMatchNumberText13::
 	.string "Semifinal Match 1$"
 
-gBattleDomeMatchNumber14::
+gBattleDomeMatchNumberText14::
 	.string "Semifinal Match 2$"
 
-gBattleDomeMatchNumber15::
+gBattleDomeMatchNumberText15::
 	.string "Final Match$"
 
 BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B
-	map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
-	map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
 
 BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25
 	setvar VAR_0x8004, 4
@@ -7112,7 +6615,7 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
 	msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 23
-	call SlateportCity_PokemonFanClub_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
 	setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER
@@ -7141,7 +6644,7 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E
 	goto_if_eq MauvilleCity_EventScript_2C7FD2
 	msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 16
-	call MauvilleCity_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_EventScript_2C7FD2
 	setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT
@@ -7170,7 +6673,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6
 	goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
 	msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 29
-	call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
 	setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER
@@ -7199,7 +6702,7 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E
 	goto_if_eq LavaridgeTown_House_EventScript_2C80A2
 	msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 7
-	call LavaridgeTown_House_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq LavaridgeTown_House_EventScript_2C80A2
 	setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC
@@ -7228,7 +6731,7 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6
 	goto_if_eq FallarborTown_Mart_EventScript_2C810A
 	msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 8
-	call FallarborTown_Mart_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_Mart_EventScript_2C810A
 	setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME
@@ -7257,7 +6760,7 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E
 	goto_if_eq FortreeCity_House2_EventScript_2C8172
 	msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 24
-	call FortreeCity_House2_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq FortreeCity_House2_EventScript_2C8172
 	setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK
@@ -7286,7 +6789,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 14
-	call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
 	setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE
@@ -7315,7 +6818,7 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE
 	goto_if_eq MossdeepCity_EventScript_2C8242
 	msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 15
-	call MossdeepCity_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_EventScript_2C8242
 	setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH
@@ -7344,7 +6847,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256
 	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
 	msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 4
-	call SootopolisCity_PokemonCenter_1F_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
 	setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE
@@ -7373,7 +6876,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE
 	goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
 	msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 12
-	call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326
+	call EventScript_ShowPartyMenu
 	compare VAR_RESULT, 0
 	goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
 	setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION
@@ -7390,16 +6893,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C
 	release
 	end
 
-FallarborTown_Mart_EventScript_2C8326:: @ 82C8326
-FortreeCity_House2_EventScript_2C8326:: @ 82C8326
-LavaridgeTown_House_EventScript_2C8326:: @ 82C8326
-LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326:: @ 82C8326
-MauvilleCity_EventScript_2C8326:: @ 82C8326
-MossdeepCity_EventScript_2C8326:: @ 82C8326
-PacifidlogTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326
-SlateportCity_PokemonFanClub_EventScript_2C8326:: @ 82C8326
-SootopolisCity_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326
-VerdanturfTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326
+EventScript_ShowPartyMenu:: @ 82C8326
 	special sub_81B892C
 	waitstate
 	lock
@@ -7425,16 +6919,16 @@ TrainerHill_3F_MapScript1_2C8336: @ 82C8336
 TrainerHill_4F_MapScript1_2C8336: @ 82C8336
 TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 2
+	compare VAR_RESULT, B_OUTCOME_LOST
 	goto_if_eq TrainerHill_1F_EventScript_2C83C9
-	compare VAR_RESULT, 3
+	compare VAR_RESULT, B_OUTCOME_DREW
 	goto_if_eq TrainerHill_1F_EventScript_2C83C9
-	compare VAR_RESULT, 9
+	compare VAR_RESULT, B_OUTCOME_FORFEITED
 	goto_if_eq TrainerHill_1F_EventScript_2C83C9
 	end
 
@@ -7458,7 +6952,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
 
 EventScript_TrainerHillTimer:: @ 82C8393
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_7
 	special CallTrainerHillFunction
 	msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT
 	releaseall
@@ -7466,7 +6960,7 @@ EventScript_TrainerHillTimer:: @ 82C8393
 
 TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_9
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_1F_EventScript_2C83BF
@@ -7478,9 +6972,9 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
 	end
 
 TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_12
 	special CallTrainerHillFunction
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_1, 1
 	end
@@ -7497,8 +6991,8 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
 	step_end
 
 EventScript_2C83F0:: @ 82C83F0
-	trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
-	setvar VAR_0x8004, 11
+	trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_11
 	special CallTrainerHillFunction
 	waitmessage
 	waitbuttonpress
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 93fe33f8a..291d6abec 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -65,7 +65,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_Unknown57
 	.4byte gFieldEffectScript_Unknown58
 	.4byte gFieldEffectScript_FieldMoveShowMonInit
-	.4byte gFieldEffectScript_Unknown60
+	.4byte gFieldEffectScript_UsePuzzleEffect
 	.4byte gFieldEffectScript_Unknown61
 	.4byte gFieldEffectScript_Unknown62
 	.4byte gFieldEffectScript_Unknown63
@@ -315,7 +315,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
 	field_eff_callnative FldEff_FieldMoveShowMonInit
 	field_eff_end
 
-gFieldEffectScript_Unknown60:: @ 82DBCD2
+gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
 	field_eff_callnative FldEff_UsePuzzleEffect
 	field_eff_end
 
diff --git a/data/io_reg.s b/data/io_reg.s
index e6315cd89..9c5f64f58 100644
--- a/data/io_reg.s
+++ b/data/io_reg.s
@@ -24,11 +24,11 @@ gUnref_82EC784:: @ 82EC784
     .4byte 0x02000100
     .4byte 0x08000400
 
-gUnknown_82EC7C4:: @ 82EC7C4
-	.2byte 0x0100
-	.2byte 0x0200
-	.2byte 0x0400
-	.2byte 0x0800
+gOverworldBackgroundLayerFlags:: @ 82EC7C4
+	.2byte 0x0100 /* BLDCNT_TGT2_BG0 */
+	.2byte 0x0200 /* BLDCNT_TGT2_BG1 */
+	.2byte 0x0400 /* BLDCNT_TGT2_BG2 */
+	.2byte 0x0800 /* BLDCNT_TGT2_BG3 */
 
 gUnknown_82EC7CC:: @ 82EC7CC
 	.2byte 0x0001
diff --git a/data/layouts.inc b/data/layouts.inc
deleted file mode 100755
index 97b3b97c8..000000000
--- a/data/layouts.inc
+++ /dev/null
@@ -1,441 +0,0 @@
-	.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/UnknownMap_08417FC4/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/Mart/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/FallarborTown_LeftoverRSContestLobby/layout.inc"
-	.include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc"
-	.include "data/layouts/LilycoveCity_House2/layout.inc"
-	.include "data/layouts/UnknownMap_08428450/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_084294C4/layout.inc"
-	.include "data/layouts/UnknownMap_084294E8/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/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_ShortHall/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_UnusedRubySapphireMap1/layout.inc"
-	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc"
-	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc"
-	.include "data/layouts/CaveOfOrigin_B1F/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_0843E6C0/layout.inc"
-	.include "data/layouts/UnknownMap_0843E6E4/layout.inc"
-	.include "data/layouts/UnknownMap_0843E708/layout.inc"
-	.include "data/layouts/UnknownMap_0843E72C/layout.inc"
-	.include "data/layouts/UnknownMap_0843E750/layout.inc"
-	.include "data/layouts/UnknownMap_0843E774/layout.inc"
-	.include "data/layouts/UnknownMap_0843E798/layout.inc"
-	.include "data/layouts/UnknownMap_0843E7BC/layout.inc"
-	.include "data/layouts/UnknownMap_0843E7E0/layout.inc"
-	.include "data/layouts/UnknownMap_0843E804/layout.inc"
-	.include "data/layouts/UnknownMap_0843E828/layout.inc"
-	.include "data/layouts/UnknownMap_0843E84C/layout.inc"
-	.include "data/layouts/UnknownMap_0843E870/layout.inc"
-	.include "data/layouts/UnknownMap_0843E894/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_North/layout.inc"
-	.include "data/layouts/SafariZone_Southwest/layout.inc"
-	.include "data/layouts/SafariZone_South/layout.inc"
-	.include "data/layouts/UnknownMap_08447028/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_SeasideCyclingRoadEntrance/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/BattleFrontier_BattleTowerLobby/layout.inc"
-	.include "data/layouts/BattleFrontier_OutsideWest/layout.inc"
-	.include "data/layouts/BattleElevator/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc"
-	.include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc"
-	.include "data/layouts/EverGrandeCity_PokemonLeague_1F/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_LotadAndSeedotHouse/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_0845A394/layout.inc"
-	.include "data/layouts/RustboroCity_Flat1_1F/layout.inc"
-	.include "data/layouts/RustboroCity_Flat1_2F/layout.inc"
-	.include "data/layouts/EverGrandeCity_Hall4/layout.inc"
-	.include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc"
-	.include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc"
-	.include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc"
-	.include "data/layouts/UnknownMap_0845D470/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_0845ECB4/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"
-	.include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc"
-	.include "data/layouts/MagmaHideout_1F/layout.inc"
-	.include "data/layouts/MagmaHideout_2F_1R/layout.inc"
-	.include "data/layouts/MagmaHideout_2F_2R/layout.inc"
-	.include "data/layouts/MagmaHideout_3F_1R/layout.inc"
-	.include "data/layouts/MagmaHideout_3F_2R/layout.inc"
-	.include "data/layouts/MagmaHideout_4F/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc"
-	.include "data/layouts/BattleFrontier_OutsideEast/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc"
-	.include "data/layouts/UnknownMap_08469200/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc"
-	.include "data/layouts/UnknownMap_084693AC/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc"
-	.include "data/layouts/BattlePyramidSquare01/layout.inc"
-	.include "data/layouts/BattlePyramidSquare02/layout.inc"
-	.include "data/layouts/BattlePyramidSquare03/layout.inc"
-	.include "data/layouts/BattlePyramidSquare04/layout.inc"
-	.include "data/layouts/BattlePyramidSquare05/layout.inc"
-	.include "data/layouts/BattlePyramidSquare06/layout.inc"
-	.include "data/layouts/BattlePyramidSquare07/layout.inc"
-	.include "data/layouts/BattlePyramidSquare08/layout.inc"
-	.include "data/layouts/BattlePyramidSquare09/layout.inc"
-	.include "data/layouts/BattlePyramidSquare10/layout.inc"
-	.include "data/layouts/BattlePyramidSquare11/layout.inc"
-	.include "data/layouts/BattlePyramidSquare12/layout.inc"
-	.include "data/layouts/BattlePyramidSquare13/layout.inc"
-	.include "data/layouts/BattlePyramidSquare14/layout.inc"
-	.include "data/layouts/BattlePyramidSquare15/layout.inc"
-	.include "data/layouts/BattlePyramidSquare16/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc"
-	.include "data/layouts/MagmaHideout_3F_3R/layout.inc"
-	.include "data/layouts/MagmaHideout_2F_3R/layout.inc"
-	.include "data/layouts/MirageTower_1F/layout.inc"
-	.include "data/layouts/MirageTower_2F/layout.inc"
-	.include "data/layouts/MirageTower_3F/layout.inc"
-	.include "data/layouts/BattleTentLobby/layout.inc"
-	.include "data/layouts/BattleTentCorridor/layout.inc"
-	.include "data/layouts/BattleTentBattleRoom/layout.inc"
-	.include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc"
-	.include "data/layouts/MirageTower_4F/layout.inc"
-	.include "data/layouts/DesertUnderpass/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc"
-	.include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc"
-	.include "data/layouts/Route111_NoMirageTower/layout.inc"
-	.include "data/layouts/UnionRoom/layout.inc"
-	.include "data/layouts/SafariZone_Northeast/layout.inc"
-	.include "data/layouts/SafariZone_Southeast/layout.inc"
-	.include "data/layouts/BattleFrontier_RankingHall/layout.inc"
-	.include "data/layouts/BattleFrontier_Lounge1/layout.inc"
-	.include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc"
-	.include "data/layouts/BattleFrontier_ReceptionGate/layout.inc"
-	.include "data/layouts/ArtisanCave_B1F/layout.inc"
-	.include "data/layouts/ArtisanCave_1F/layout.inc"
-	.include "data/layouts/FarawayIsland_Entrance/layout.inc"
-	.include "data/layouts/FarawayIsland_Interior/layout.inc"
-	.include "data/layouts/BirthIsland_Exterior/layout.inc"
-	.include "data/layouts/IslandHarbor/layout.inc"
-	.include "data/layouts/Underwater_MarineCave/layout.inc"
-	.include "data/layouts/MarineCave_Entrance/layout.inc"
-	.include "data/layouts/TerraCave_Entrance/layout.inc"
-	.include "data/layouts/TerraCave_End/layout.inc"
-	.include "data/layouts/Underwater6/layout.inc"
-	.include "data/layouts/Underwater7/layout.inc"
-	.include "data/layouts/Underwater5/layout.inc"
-	.include "data/layouts/MarineCave_End/layout.inc"
-	.include "data/layouts/TrainerHill_Entrance/layout.inc"
-	.include "data/layouts/TrainerHill_1F/layout.inc"
-	.include "data/layouts/TrainerHill_2F/layout.inc"
-	.include "data/layouts/TrainerHill_3F/layout.inc"
-	.include "data/layouts/TrainerHill_4F/layout.inc"
-	.include "data/layouts/TrainerHill_Roof/layout.inc"
-	.include "data/layouts/AlteringCave/layout.inc"
-	.include "data/layouts/NavelRock_Exterior/layout.inc"
-	.include "data/layouts/NavelRock_Entrance/layout.inc"
-	.include "data/layouts/NavelRock_Top/layout.inc"
-	.include "data/layouts/NavelRock_Bottom/layout.inc"
-	.include "data/layouts/NavelRock_LadderRoom1/layout.inc"
-	.include "data/layouts/NavelRock_LadderRoom2/layout.inc"
-	.include "data/layouts/NavelRock_B1F/layout.inc"
-	.include "data/layouts/NavelRock_Fork/layout.inc"
-	.include "data/layouts/BattleFrontier_Lounge2/layout.inc"
-	.include "data/layouts/BattleFrontier_ScottsHouse/layout.inc"
-	.include "data/layouts/MeteorFalls_StevensCave/layout.inc"
-	.include "data/layouts/UnknownMap_08480DAC/layout.inc"
-	.include "data/layouts/UnknownMap_08480F54/layout.inc"
-	.include "data/layouts/UnknownMap_084810FC/layout.inc"
-	.include "data/layouts/UnknownMap_084812A4/layout.inc"
-	.include "data/layouts/UnknownMap_0848144C/layout.inc"
-	.include "data/layouts/UnknownMap_084815F4/layout.inc"
-	.include "data/layouts/UnknownMap_08481B24/layout.inc"
-	.include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc"
-	.include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc"
-	.include "data/layouts/UnknownMap_08481DBC/layout.inc"
diff --git a/data/layouts/.gitignore b/data/layouts/.gitignore
new file mode 100755
index 000000000..eaa83a6f1
--- /dev/null
+++ b/data/layouts/.gitignore
@@ -0,0 +1,2 @@
+layouts.inc
+layouts_table.inc
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
deleted file mode 100644
index d9e122ef2..000000000
--- a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_CaptainsOffice_MapBorder::
-	.incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
-
-AbandonedShip_CaptainsOffice_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
-
-	.align 2
-AbandonedShip_CaptainsOffice_Layout::
-	.4byte 0x9
-	.4byte 0x7
-	.4byte AbandonedShip_CaptainsOffice_MapBorder
-	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
deleted file mode 100644
index d5fd22578..000000000
--- a/data/layouts/AbandonedShip_Corridors_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Corridors_1F_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
-
-AbandonedShip_Corridors_1F_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_1F_Layout::
-	.4byte 0x12
-	.4byte 0xc
-	.4byte AbandonedShip_Corridors_1F_MapBorder
-	.4byte AbandonedShip_Corridors_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
deleted file mode 100644
index 7299aa6f8..000000000
--- a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Corridors_B1F_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
-
-AbandonedShip_Corridors_B1F_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_B1F_Layout::
-	.4byte 0xd
-	.4byte 0xa
-	.4byte AbandonedShip_Corridors_B1F_MapBorder
-	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc
deleted file mode 100644
index 7f0baaaec..000000000
--- a/data/layouts/AbandonedShip_Deck/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Deck_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Deck/border.bin"
-
-AbandonedShip_Deck_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Deck/map.bin"
-
-	.align 2
-AbandonedShip_Deck_Layout::
-	.4byte 0x17
-	.4byte 0x15
-	.4byte AbandonedShip_Deck_MapBorder
-	.4byte AbandonedShip_Deck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
deleted file mode 100644
index 0ee7aa755..000000000
--- a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_HiddenFloorCorridors_MapBorder::
-	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
-
-AbandonedShip_HiddenFloorCorridors_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorCorridors_Layout::
-	.4byte 0xd
-	.4byte 0xb
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
deleted file mode 100644
index bf2f758d7..000000000
--- a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_HiddenFloorRooms_MapBorder::
-	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
-
-AbandonedShip_HiddenFloorRooms_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorRooms_Layout::
-	.4byte 0x2c
-	.4byte 0xf
-	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
-	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc
deleted file mode 100644
index fdd5b395d..000000000
--- a/data/layouts/AbandonedShip_Room_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Room_B1F_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
-
-AbandonedShip_Room_B1F_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Room_B1F_Layout::
-	.4byte 0x9
-	.4byte 0x8
-	.4byte AbandonedShip_Room_B1F_MapBorder
-	.4byte AbandonedShip_Room_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
deleted file mode 100644
index d15652cc0..000000000
--- a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms2_1F_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
-
-AbandonedShip_Rooms2_1F_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_1F_Layout::
-	.4byte 0x9
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms2_1F_MapBorder
-	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
deleted file mode 100644
index d99e43f47..000000000
--- a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms2_B1F_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
-
-AbandonedShip_Rooms2_B1F_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_B1F_Layout::
-	.4byte 0x12
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms2_B1F_MapBorder
-	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
deleted file mode 100644
index 63e4a716a..000000000
--- a/data/layouts/AbandonedShip_Rooms_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms_1F_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
-
-AbandonedShip_Rooms_1F_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_1F_Layout::
-	.4byte 0x12
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms_1F_MapBorder
-	.4byte AbandonedShip_Rooms_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
deleted file mode 100644
index ab688d668..000000000
--- a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms_B1F_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
-
-AbandonedShip_Rooms_B1F_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_B1F_Layout::
-	.4byte 0x1b
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms_B1F_MapBorder
-	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc
deleted file mode 100644
index 8fa1b1485..000000000
--- a/data/layouts/AbandonedShip_Underwater1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Underwater1_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
-
-AbandonedShip_Underwater1_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
-
-	.align 2
-AbandonedShip_Underwater1_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte AbandonedShip_Underwater1_MapBorder
-	.4byte AbandonedShip_Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc
deleted file mode 100644
index feea82d16..000000000
--- a/data/layouts/AbandonedShip_Underwater2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Underwater2_MapBorder::
-	.incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
-
-AbandonedShip_Underwater2_MapBlockdata::
-	.incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
-
-	.align 2
-AbandonedShip_Underwater2_Layout::
-	.4byte 0x15
-	.4byte 0x7
-	.4byte AbandonedShip_Underwater2_MapBorder
-	.4byte AbandonedShip_Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc
deleted file mode 100644
index 9f03e7d87..000000000
--- a/data/layouts/AlteringCave/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AlteringCave_MapBorder::
-	.incbin "data/layouts/AlteringCave/border.bin"
-
-AlteringCave_MapBlockdata::
-	.incbin "data/layouts/AlteringCave/map.bin"
-
-	.align 2
-AlteringCave_Layout::
-	.4byte 0x20
-	.4byte 0x18
-	.4byte AlteringCave_MapBorder
-	.4byte AlteringCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc
deleted file mode 100644
index ad173f936..000000000
--- a/data/layouts/AncientTomb/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AncientTomb_MapBorder::
-	.incbin "data/layouts/AncientTomb/border.bin"
-
-AncientTomb_MapBlockdata::
-	.incbin "data/layouts/AncientTomb/map.bin"
-
-	.align 2
-AncientTomb_Layout::
-	.4byte 0x11
-	.4byte 0x21
-	.4byte AncientTomb_MapBorder
-	.4byte AncientTomb_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc
deleted file mode 100644
index 5508a668b..000000000
--- a/data/layouts/AquaHideout_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_1F_MapBorder::
-	.incbin "data/layouts/AquaHideout_1F/border.bin"
-
-AquaHideout_1F_MapBlockdata::
-	.incbin "data/layouts/AquaHideout_1F/map.bin"
-
-	.align 2
-AquaHideout_1F_Layout::
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte AquaHideout_1F_MapBorder
-	.4byte AquaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc
deleted file mode 100644
index 0889e548a..000000000
--- a/data/layouts/AquaHideout_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_B1F_MapBorder::
-	.incbin "data/layouts/AquaHideout_B1F/border.bin"
-
-AquaHideout_B1F_MapBlockdata::
-	.incbin "data/layouts/AquaHideout_B1F/map.bin"
-
-	.align 2
-AquaHideout_B1F_Layout::
-	.4byte 0x33
-	.4byte 0x18
-	.4byte AquaHideout_B1F_MapBorder
-	.4byte AquaHideout_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc
deleted file mode 100644
index 9e335e5d9..000000000
--- a/data/layouts/AquaHideout_B2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_B2F_MapBorder::
-	.incbin "data/layouts/AquaHideout_B2F/border.bin"
-
-AquaHideout_B2F_MapBlockdata::
-	.incbin "data/layouts/AquaHideout_B2F/map.bin"
-
-	.align 2
-AquaHideout_B2F_Layout::
-	.4byte 0x22
-	.4byte 0x18
-	.4byte AquaHideout_B2F_MapBorder
-	.4byte AquaHideout_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc
deleted file mode 100644
index 05862b275..000000000
--- a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_UnusedRubyMap1_MapBorder::
-	.incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin"
-
-AquaHideout_UnusedRubyMap1_MapBlockdata::
-	.incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap1_Layout::
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte AquaHideout_UnusedRubyMap1_MapBorder
-	.4byte AquaHideout_UnusedRubyMap1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc
deleted file mode 100644
index e9e08ab97..000000000
--- a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_UnusedRubyMap2_MapBorder::
-	.incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin"
-
-AquaHideout_UnusedRubyMap2_MapBlockdata::
-	.incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap2_Layout::
-	.4byte 0x3e
-	.4byte 0x18
-	.4byte AquaHideout_UnusedRubyMap2_MapBorder
-	.4byte AquaHideout_UnusedRubyMap2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc
deleted file mode 100644
index 44b35666f..000000000
--- a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_UnusedRubyMap3_MapBorder::
-	.incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin"
-
-AquaHideout_UnusedRubyMap3_MapBlockdata::
-	.incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap3_Layout::
-	.4byte 0x22
-	.4byte 0x18
-	.4byte AquaHideout_UnusedRubyMap3_MapBorder
-	.4byte AquaHideout_UnusedRubyMap3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc
deleted file mode 100644
index b32eef422..000000000
--- a/data/layouts/ArtisanCave_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ArtisanCave_1F_MapBorder::
-	.incbin "data/layouts/ArtisanCave_1F/border.bin"
-
-ArtisanCave_1F_MapBlockdata::
-	.incbin "data/layouts/ArtisanCave_1F/map.bin"
-
-	.align 2
-ArtisanCave_1F_Layout::
-	.4byte 0x15
-	.4byte 0x16
-	.4byte ArtisanCave_1F_MapBorder
-	.4byte ArtisanCave_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc
deleted file mode 100644
index 2640303e3..000000000
--- a/data/layouts/ArtisanCave_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ArtisanCave_B1F_MapBorder::
-	.incbin "data/layouts/ArtisanCave_B1F/border.bin"
-
-ArtisanCave_B1F_MapBlockdata::
-	.incbin "data/layouts/ArtisanCave_B1F/map.bin"
-
-	.align 2
-ArtisanCave_B1F_Layout::
-	.4byte 0x2e
-	.4byte 0x36
-	.4byte ArtisanCave_B1F_MapBorder
-	.4byte ArtisanCave_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc
deleted file mode 100644
index 374af9ffa..000000000
--- a/data/layouts/BattleElevator/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleElevator_MapBorder::
-	.incbin "data/layouts/BattleElevator/border.bin"
-
-BattleElevator_MapBlockdata::
-	.incbin "data/layouts/BattleElevator/map.bin"
-
-	.align 2
-BattleElevator_Layout::
-	.4byte 0x5
-	.4byte 0x7
-	.4byte BattleElevator_MapBorder
-	.4byte BattleElevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc
deleted file mode 100644
index 89f799d84..000000000
--- a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleArenaBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin"
-
-BattleFrontier_BattleArenaBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleArenaBattleRoom_Layout::
-	.4byte 0x10
-	.4byte 0xb
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleArena
-
diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc
deleted file mode 100644
index 8961ed778..000000000
--- a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleArenaCorridor_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin"
-
-BattleFrontier_BattleArenaCorridor_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattleArenaCorridor_Layout::
-	.4byte 0x12
-	.4byte 0xe
-	.4byte BattleFrontier_BattleArenaCorridor_MapBorder
-	.4byte BattleFrontier_BattleArenaCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleArena
-
diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc
deleted file mode 100644
index 305fcc0d9..000000000
--- a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleArenaLobby_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin"
-
-BattleFrontier_BattleArenaLobby_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleArenaLobby_Layout::
-	.4byte 0x10
-	.4byte 0xd
-	.4byte BattleFrontier_BattleArenaLobby_MapBorder
-	.4byte BattleFrontier_BattleArenaLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleArena
-
diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc
deleted file mode 100644
index a4991ae0c..000000000
--- a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomeBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin"
-
-BattleFrontier_BattleDomeBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomeBattleRoom_Layout::
-	.4byte 0x14
-	.4byte 0xa
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc
deleted file mode 100644
index 7f3c93b82..000000000
--- a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomeCorridor_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin"
-
-BattleFrontier_BattleDomeCorridor_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomeCorridor_Layout::
-	.4byte 0x30
-	.4byte 0x7
-	.4byte BattleFrontier_BattleDomeCorridor_MapBorder
-	.4byte BattleFrontier_BattleDomeCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc
deleted file mode 100644
index 2553e7098..000000000
--- a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomeLobby_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin"
-
-BattleFrontier_BattleDomeLobby_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomeLobby_Layout::
-	.4byte 0x17
-	.4byte 0x11
-	.4byte BattleFrontier_BattleDomeLobby_MapBorder
-	.4byte BattleFrontier_BattleDomeLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc
deleted file mode 100644
index 8c0fe2ce5..000000000
--- a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomePreBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin"
-
-BattleFrontier_BattleDomePreBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomePreBattleRoom_Layout::
-	.4byte 0x9
-	.4byte 0x8
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc
deleted file mode 100644
index 21ba6a015..000000000
--- a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleFactoryBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin"
-
-BattleFrontier_BattleFactoryBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryBattleRoom_Layout::
-	.4byte 0xd
-	.4byte 0xc
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFactory
-
diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc
deleted file mode 100644
index cc0a33611..000000000
--- a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleFactoryLobby_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin"
-
-BattleFrontier_BattleFactoryLobby_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryLobby_Layout::
-	.4byte 0x13
-	.4byte 0xc
-	.4byte BattleFrontier_BattleFactoryLobby_MapBorder
-	.4byte BattleFrontier_BattleFactoryLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFactory
-
diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc
deleted file mode 100644
index fc4fc49bc..000000000
--- a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleFactoryPreBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin"
-
-BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryPreBattleRoom_Layout::
-	.4byte 0x11
-	.4byte 0xe
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFactory
-
diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc
deleted file mode 100644
index 3d9acc3c4..000000000
--- a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePalaceBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin"
-
-BattleFrontier_BattlePalaceBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceBattleRoom_Layout::
-	.4byte 0xf
-	.4byte 0xa
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattlePalace
-
diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc
deleted file mode 100644
index 2d16216c5..000000000
--- a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePalaceCorridor_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin"
-
-BattleFrontier_BattlePalaceCorridor_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceCorridor_Layout::
-	.4byte 0x11
-	.4byte 0xe
-	.4byte BattleFrontier_BattlePalaceCorridor_MapBorder
-	.4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattlePalace
-
diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc
deleted file mode 100644
index f9a1dad7b..000000000
--- a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePalaceLobby_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin"
-
-BattleFrontier_BattlePalaceLobby_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceLobby_Layout::
-	.4byte 0x19
-	.4byte 0xc
-	.4byte BattleFrontier_BattlePalaceLobby_MapBorder
-	.4byte BattleFrontier_BattlePalaceLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePalace
-
diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc
deleted file mode 100644
index 1d6d21778..000000000
--- a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeCorridor_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin"
-
-BattleFrontier_BattlePikeCorridor_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeCorridor_Layout::
-	.4byte 0xe
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePikeCorridor_MapBorder
-	.4byte BattleFrontier_BattlePikeCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc
deleted file mode 100644
index 3a5cd3538..000000000
--- a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeLobby_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin"
-
-BattleFrontier_BattlePikeLobby_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeLobby_Layout::
-	.4byte 0xb
-	.4byte 0xd
-	.4byte BattleFrontier_BattlePikeLobby_MapBorder
-	.4byte BattleFrontier_BattlePikeLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc
deleted file mode 100644
index 466ad0ff4..000000000
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom1_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin"
-
-BattleFrontier_BattlePikeRandomRoom1_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom1_Layout::
-	.4byte 0x9
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc
deleted file mode 100644
index 1c7fb35d4..000000000
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom2_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin"
-
-BattleFrontier_BattlePikeRandomRoom2_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom2_Layout::
-	.4byte 0x5
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc
deleted file mode 100644
index ce17a0bf6..000000000
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom3_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin"
-
-BattleFrontier_BattlePikeRandomRoom3_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom3_Layout::
-	.4byte 0x9
-	.4byte 0x14
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc
deleted file mode 100644
index d7a082d13..000000000
--- a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeThreePathRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin"
-
-BattleFrontier_BattlePikeThreePathRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeThreePathRoom_Layout::
-	.4byte 0xd
-	.4byte 0xb
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc
deleted file mode 100644
index a65e7928b..000000000
--- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePointExchangeServiceCorner_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin"
-
-BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
-
-	.align 2
-BattleFrontier_BattlePointExchangeServiceCorner_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc
deleted file mode 100644
index a9e779ddb..000000000
--- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePyramidEmptySquare_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin"
-
-BattleFrontier_BattlePyramidEmptySquare_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidEmptySquare_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc
deleted file mode 100644
index 28575776a..000000000
--- a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePyramidLobby_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin"
-
-BattleFrontier_BattlePyramidLobby_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidLobby_Layout::
-	.4byte 0xf
-	.4byte 0x12
-	.4byte BattleFrontier_BattlePyramidLobby_MapBorder
-	.4byte BattleFrontier_BattlePyramidLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc
deleted file mode 100644
index 4657c37a3..000000000
--- a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePyramidTop_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin"
-
-BattleFrontier_BattlePyramidTop_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidTop_Layout::
-	.4byte 0x22
-	.4byte 0x17
-	.4byte BattleFrontier_BattlePyramidTop_MapBorder
-	.4byte BattleFrontier_BattlePyramidTop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc
deleted file mode 100644
index 3d498239a..000000000
--- a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin"
-
-BattleFrontier_BattleTowerBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerBattleRoom_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc
deleted file mode 100644
index 56335aa23..000000000
--- a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerCorridor_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin"
-
-BattleFrontier_BattleTowerCorridor_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerCorridor_Layout::
-	.4byte 0x11
-	.4byte 0x5
-	.4byte BattleFrontier_BattleTowerCorridor_MapBorder
-	.4byte BattleFrontier_BattleTowerCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc
deleted file mode 100644
index 7dba3777c..000000000
--- a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerCorridor2_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin"
-
-BattleFrontier_BattleTowerCorridor2_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerCorridor2_Layout::
-	.4byte 0x11
-	.4byte 0x5
-	.4byte BattleFrontier_BattleTowerCorridor2_MapBorder
-	.4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc
deleted file mode 100644
index 790ff3bcd..000000000
--- a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerLobby_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin"
-
-BattleFrontier_BattleTowerLobby_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerLobby_Layout::
-	.4byte 0x19
-	.4byte 0xa
-	.4byte BattleFrontier_BattleTowerLobby_MapBorder
-	.4byte BattleFrontier_BattleTowerLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc
deleted file mode 100644
index df5615873..000000000
--- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerMultiBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin"
-
-BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerMultiBattleRoom_Layout::
-	.4byte 0x15
-	.4byte 0xf
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc
deleted file mode 100644
index c25b3b2a0..000000000
--- a/data/layouts/BattleFrontier_Lounge1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge1_MapBorder::
-	.incbin "data/layouts/BattleFrontier_Lounge1/border.bin"
-
-BattleFrontier_Lounge1_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_Lounge1/map.bin"
-
-	.align 2
-BattleFrontier_Lounge1_Layout::
-	.4byte 0xd
-	.4byte 0x8
-	.4byte BattleFrontier_Lounge1_MapBorder
-	.4byte BattleFrontier_Lounge1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc
deleted file mode 100644
index b735b4994..000000000
--- a/data/layouts/BattleFrontier_Lounge2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge2_MapBorder::
-	.incbin "data/layouts/BattleFrontier_Lounge2/border.bin"
-
-BattleFrontier_Lounge2_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_Lounge2/map.bin"
-
-	.align 2
-BattleFrontier_Lounge2_Layout::
-	.4byte 0x9
-	.4byte 0xa
-	.4byte BattleFrontier_Lounge2_MapBorder
-	.4byte BattleFrontier_Lounge2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc
deleted file mode 100644
index ddaf20446..000000000
--- a/data/layouts/BattleFrontier_OutsideEast/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_OutsideEast_MapBorder::
-	.incbin "data/layouts/BattleFrontier_OutsideEast/border.bin"
-
-BattleFrontier_OutsideEast_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_OutsideEast/map.bin"
-
-	.align 2
-BattleFrontier_OutsideEast_Layout::
-	.4byte 0x48
-	.4byte 0x48
-	.4byte BattleFrontier_OutsideEast_MapBorder
-	.4byte BattleFrontier_OutsideEast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleFrontierOutsideEast
-
diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc
deleted file mode 100644
index a506e554f..000000000
--- a/data/layouts/BattleFrontier_OutsideWest/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_OutsideWest_MapBorder::
-	.incbin "data/layouts/BattleFrontier_OutsideWest/border.bin"
-
-BattleFrontier_OutsideWest_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_OutsideWest/map.bin"
-
-	.align 2
-BattleFrontier_OutsideWest_Layout::
-	.4byte 0x38
-	.4byte 0x48
-	.4byte BattleFrontier_OutsideWest_MapBorder
-	.4byte BattleFrontier_OutsideWest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleFrontierOutsideWest
-
diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc
deleted file mode 100644
index d7615e693..000000000
--- a/data/layouts/BattleFrontier_RankingHall/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_RankingHall_MapBorder::
-	.incbin "data/layouts/BattleFrontier_RankingHall/border.bin"
-
-BattleFrontier_RankingHall_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_RankingHall/map.bin"
-
-	.align 2
-BattleFrontier_RankingHall_Layout::
-	.4byte 0x35
-	.4byte 0xf
-	.4byte BattleFrontier_RankingHall_MapBorder
-	.4byte BattleFrontier_RankingHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontierRankingHall
-
diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc
deleted file mode 100644
index 3dd4aeaa5..000000000
--- a/data/layouts/BattleFrontier_ReceptionGate/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_ReceptionGate_MapBorder::
-	.incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin"
-
-BattleFrontier_ReceptionGate_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin"
-
-	.align 2
-BattleFrontier_ReceptionGate_Layout::
-	.4byte 0x9
-	.4byte 0xe
-	.4byte BattleFrontier_ReceptionGate_MapBorder
-	.4byte BattleFrontier_ReceptionGate_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc
deleted file mode 100644
index f08737109..000000000
--- a/data/layouts/BattleFrontier_ScottsHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_ScottsHouse_MapBorder::
-	.incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin"
-
-BattleFrontier_ScottsHouse_MapBlockdata::
-	.incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin"
-
-	.align 2
-BattleFrontier_ScottsHouse_Layout::
-	.4byte 0x6
-	.4byte 0x8
-	.4byte BattleFrontier_ScottsHouse_MapBorder
-	.4byte BattleFrontier_ScottsHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc
deleted file mode 100644
index fe710cc40..000000000
--- a/data/layouts/BattlePyramidSquare01/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare01_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare01/border.bin"
-
-BattlePyramidSquare01_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare01/map.bin"
-
-	.align 2
-BattlePyramidSquare01_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare01_MapBorder
-	.4byte BattlePyramidSquare01_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc
deleted file mode 100644
index 6aa5b7aa9..000000000
--- a/data/layouts/BattlePyramidSquare02/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare02_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare02/border.bin"
-
-BattlePyramidSquare02_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare02/map.bin"
-
-	.align 2
-BattlePyramidSquare02_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare02_MapBorder
-	.4byte BattlePyramidSquare02_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc
deleted file mode 100644
index 4da41f9e9..000000000
--- a/data/layouts/BattlePyramidSquare03/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare03_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare03/border.bin"
-
-BattlePyramidSquare03_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare03/map.bin"
-
-	.align 2
-BattlePyramidSquare03_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare03_MapBorder
-	.4byte BattlePyramidSquare03_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc
deleted file mode 100644
index c298ee6f4..000000000
--- a/data/layouts/BattlePyramidSquare04/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare04_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare04/border.bin"
-
-BattlePyramidSquare04_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare04/map.bin"
-
-	.align 2
-BattlePyramidSquare04_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare04_MapBorder
-	.4byte BattlePyramidSquare04_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc
deleted file mode 100644
index 87ce53274..000000000
--- a/data/layouts/BattlePyramidSquare05/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare05_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare05/border.bin"
-
-BattlePyramidSquare05_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare05/map.bin"
-
-	.align 2
-BattlePyramidSquare05_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare05_MapBorder
-	.4byte BattlePyramidSquare05_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc
deleted file mode 100644
index bcaeb89b0..000000000
--- a/data/layouts/BattlePyramidSquare06/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare06_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare06/border.bin"
-
-BattlePyramidSquare06_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare06/map.bin"
-
-	.align 2
-BattlePyramidSquare06_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare06_MapBorder
-	.4byte BattlePyramidSquare06_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc
deleted file mode 100644
index bb469b3c8..000000000
--- a/data/layouts/BattlePyramidSquare07/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare07_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare07/border.bin"
-
-BattlePyramidSquare07_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare07/map.bin"
-
-	.align 2
-BattlePyramidSquare07_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare07_MapBorder
-	.4byte BattlePyramidSquare07_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc
deleted file mode 100644
index df88b710f..000000000
--- a/data/layouts/BattlePyramidSquare08/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare08_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare08/border.bin"
-
-BattlePyramidSquare08_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare08/map.bin"
-
-	.align 2
-BattlePyramidSquare08_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare08_MapBorder
-	.4byte BattlePyramidSquare08_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc
deleted file mode 100644
index 2869d9ac2..000000000
--- a/data/layouts/BattlePyramidSquare09/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare09_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare09/border.bin"
-
-BattlePyramidSquare09_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare09/map.bin"
-
-	.align 2
-BattlePyramidSquare09_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare09_MapBorder
-	.4byte BattlePyramidSquare09_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc
deleted file mode 100644
index 2ba8e8124..000000000
--- a/data/layouts/BattlePyramidSquare10/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare10_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare10/border.bin"
-
-BattlePyramidSquare10_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare10/map.bin"
-
-	.align 2
-BattlePyramidSquare10_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare10_MapBorder
-	.4byte BattlePyramidSquare10_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc
deleted file mode 100644
index 190bddf10..000000000
--- a/data/layouts/BattlePyramidSquare11/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare11_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare11/border.bin"
-
-BattlePyramidSquare11_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare11/map.bin"
-
-	.align 2
-BattlePyramidSquare11_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare11_MapBorder
-	.4byte BattlePyramidSquare11_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc
deleted file mode 100644
index 199f66ace..000000000
--- a/data/layouts/BattlePyramidSquare12/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare12_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare12/border.bin"
-
-BattlePyramidSquare12_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare12/map.bin"
-
-	.align 2
-BattlePyramidSquare12_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare12_MapBorder
-	.4byte BattlePyramidSquare12_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc
deleted file mode 100644
index 351b04227..000000000
--- a/data/layouts/BattlePyramidSquare13/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare13_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare13/border.bin"
-
-BattlePyramidSquare13_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare13/map.bin"
-
-	.align 2
-BattlePyramidSquare13_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare13_MapBorder
-	.4byte BattlePyramidSquare13_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc
deleted file mode 100644
index 653ad161b..000000000
--- a/data/layouts/BattlePyramidSquare14/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare14_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare14/border.bin"
-
-BattlePyramidSquare14_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare14/map.bin"
-
-	.align 2
-BattlePyramidSquare14_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare14_MapBorder
-	.4byte BattlePyramidSquare14_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc
deleted file mode 100644
index 24090c671..000000000
--- a/data/layouts/BattlePyramidSquare15/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare15_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare15/border.bin"
-
-BattlePyramidSquare15_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare15/map.bin"
-
-	.align 2
-BattlePyramidSquare15_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare15_MapBorder
-	.4byte BattlePyramidSquare15_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc
deleted file mode 100644
index 67187b9bf..000000000
--- a/data/layouts/BattlePyramidSquare16/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare16_MapBorder::
-	.incbin "data/layouts/BattlePyramidSquare16/border.bin"
-
-BattlePyramidSquare16_MapBlockdata::
-	.incbin "data/layouts/BattlePyramidSquare16/map.bin"
-
-	.align 2
-BattlePyramidSquare16_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare16_MapBorder
-	.4byte BattlePyramidSquare16_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc
deleted file mode 100644
index 4f9a8e626..000000000
--- a/data/layouts/BattleTentBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleTentBattleRoom_MapBorder::
-	.incbin "data/layouts/BattleTentBattleRoom/border.bin"
-
-BattleTentBattleRoom_MapBlockdata::
-	.incbin "data/layouts/BattleTentBattleRoom/map.bin"
-
-	.align 2
-BattleTentBattleRoom_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte BattleTentBattleRoom_MapBorder
-	.4byte BattleTentBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTent
-
diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc
deleted file mode 100644
index 9abcdefa4..000000000
--- a/data/layouts/BattleTentCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleTentCorridor_MapBorder::
-	.incbin "data/layouts/BattleTentCorridor/border.bin"
-
-BattleTentCorridor_MapBlockdata::
-	.incbin "data/layouts/BattleTentCorridor/map.bin"
-
-	.align 2
-BattleTentCorridor_Layout::
-	.4byte 0x5
-	.4byte 0x8
-	.4byte BattleTentCorridor_MapBorder
-	.4byte BattleTentCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTent
-
diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc
deleted file mode 100644
index a3216370f..000000000
--- a/data/layouts/BattleTentLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleTentLobby_MapBorder::
-	.incbin "data/layouts/BattleTentLobby/border.bin"
-
-BattleTentLobby_MapBlockdata::
-	.incbin "data/layouts/BattleTentLobby/map.bin"
-
-	.align 2
-BattleTentLobby_Layout::
-	.4byte 0xd
-	.4byte 0xa
-	.4byte BattleTentLobby_MapBorder
-	.4byte BattleTentLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTent
-
diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc
deleted file mode 100644
index 17dc4f0fb..000000000
--- a/data/layouts/BirthIsland_Exterior/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BirthIsland_Exterior_MapBorder::
-	.incbin "data/layouts/BirthIsland_Exterior/border.bin"
-
-BirthIsland_Exterior_MapBlockdata::
-	.incbin "data/layouts/BirthIsland_Exterior/map.bin"
-
-	.align 2
-BirthIsland_Exterior_Layout::
-	.4byte 0x1e
-	.4byte 0x1e
-	.4byte BirthIsland_Exterior_MapBorder
-	.4byte BirthIsland_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc
deleted file mode 100644
index 1113f89f2..000000000
--- a/data/layouts/CableCarStation/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CableCarStation_MapBorder::
-	.incbin "data/layouts/CableCarStation/border.bin"
-
-CableCarStation_MapBlockdata::
-	.incbin "data/layouts/CableCarStation/map.bin"
-
-	.align 2
-CableCarStation_Layout::
-	.4byte 0xd
-	.4byte 0xc
-	.4byte CableCarStation_MapBorder
-	.4byte CableCarStation_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc
deleted file mode 100644
index 616af1655..000000000
--- a/data/layouts/CaveOfOrigin_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_1F_MapBorder::
-	.incbin "data/layouts/CaveOfOrigin_1F/border.bin"
-
-CaveOfOrigin_1F_MapBlockdata::
-	.incbin "data/layouts/CaveOfOrigin_1F/map.bin"
-
-	.align 2
-CaveOfOrigin_1F_Layout::
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_1F_MapBorder
-	.4byte CaveOfOrigin_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc
deleted file mode 100644
index 5850f15c9..000000000
--- a/data/layouts/CaveOfOrigin_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_B1F_MapBorder::
-	.incbin "data/layouts/CaveOfOrigin_B1F/border.bin"
-
-CaveOfOrigin_B1F_MapBlockdata::
-	.incbin "data/layouts/CaveOfOrigin_B1F/map.bin"
-
-	.align 2
-CaveOfOrigin_B1F_Layout::
-	.4byte 0x13
-	.4byte 0x13
-	.4byte CaveOfOrigin_B1F_MapBorder
-	.4byte CaveOfOrigin_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc
deleted file mode 100644
index 11e230ce3..000000000
--- a/data/layouts/CaveOfOrigin_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_Entrance_MapBorder::
-	.incbin "data/layouts/CaveOfOrigin_Entrance/border.bin"
-
-CaveOfOrigin_Entrance_MapBlockdata::
-	.incbin "data/layouts/CaveOfOrigin_Entrance/map.bin"
-
-	.align 2
-CaveOfOrigin_Entrance_Layout::
-	.4byte 0x13
-	.4byte 0x1a
-	.4byte CaveOfOrigin_Entrance_MapBorder
-	.4byte CaveOfOrigin_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc
deleted file mode 100644
index 294bf786a..000000000
--- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap1_MapBorder::
-	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin"
-
-CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata::
-	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap1_Layout::
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc
deleted file mode 100644
index c3a05f75f..000000000
--- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap2_MapBorder::
-	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin"
-
-CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata::
-	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap2_Layout::
-	.4byte 0x15
-	.4byte 0x15
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc
deleted file mode 100644
index cbc5c052a..000000000
--- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap3_MapBorder::
-	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin"
-
-CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata::
-	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap3_Layout::
-	.4byte 0x13
-	.4byte 0x15
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0845A394/border.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
index f1629c020..f1629c020 100644
--- a/data/layouts/UnknownMap_0845A394/border.bin
+++ b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
index fd294d9b6..fd294d9b6 100644
--- a/data/layouts/UnknownMap_0845A394/map.bin
+++ b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc
deleted file mode 100644
index 4d6e7571a..000000000
--- a/data/layouts/DesertRuins/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DesertRuins_MapBorder::
-	.incbin "data/layouts/DesertRuins/border.bin"
-
-DesertRuins_MapBlockdata::
-	.incbin "data/layouts/DesertRuins/map.bin"
-
-	.align 2
-DesertRuins_Layout::
-	.4byte 0x11
-	.4byte 0x21
-	.4byte DesertRuins_MapBorder
-	.4byte DesertRuins_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc
deleted file mode 100644
index 9a17a128e..000000000
--- a/data/layouts/DesertUnderpass/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DesertUnderpass_MapBorder::
-	.incbin "data/layouts/DesertUnderpass/border.bin"
-
-DesertUnderpass_MapBlockdata::
-	.incbin "data/layouts/DesertUnderpass/map.bin"
-
-	.align 2
-DesertUnderpass_Layout::
-	.4byte 0x8b
-	.4byte 0x17
-	.4byte DesertUnderpass_MapBorder
-	.4byte DesertUnderpass_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc
deleted file mode 100644
index 28ccdc43c..000000000
--- a/data/layouts/DewfordTown/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_MapBorder::
-	.incbin "data/layouts/DewfordTown/border.bin"
-
-DewfordTown_MapBlockdata::
-	.incbin "data/layouts/DewfordTown/map.bin"
-
-	.align 2
-DewfordTown_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte DewfordTown_MapBorder
-	.4byte DewfordTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc
deleted file mode 100644
index bbada5bdc..000000000
--- a/data/layouts/DewfordTown_Gym/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_Gym_MapBorder::
-	.incbin "data/layouts/DewfordTown_Gym/border.bin"
-
-DewfordTown_Gym_MapBlockdata::
-	.incbin "data/layouts/DewfordTown_Gym/map.bin"
-
-	.align 2
-DewfordTown_Gym_Layout::
-	.4byte 0x12
-	.4byte 0x1c
-	.4byte DewfordTown_Gym_MapBorder
-	.4byte DewfordTown_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_DewfordGym
-
diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc
deleted file mode 100644
index bd9cd03ae..000000000
--- a/data/layouts/DewfordTown_Hall/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_Hall_MapBorder::
-	.incbin "data/layouts/DewfordTown_Hall/border.bin"
-
-DewfordTown_Hall_MapBlockdata::
-	.incbin "data/layouts/DewfordTown_Hall/map.bin"
-
-	.align 2
-DewfordTown_Hall_Layout::
-	.4byte 0x11
-	.4byte 0x9
-	.4byte DewfordTown_Hall_MapBorder
-	.4byte DewfordTown_Hall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc
deleted file mode 100644
index 61d112c1e..000000000
--- a/data/layouts/DoubleBattleColosseum/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DoubleBattleColosseum_MapBorder::
-	.incbin "data/layouts/DoubleBattleColosseum/border.bin"
-
-DoubleBattleColosseum_MapBlockdata::
-	.incbin "data/layouts/DoubleBattleColosseum/map.bin"
-
-	.align 2
-DoubleBattleColosseum_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte DoubleBattleColosseum_MapBorder
-	.4byte DoubleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc
deleted file mode 100644
index 16c02fbaa..000000000
--- a/data/layouts/EverGrandeCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_MapBorder::
-	.incbin "data/layouts/EverGrandeCity/border.bin"
-
-EverGrandeCity_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity/map.bin"
-
-	.align 2
-EverGrandeCity_Layout::
-	.4byte 0x28
-	.4byte 0x50
-	.4byte EverGrandeCity_MapBorder
-	.4byte EverGrandeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_EverGrande
-
diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
deleted file mode 100644
index dad4c7ef3..000000000
--- a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_ChampionsRoom_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin"
-
-EverGrandeCity_ChampionsRoom_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin"
-
-	.align 2
-EverGrandeCity_ChampionsRoom_Layout::
-	.4byte 0xd
-	.4byte 0xd
-	.4byte EverGrandeCity_ChampionsRoom_MapBorder
-	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
deleted file mode 100644
index 9c140d49d..000000000
--- a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_DrakesRoom_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin"
-
-EverGrandeCity_DrakesRoom_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_DrakesRoom_Layout::
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_DrakesRoom_MapBorder
-	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
deleted file mode 100644
index bcd610d8c..000000000
--- a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_GlaciasRoom_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin"
-
-EverGrandeCity_GlaciasRoom_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin"
-
-	.align 2
-EverGrandeCity_GlaciasRoom_Layout::
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_GlaciasRoom_MapBorder
-	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc
deleted file mode 100644
index 464fc8998..000000000
--- a/data/layouts/EverGrandeCity_Hall4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_Hall4_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_Hall4/border.bin"
-
-EverGrandeCity_Hall4_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_Hall4/map.bin"
-
-	.align 2
-EverGrandeCity_Hall4_Layout::
-	.4byte 0xb
-	.4byte 0x22
-	.4byte EverGrandeCity_Hall4_MapBorder
-	.4byte EverGrandeCity_Hall4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
deleted file mode 100644
index deaa4429d..000000000
--- a/data/layouts/EverGrandeCity_HallOfFame/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_HallOfFame_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin"
-
-EverGrandeCity_HallOfFame_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin"
-
-	.align 2
-EverGrandeCity_HallOfFame_Layout::
-	.4byte 0xf
-	.4byte 0x11
-	.4byte EverGrandeCity_HallOfFame_MapBorder
-	.4byte EverGrandeCity_HallOfFame_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
deleted file mode 100644
index b02d5c312..000000000
--- a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_PhoebesRoom_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin"
-
-EverGrandeCity_PhoebesRoom_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_PhoebesRoom_Layout::
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_PhoebesRoom_MapBorder
-	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc
deleted file mode 100644
index d84e6449f..000000000
--- a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_PokemonLeague_1F_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin"
-
-EverGrandeCity_PokemonLeague_1F_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin"
-
-	.align 2
-EverGrandeCity_PokemonLeague_1F_Layout::
-	.4byte 0x13
-	.4byte 0xc
-	.4byte EverGrandeCity_PokemonLeague_1F_MapBorder
-	.4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc
deleted file mode 100644
index 2159c894d..000000000
--- a/data/layouts/EverGrandeCity_ShortHall/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_ShortHall_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_ShortHall/border.bin"
-
-EverGrandeCity_ShortHall_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_ShortHall/map.bin"
-
-	.align 2
-EverGrandeCity_ShortHall_Layout::
-	.4byte 0xb
-	.4byte 0xd
-	.4byte EverGrandeCity_ShortHall_MapBorder
-	.4byte EverGrandeCity_ShortHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
deleted file mode 100644
index 86ffa16a1..000000000
--- a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_SidneysRoom_MapBorder::
-	.incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin"
-
-EverGrandeCity_SidneysRoom_MapBlockdata::
-	.incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin"
-
-	.align 2
-EverGrandeCity_SidneysRoom_Layout::
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_SidneysRoom_MapBorder
-	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc
deleted file mode 100644
index 7f0894903..000000000
--- a/data/layouts/FallarborTown/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_MapBorder::
-	.incbin "data/layouts/FallarborTown/border.bin"
-
-FallarborTown_MapBlockdata::
-	.incbin "data/layouts/FallarborTown/map.bin"
-
-	.align 2
-FallarborTown_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte FallarborTown_MapBorder
-	.4byte FallarborTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc
deleted file mode 100644
index 66acc546b..000000000
--- a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_LeftoverRSContestHall_MapBorder::
-	.incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin"
-
-FallarborTown_LeftoverRSContestHall_MapBlockdata::
-	.incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin"
-
-	.align 2
-FallarborTown_LeftoverRSContestHall_Layout::
-	.4byte 0x15
-	.4byte 0x12
-	.4byte FallarborTown_LeftoverRSContestHall_MapBorder
-	.4byte FallarborTown_LeftoverRSContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc
deleted file mode 100644
index 3ad232728..000000000
--- a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_LeftoverRSContestLobby_MapBorder::
-	.incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin"
-
-FallarborTown_LeftoverRSContestLobby_MapBlockdata::
-	.incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin"
-
-	.align 2
-FallarborTown_LeftoverRSContestLobby_Layout::
-	.4byte 0xf
-	.4byte 0x7
-	.4byte FallarborTown_LeftoverRSContestLobby_MapBorder
-	.4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc
deleted file mode 100644
index c7d6bef91..000000000
--- a/data/layouts/FarawayIsland_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FarawayIsland_Entrance_MapBorder::
-	.incbin "data/layouts/FarawayIsland_Entrance/border.bin"
-
-FarawayIsland_Entrance_MapBlockdata::
-	.incbin "data/layouts/FarawayIsland_Entrance/map.bin"
-
-	.align 2
-FarawayIsland_Entrance_Layout::
-	.4byte 0x22
-	.4byte 0x2e
-	.4byte FarawayIsland_Entrance_MapBorder
-	.4byte FarawayIsland_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc
deleted file mode 100644
index 787dd53c9..000000000
--- a/data/layouts/FarawayIsland_Interior/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FarawayIsland_Interior_MapBorder::
-	.incbin "data/layouts/FarawayIsland_Interior/border.bin"
-
-FarawayIsland_Interior_MapBlockdata::
-	.incbin "data/layouts/FarawayIsland_Interior/map.bin"
-
-	.align 2
-FarawayIsland_Interior_Layout::
-	.4byte 0x1d
-	.4byte 0x1a
-	.4byte FarawayIsland_Interior_MapBorder
-	.4byte FarawayIsland_Interior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc
deleted file mode 100644
index c129ae715..000000000
--- a/data/layouts/FieryPath/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FieryPath_MapBorder::
-	.incbin "data/layouts/FieryPath/border.bin"
-
-FieryPath_MapBlockdata::
-	.incbin "data/layouts/FieryPath/map.bin"
-
-	.align 2
-FieryPath_Layout::
-	.4byte 0x23
-	.4byte 0x26
-	.4byte FieryPath_MapBorder
-	.4byte FieryPath_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc
deleted file mode 100644
index 02564b36a..000000000
--- a/data/layouts/FortreeCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_MapBorder::
-	.incbin "data/layouts/FortreeCity/border.bin"
-
-FortreeCity_MapBlockdata::
-	.incbin "data/layouts/FortreeCity/map.bin"
-
-	.align 2
-FortreeCity_Layout::
-	.4byte 0x28
-	.4byte 0x14
-	.4byte FortreeCity_MapBorder
-	.4byte FortreeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc
deleted file mode 100644
index 6460a35b5..000000000
--- a/data/layouts/FortreeCity_DecorationShop/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_DecorationShop_MapBorder::
-	.incbin "data/layouts/FortreeCity_DecorationShop/border.bin"
-
-FortreeCity_DecorationShop_MapBlockdata::
-	.incbin "data/layouts/FortreeCity_DecorationShop/map.bin"
-
-	.align 2
-FortreeCity_DecorationShop_Layout::
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_DecorationShop_MapBorder
-	.4byte FortreeCity_DecorationShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc
deleted file mode 100644
index da7f1e73e..000000000
--- a/data/layouts/FortreeCity_Gym/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_Gym_MapBorder::
-	.incbin "data/layouts/FortreeCity_Gym/border.bin"
-
-FortreeCity_Gym_MapBlockdata::
-	.incbin "data/layouts/FortreeCity_Gym/map.bin"
-
-	.align 2
-FortreeCity_Gym_Layout::
-	.4byte 0x14
-	.4byte 0x19
-	.4byte FortreeCity_Gym_MapBorder
-	.4byte FortreeCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_FortreeGym
-
diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc
deleted file mode 100644
index 214846c22..000000000
--- a/data/layouts/FortreeCity_House1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_House1_MapBorder::
-	.incbin "data/layouts/FortreeCity_House1/border.bin"
-
-FortreeCity_House1_MapBlockdata::
-	.incbin "data/layouts/FortreeCity_House1/map.bin"
-
-	.align 2
-FortreeCity_House1_Layout::
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House1_MapBorder
-	.4byte FortreeCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc
deleted file mode 100644
index 3aa0898bf..000000000
--- a/data/layouts/FortreeCity_House2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_House2_MapBorder::
-	.incbin "data/layouts/FortreeCity_House2/border.bin"
-
-FortreeCity_House2_MapBlockdata::
-	.incbin "data/layouts/FortreeCity_House2/map.bin"
-
-	.align 2
-FortreeCity_House2_Layout::
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House2_MapBorder
-	.4byte FortreeCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc
deleted file mode 100644
index 009fd12f5..000000000
--- a/data/layouts/GraniteCave_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_1F_MapBorder::
-	.incbin "data/layouts/GraniteCave_1F/border.bin"
-
-GraniteCave_1F_MapBlockdata::
-	.incbin "data/layouts/GraniteCave_1F/map.bin"
-
-	.align 2
-GraniteCave_1F_Layout::
-	.4byte 0x2a
-	.4byte 0xf
-	.4byte GraniteCave_1F_MapBorder
-	.4byte GraniteCave_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc
deleted file mode 100644
index a57b238be..000000000
--- a/data/layouts/GraniteCave_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_B1F_MapBorder::
-	.incbin "data/layouts/GraniteCave_B1F/border.bin"
-
-GraniteCave_B1F_MapBlockdata::
-	.incbin "data/layouts/GraniteCave_B1F/map.bin"
-
-	.align 2
-GraniteCave_B1F_Layout::
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B1F_MapBorder
-	.4byte GraniteCave_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc
deleted file mode 100644
index 7ffd04b00..000000000
--- a/data/layouts/GraniteCave_B2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_B2F_MapBorder::
-	.incbin "data/layouts/GraniteCave_B2F/border.bin"
-
-GraniteCave_B2F_MapBlockdata::
-	.incbin "data/layouts/GraniteCave_B2F/map.bin"
-
-	.align 2
-GraniteCave_B2F_Layout::
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B2F_MapBorder
-	.4byte GraniteCave_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc
deleted file mode 100644
index 5ee4fade4..000000000
--- a/data/layouts/GraniteCave_StevensRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_StevensRoom_MapBorder::
-	.incbin "data/layouts/GraniteCave_StevensRoom/border.bin"
-
-GraniteCave_StevensRoom_MapBlockdata::
-	.incbin "data/layouts/GraniteCave_StevensRoom/map.bin"
-
-	.align 2
-GraniteCave_StevensRoom_Layout::
-	.4byte 0xf
-	.4byte 0xe
-	.4byte GraniteCave_StevensRoom_MapBorder
-	.4byte GraniteCave_StevensRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc
deleted file mode 100644
index e95b8ec9d..000000000
--- a/data/layouts/Harbor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Harbor_MapBorder::
-	.incbin "data/layouts/Harbor/border.bin"
-
-Harbor_MapBlockdata::
-	.incbin "data/layouts/Harbor/map.bin"
-
-	.align 2
-Harbor_Layout::
-	.4byte 0x18
-	.4byte 0xf
-	.4byte Harbor_MapBorder
-	.4byte Harbor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc
deleted file mode 100644
index b93f24df4..000000000
--- a/data/layouts/House1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-House1_MapBorder::
-	.incbin "data/layouts/House1/border.bin"
-
-House1_MapBlockdata::
-	.incbin "data/layouts/House1/map.bin"
-
-	.align 2
-House1_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte House1_MapBorder
-	.4byte House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc
deleted file mode 100644
index 35566d8d1..000000000
--- a/data/layouts/House2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-House2_MapBorder::
-	.incbin "data/layouts/House2/border.bin"
-
-House2_MapBlockdata::
-	.incbin "data/layouts/House2/map.bin"
-
-	.align 2
-House2_Layout::
-	.4byte 0xb
-	.4byte 0x8
-	.4byte House2_MapBorder
-	.4byte House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc
deleted file mode 100644
index 6e2de11f4..000000000
--- a/data/layouts/House3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-House3_MapBorder::
-	.incbin "data/layouts/House3/border.bin"
-
-House3_MapBlockdata::
-	.incbin "data/layouts/House3/map.bin"
-
-	.align 2
-House3_Layout::
-	.4byte 0xa
-	.4byte 0x8
-	.4byte House3_MapBorder
-	.4byte House3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc
deleted file mode 100644
index b06b3d427..000000000
--- a/data/layouts/House4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-House4_MapBorder::
-	.incbin "data/layouts/House4/border.bin"
-
-House4_MapBlockdata::
-	.incbin "data/layouts/House4/map.bin"
-
-	.align 2
-House4_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte House4_MapBorder
-	.4byte House4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc
deleted file mode 100644
index 7fb8d2c9b..000000000
--- a/data/layouts/HouseWithBed/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-HouseWithBed_MapBorder::
-	.incbin "data/layouts/HouseWithBed/border.bin"
-
-HouseWithBed_MapBlockdata::
-	.incbin "data/layouts/HouseWithBed/map.bin"
-
-	.align 2
-HouseWithBed_Layout::
-	.4byte 0xa
-	.4byte 0x8
-	.4byte HouseWithBed_MapBorder
-	.4byte HouseWithBed_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc
deleted file mode 100644
index d1ddf8686..000000000
--- a/data/layouts/InsideOfTruck/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-InsideOfTruck_MapBorder::
-	.incbin "data/layouts/InsideOfTruck/border.bin"
-
-InsideOfTruck_MapBlockdata::
-	.incbin "data/layouts/InsideOfTruck/map.bin"
-
-	.align 2
-InsideOfTruck_Layout::
-	.4byte 0x5
-	.4byte 0x5
-	.4byte InsideOfTruck_MapBorder
-	.4byte InsideOfTruck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideOfTruck
-
diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc
deleted file mode 100644
index 5a3035b72..000000000
--- a/data/layouts/IslandCave/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-IslandCave_MapBorder::
-	.incbin "data/layouts/IslandCave/border.bin"
-
-IslandCave_MapBlockdata::
-	.incbin "data/layouts/IslandCave/map.bin"
-
-	.align 2
-IslandCave_Layout::
-	.4byte 0x11
-	.4byte 0x21
-	.4byte IslandCave_MapBorder
-	.4byte IslandCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc
deleted file mode 100644
index 7fc86dca4..000000000
--- a/data/layouts/IslandHarbor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-IslandHarbor_MapBorder::
-	.incbin "data/layouts/IslandHarbor/border.bin"
-
-IslandHarbor_MapBlockdata::
-	.incbin "data/layouts/IslandHarbor/map.bin"
-
-	.align 2
-IslandHarbor_Layout::
-	.4byte 0x11
-	.4byte 0xd
-	.4byte IslandHarbor_MapBorder
-	.4byte IslandHarbor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_IslandHarbor
-
diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc
deleted file mode 100644
index 5620551b8..000000000
--- a/data/layouts/JaggedPass/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-JaggedPass_MapBorder::
-	.incbin "data/layouts/JaggedPass/border.bin"
-
-JaggedPass_MapBlockdata::
-	.incbin "data/layouts/JaggedPass/map.bin"
-
-	.align 2
-JaggedPass_Layout::
-	.4byte 0x1e
-	.4byte 0x2e
-	.4byte JaggedPass_MapBorder
-	.4byte JaggedPass_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc
deleted file mode 100644
index 662955430..000000000
--- a/data/layouts/LavaridgeTown/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_MapBorder::
-	.incbin "data/layouts/LavaridgeTown/border.bin"
-
-LavaridgeTown_MapBlockdata::
-	.incbin "data/layouts/LavaridgeTown/map.bin"
-
-	.align 2
-LavaridgeTown_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LavaridgeTown_MapBorder
-	.4byte LavaridgeTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
deleted file mode 100644
index 36f4cb826..000000000
--- a/data/layouts/LavaridgeTown_Gym_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_Gym_1F_MapBorder::
-	.incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin"
-
-LavaridgeTown_Gym_1F_MapBlockdata::
-	.incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_1F_Layout::
-	.4byte 0x11
-	.4byte 0x13
-	.4byte LavaridgeTown_Gym_1F_MapBorder
-	.4byte LavaridgeTown_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
deleted file mode 100644
index 9b80d7f90..000000000
--- a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_Gym_B1F_MapBorder::
-	.incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin"
-
-LavaridgeTown_Gym_B1F_MapBlockdata::
-	.incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_B1F_Layout::
-	.4byte 0x11
-	.4byte 0x13
-	.4byte LavaridgeTown_Gym_B1F_MapBorder
-	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc
deleted file mode 100644
index c59e12e49..000000000
--- a/data/layouts/LavaridgeTown_HerbShop/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_HerbShop_MapBorder::
-	.incbin "data/layouts/LavaridgeTown_HerbShop/border.bin"
-
-LavaridgeTown_HerbShop_MapBlockdata::
-	.incbin "data/layouts/LavaridgeTown_HerbShop/map.bin"
-
-	.align 2
-LavaridgeTown_HerbShop_Layout::
-	.4byte 0xb
-	.4byte 0x8
-	.4byte LavaridgeTown_HerbShop_MapBorder
-	.4byte LavaridgeTown_HerbShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
deleted file mode 100644
index e38d63815..000000000
--- a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_PokemonCenter_1F_MapBorder::
-	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin"
-
-LavaridgeTown_PokemonCenter_1F_MapBlockdata::
-	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin"
-
-	.align 2
-LavaridgeTown_PokemonCenter_1F_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc
deleted file mode 100644
index ed4bd81e4..000000000
--- a/data/layouts/LilycoveCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_MapBorder::
-	.incbin "data/layouts/LilycoveCity/border.bin"
-
-LilycoveCity_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity/map.bin"
-
-	.align 2
-LilycoveCity_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte LilycoveCity_MapBorder
-	.4byte LilycoveCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc
deleted file mode 100644
index 61e6e27ee..000000000
--- a/data/layouts/LilycoveCity_ContestHall/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_ContestHall_MapBorder::
-	.incbin "data/layouts/LilycoveCity_ContestHall/border.bin"
-
-LilycoveCity_ContestHall_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_ContestHall/map.bin"
-
-	.align 2
-LilycoveCity_ContestHall_Layout::
-	.4byte 0x33
-	.4byte 0x21
-	.4byte LilycoveCity_ContestHall_MapBorder
-	.4byte LilycoveCity_ContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc
deleted file mode 100644
index 20cf4389f..000000000
--- a/data/layouts/LilycoveCity_ContestLobby/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_ContestLobby_MapBorder::
-	.incbin "data/layouts/LilycoveCity_ContestLobby/border.bin"
-
-LilycoveCity_ContestLobby_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_ContestLobby/map.bin"
-
-	.align 2
-LilycoveCity_ContestLobby_Layout::
-	.4byte 0x1f
-	.4byte 0xc
-	.4byte LilycoveCity_ContestLobby_MapBorder
-	.4byte LilycoveCity_ContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
deleted file mode 100644
index b275834f7..000000000
--- a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin"
-
-LilycoveCity_CoveLilyMotel_1F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_1F_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
deleted file mode 100644
index 82a294c48..000000000
--- a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin"
-
-LilycoveCity_CoveLilyMotel_2F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_2F_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
deleted file mode 100644
index 899e934bd..000000000
--- a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStoreElevator_MapBorder::
-	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin"
-
-LilycoveCity_DepartmentStoreElevator_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreElevator_Layout::
-	.4byte 0x5
-	.4byte 0x6
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
deleted file mode 100644
index d40483308..000000000
--- a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStoreRooftop_MapBorder::
-	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin"
-
-LilycoveCity_DepartmentStoreRooftop_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreRooftop_Layout::
-	.4byte 0x12
-	.4byte 0xc
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
deleted file mode 100644
index d3b5d9420..000000000
--- a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_1F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin"
-
-LilycoveCity_DepartmentStore_1F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_1F_Layout::
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
deleted file mode 100644
index e5b01c8fd..000000000
--- a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_2F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin"
-
-LilycoveCity_DepartmentStore_2F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_2F_Layout::
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
deleted file mode 100644
index 5d7aa93eb..000000000
--- a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_3F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin"
-
-LilycoveCity_DepartmentStore_3F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_3F_Layout::
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
deleted file mode 100644
index b4585ca03..000000000
--- a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_4F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin"
-
-LilycoveCity_DepartmentStore_4F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_4F_Layout::
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
deleted file mode 100644
index ade5e4bf5..000000000
--- a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_5F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin"
-
-LilycoveCity_DepartmentStore_5F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_5F_Layout::
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc
deleted file mode 100644
index de51e7fd6..000000000
--- a/data/layouts/LilycoveCity_House2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House2_MapBorder::
-	.incbin "data/layouts/LilycoveCity_House2/border.bin"
-
-LilycoveCity_House2_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_House2/map.bin"
-
-	.align 2
-LilycoveCity_House2_Layout::
-	.4byte 0x8
-	.4byte 0x8
-	.4byte LilycoveCity_House2_MapBorder
-	.4byte LilycoveCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
deleted file mode 100644
index 0dab4095c..000000000
--- a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin"
-
-LilycoveCity_LilycoveMuseum_1F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_1F_Layout::
-	.4byte 0x15
-	.4byte 0xe
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
deleted file mode 100644
index aea446410..000000000
--- a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F_MapBorder::
-	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin"
-
-LilycoveCity_LilycoveMuseum_2F_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_2F_Layout::
-	.4byte 0x16
-	.4byte 0xd
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
deleted file mode 100644
index 9b30c7c08..000000000
--- a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub_MapBorder::
-	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin"
-
-LilycoveCity_PokemonTrainerFanClub_MapBlockdata::
-	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin"
-
-	.align 2
-LilycoveCity_PokemonTrainerFanClub_Layout::
-	.4byte 0xc
-	.4byte 0xe
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc
deleted file mode 100644
index e71fe2df3..000000000
--- a/data/layouts/LinkContestRoom1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom1_MapBorder::
-	.incbin "data/layouts/LinkContestRoom1/border.bin"
-
-LinkContestRoom1_MapBlockdata::
-	.incbin "data/layouts/LinkContestRoom1/map.bin"
-
-	.align 2
-LinkContestRoom1_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom1_MapBorder
-	.4byte LinkContestRoom1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc
deleted file mode 100644
index 2dd66ab96..000000000
--- a/data/layouts/LinkContestRoom2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom2_MapBorder::
-	.incbin "data/layouts/LinkContestRoom2/border.bin"
-
-LinkContestRoom2_MapBlockdata::
-	.incbin "data/layouts/LinkContestRoom2/map.bin"
-
-	.align 2
-LinkContestRoom2_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom2_MapBorder
-	.4byte LinkContestRoom2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc
deleted file mode 100644
index c53cad723..000000000
--- a/data/layouts/LinkContestRoom3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom3_MapBorder::
-	.incbin "data/layouts/LinkContestRoom3/border.bin"
-
-LinkContestRoom3_MapBlockdata::
-	.incbin "data/layouts/LinkContestRoom3/map.bin"
-
-	.align 2
-LinkContestRoom3_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom3_MapBorder
-	.4byte LinkContestRoom3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc
deleted file mode 100644
index 883918f37..000000000
--- a/data/layouts/LinkContestRoom4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom4_MapBorder::
-	.incbin "data/layouts/LinkContestRoom4/border.bin"
-
-LinkContestRoom4_MapBlockdata::
-	.incbin "data/layouts/LinkContestRoom4/map.bin"
-
-	.align 2
-LinkContestRoom4_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom4_MapBorder
-	.4byte LinkContestRoom4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc
deleted file mode 100644
index 72a9d9f4e..000000000
--- a/data/layouts/LinkContestRoom5/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom5_MapBorder::
-	.incbin "data/layouts/LinkContestRoom5/border.bin"
-
-LinkContestRoom5_MapBlockdata::
-	.incbin "data/layouts/LinkContestRoom5/map.bin"
-
-	.align 2
-LinkContestRoom5_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom5_MapBorder
-	.4byte LinkContestRoom5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc
deleted file mode 100644
index 33db4b56d..000000000
--- a/data/layouts/LinkContestRoom6/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom6_MapBorder::
-	.incbin "data/layouts/LinkContestRoom6/border.bin"
-
-LinkContestRoom6_MapBlockdata::
-	.incbin "data/layouts/LinkContestRoom6/map.bin"
-
-	.align 2
-LinkContestRoom6_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom6_MapBorder
-	.4byte LinkContestRoom6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc
deleted file mode 100644
index 8193ac695..000000000
--- a/data/layouts/LittlerootTown/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_MapBorder::
-	.incbin "data/layouts/LittlerootTown/border.bin"
-
-LittlerootTown_MapBlockdata::
-	.incbin "data/layouts/LittlerootTown/map.bin"
-
-	.align 2
-LittlerootTown_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LittlerootTown_MapBorder
-	.4byte LittlerootTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
deleted file mode 100644
index 092c7d20b..000000000
--- a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_BrendansHouse_1F_MapBorder::
-	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin"
-
-LittlerootTown_BrendansHouse_1F_MapBlockdata::
-	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_1F_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
deleted file mode 100644
index 5235f4d98..000000000
--- a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_BrendansHouse_2F_MapBorder::
-	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin"
-
-LittlerootTown_BrendansHouse_2F_MapBlockdata::
-	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_2F_Layout::
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
deleted file mode 100644
index 88b81a289..000000000
--- a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_MaysHouse_1F_MapBorder::
-	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin"
-
-LittlerootTown_MaysHouse_1F_MapBlockdata::
-	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_1F_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_MaysHouse_1F_MapBorder
-	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
deleted file mode 100644
index 0b6134dbd..000000000
--- a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_MaysHouse_2F_MapBorder::
-	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin"
-
-LittlerootTown_MaysHouse_2F_MapBlockdata::
-	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_2F_Layout::
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_MaysHouse_2F_MapBorder
-	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
deleted file mode 100644
index d0be539a0..000000000
--- a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_MapBorder::
-	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin"
-
-LittlerootTown_ProfessorBirchsLab_MapBlockdata::
-	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin"
-
-	.align 2
-LittlerootTown_ProfessorBirchsLab_Layout::
-	.4byte 0xd
-	.4byte 0xd
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
diff --git a/data/layouts/UnknownMap_08428450/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08428450/border.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
index d1277f280..d1277f280 100644
--- a/data/layouts/UnknownMap_08480DAC/map.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc
deleted file mode 100644
index b50c7f015..000000000
--- a/data/layouts/MagmaHideout_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_1F_MapBorder::
-	.incbin "data/layouts/MagmaHideout_1F/border.bin"
-
-MagmaHideout_1F_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_1F/map.bin"
-
-	.align 2
-MagmaHideout_1F_Layout::
-	.4byte 0x25
-	.4byte 0x26
-	.4byte MagmaHideout_1F_MapBorder
-	.4byte MagmaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc
deleted file mode 100644
index b9f0d27d7..000000000
--- a/data/layouts/MagmaHideout_2F_1R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_1R_MapBorder::
-	.incbin "data/layouts/MagmaHideout_2F_1R/border.bin"
-
-MagmaHideout_2F_1R_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_2F_1R/map.bin"
-
-	.align 2
-MagmaHideout_2F_1R_Layout::
-	.4byte 0x21
-	.4byte 0x27
-	.4byte MagmaHideout_2F_1R_MapBorder
-	.4byte MagmaHideout_2F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc
deleted file mode 100644
index 01507909c..000000000
--- a/data/layouts/MagmaHideout_2F_2R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_2R_MapBorder::
-	.incbin "data/layouts/MagmaHideout_2F_2R/border.bin"
-
-MagmaHideout_2F_2R_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_2F_2R/map.bin"
-
-	.align 2
-MagmaHideout_2F_2R_Layout::
-	.4byte 0x31
-	.4byte 0x1c
-	.4byte MagmaHideout_2F_2R_MapBorder
-	.4byte MagmaHideout_2F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc
deleted file mode 100644
index d88fb50fd..000000000
--- a/data/layouts/MagmaHideout_2F_3R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_3R_MapBorder::
-	.incbin "data/layouts/MagmaHideout_2F_3R/border.bin"
-
-MagmaHideout_2F_3R_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_2F_3R/map.bin"
-
-	.align 2
-MagmaHideout_2F_3R_Layout::
-	.4byte 0x3c
-	.4byte 0x13
-	.4byte MagmaHideout_2F_3R_MapBorder
-	.4byte MagmaHideout_2F_3R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc
deleted file mode 100644
index c2199b2f2..000000000
--- a/data/layouts/MagmaHideout_3F_1R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_3F_1R_MapBorder::
-	.incbin "data/layouts/MagmaHideout_3F_1R/border.bin"
-
-MagmaHideout_3F_1R_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_3F_1R/map.bin"
-
-	.align 2
-MagmaHideout_3F_1R_Layout::
-	.4byte 0x1c
-	.4byte 0x18
-	.4byte MagmaHideout_3F_1R_MapBorder
-	.4byte MagmaHideout_3F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc
deleted file mode 100644
index 2c4662a49..000000000
--- a/data/layouts/MagmaHideout_3F_2R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_3F_2R_MapBorder::
-	.incbin "data/layouts/MagmaHideout_3F_2R/border.bin"
-
-MagmaHideout_3F_2R_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_3F_2R/map.bin"
-
-	.align 2
-MagmaHideout_3F_2R_Layout::
-	.4byte 0x18
-	.4byte 0x11
-	.4byte MagmaHideout_3F_2R_MapBorder
-	.4byte MagmaHideout_3F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc
deleted file mode 100644
index 4042b9653..000000000
--- a/data/layouts/MagmaHideout_3F_3R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_3F_3R_MapBorder::
-	.incbin "data/layouts/MagmaHideout_3F_3R/border.bin"
-
-MagmaHideout_3F_3R_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_3F_3R/map.bin"
-
-	.align 2
-MagmaHideout_3F_3R_Layout::
-	.4byte 0x21
-	.4byte 0x18
-	.4byte MagmaHideout_3F_3R_MapBorder
-	.4byte MagmaHideout_3F_3R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc
deleted file mode 100644
index d7f8c547c..000000000
--- a/data/layouts/MagmaHideout_4F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_4F_MapBorder::
-	.incbin "data/layouts/MagmaHideout_4F/border.bin"
-
-MagmaHideout_4F_MapBlockdata::
-	.incbin "data/layouts/MagmaHideout_4F/map.bin"
-
-	.align 2
-MagmaHideout_4F_Layout::
-	.4byte 0x3b
-	.4byte 0x1c
-	.4byte MagmaHideout_4F_MapBorder
-	.4byte MagmaHideout_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc
deleted file mode 100644
index 256338b89..000000000
--- a/data/layouts/MarineCave_End/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MarineCave_End_MapBorder::
-	.incbin "data/layouts/MarineCave_End/border.bin"
-
-MarineCave_End_MapBlockdata::
-	.incbin "data/layouts/MarineCave_End/map.bin"
-
-	.align 2
-MarineCave_End_Layout::
-	.4byte 0x1b
-	.4byte 0x1e
-	.4byte MarineCave_End_MapBorder
-	.4byte MarineCave_End_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc
deleted file mode 100644
index 219c182d7..000000000
--- a/data/layouts/MarineCave_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MarineCave_Entrance_MapBorder::
-	.incbin "data/layouts/MarineCave_Entrance/border.bin"
-
-MarineCave_Entrance_MapBlockdata::
-	.incbin "data/layouts/MarineCave_Entrance/map.bin"
-
-	.align 2
-MarineCave_Entrance_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte MarineCave_Entrance_MapBorder
-	.4byte MarineCave_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc
deleted file mode 100644
index 5233e09ab..000000000
--- a/data/layouts/Mart/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Mart_MapBorder::
-	.incbin "data/layouts/Mart/border.bin"
-
-Mart_MapBlockdata::
-	.incbin "data/layouts/Mart/map.bin"
-
-	.align 2
-Mart_Layout::
-	.4byte 0xb
-	.4byte 0x8
-	.4byte Mart_MapBorder
-	.4byte Mart_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc
deleted file mode 100644
index 7a8c17da2..000000000
--- a/data/layouts/MauvilleCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_MapBorder::
-	.incbin "data/layouts/MauvilleCity/border.bin"
-
-MauvilleCity_MapBlockdata::
-	.incbin "data/layouts/MauvilleCity/map.bin"
-
-	.align 2
-MauvilleCity_Layout::
-	.4byte 0x28
-	.4byte 0x14
-	.4byte MauvilleCity_MapBorder
-	.4byte MauvilleCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc
deleted file mode 100644
index f0d358a35..000000000
--- a/data/layouts/MauvilleCity_BikeShop/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_BikeShop_MapBorder::
-	.incbin "data/layouts/MauvilleCity_BikeShop/border.bin"
-
-MauvilleCity_BikeShop_MapBlockdata::
-	.incbin "data/layouts/MauvilleCity_BikeShop/map.bin"
-
-	.align 2
-MauvilleCity_BikeShop_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MauvilleCity_BikeShop_MapBorder
-	.4byte MauvilleCity_BikeShop_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc
deleted file mode 100644
index 307f7205e..000000000
--- a/data/layouts/MauvilleCity_GameCorner/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_GameCorner_MapBorder::
-	.incbin "data/layouts/MauvilleCity_GameCorner/border.bin"
-
-MauvilleCity_GameCorner_MapBlockdata::
-	.incbin "data/layouts/MauvilleCity_GameCorner/map.bin"
-
-	.align 2
-MauvilleCity_GameCorner_Layout::
-	.4byte 0x16
-	.4byte 0xb
-	.4byte MauvilleCity_GameCorner_MapBorder
-	.4byte MauvilleCity_GameCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGameCorner
-
diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc
deleted file mode 100644
index 290fca78e..000000000
--- a/data/layouts/MauvilleCity_Gym/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_Gym_MapBorder::
-	.incbin "data/layouts/MauvilleCity_Gym/border.bin"
-
-MauvilleCity_Gym_MapBlockdata::
-	.incbin "data/layouts/MauvilleCity_Gym/map.bin"
-
-	.align 2
-MauvilleCity_Gym_Layout::
-	.4byte 0xa
-	.4byte 0x15
-	.4byte MauvilleCity_Gym_MapBorder
-	.4byte MauvilleCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGym
-
diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc
deleted file mode 100644
index ba7a0e487..000000000
--- a/data/layouts/MeteorFalls_1F_1R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_1F_1R_MapBorder::
-	.incbin "data/layouts/MeteorFalls_1F_1R/border.bin"
-
-MeteorFalls_1F_1R_MapBlockdata::
-	.incbin "data/layouts/MeteorFalls_1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_1F_1R_Layout::
-	.4byte 0x1e
-	.4byte 0x2a
-	.4byte MeteorFalls_1F_1R_MapBorder
-	.4byte MeteorFalls_1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc
deleted file mode 100644
index 2e3fcaf2e..000000000
--- a/data/layouts/MeteorFalls_1F_2R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_1F_2R_MapBorder::
-	.incbin "data/layouts/MeteorFalls_1F_2R/border.bin"
-
-MeteorFalls_1F_2R_MapBlockdata::
-	.incbin "data/layouts/MeteorFalls_1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_1F_2R_Layout::
-	.4byte 0x1e
-	.4byte 0x20
-	.4byte MeteorFalls_1F_2R_MapBorder
-	.4byte MeteorFalls_1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc
deleted file mode 100644
index a4f385d8f..000000000
--- a/data/layouts/MeteorFalls_B1F_1R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_B1F_1R_MapBorder::
-	.incbin "data/layouts/MeteorFalls_B1F_1R/border.bin"
-
-MeteorFalls_B1F_1R_MapBlockdata::
-	.incbin "data/layouts/MeteorFalls_B1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_1R_Layout::
-	.4byte 0x1d
-	.4byte 0x26
-	.4byte MeteorFalls_B1F_1R_MapBorder
-	.4byte MeteorFalls_B1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc
deleted file mode 100644
index 982edc975..000000000
--- a/data/layouts/MeteorFalls_B1F_2R/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_B1F_2R_MapBorder::
-	.incbin "data/layouts/MeteorFalls_B1F_2R/border.bin"
-
-MeteorFalls_B1F_2R_MapBlockdata::
-	.incbin "data/layouts/MeteorFalls_B1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_2R_Layout::
-	.4byte 0xb
-	.4byte 0x12
-	.4byte MeteorFalls_B1F_2R_MapBorder
-	.4byte MeteorFalls_B1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc
deleted file mode 100644
index 1baf70a09..000000000
--- a/data/layouts/MeteorFalls_StevensCave/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_StevensCave_MapBorder::
-	.incbin "data/layouts/MeteorFalls_StevensCave/border.bin"
-
-MeteorFalls_StevensCave_MapBlockdata::
-	.incbin "data/layouts/MeteorFalls_StevensCave/map.bin"
-
-	.align 2
-MeteorFalls_StevensCave_Layout::
-	.4byte 0x1e
-	.4byte 0x20
-	.4byte MeteorFalls_StevensCave_MapBorder
-	.4byte MeteorFalls_StevensCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc
deleted file mode 100644
index be36cc758..000000000
--- a/data/layouts/MirageTower_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_1F_MapBorder::
-	.incbin "data/layouts/MirageTower_1F/border.bin"
-
-MirageTower_1F_MapBlockdata::
-	.incbin "data/layouts/MirageTower_1F/map.bin"
-
-	.align 2
-MirageTower_1F_Layout::
-	.4byte 0x15
-	.4byte 0x11
-	.4byte MirageTower_1F_MapBorder
-	.4byte MirageTower_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc
deleted file mode 100644
index ec4971bc4..000000000
--- a/data/layouts/MirageTower_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_2F_MapBorder::
-	.incbin "data/layouts/MirageTower_2F/border.bin"
-
-MirageTower_2F_MapBlockdata::
-	.incbin "data/layouts/MirageTower_2F/map.bin"
-
-	.align 2
-MirageTower_2F_Layout::
-	.4byte 0x15
-	.4byte 0x11
-	.4byte MirageTower_2F_MapBorder
-	.4byte MirageTower_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc
deleted file mode 100644
index c12de3a15..000000000
--- a/data/layouts/MirageTower_3F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_3F_MapBorder::
-	.incbin "data/layouts/MirageTower_3F/border.bin"
-
-MirageTower_3F_MapBlockdata::
-	.incbin "data/layouts/MirageTower_3F/map.bin"
-
-	.align 2
-MirageTower_3F_Layout::
-	.4byte 0x15
-	.4byte 0x11
-	.4byte MirageTower_3F_MapBorder
-	.4byte MirageTower_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc
deleted file mode 100644
index 518f7c943..000000000
--- a/data/layouts/MirageTower_4F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_4F_MapBorder::
-	.incbin "data/layouts/MirageTower_4F/border.bin"
-
-MirageTower_4F_MapBlockdata::
-	.incbin "data/layouts/MirageTower_4F/map.bin"
-
-	.align 2
-MirageTower_4F_Layout::
-	.4byte 0xd
-	.4byte 0xa
-	.4byte MirageTower_4F_MapBorder
-	.4byte MirageTower_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc
deleted file mode 100644
index 881cf9498..000000000
--- a/data/layouts/MossdeepCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_MapBorder::
-	.incbin "data/layouts/MossdeepCity/border.bin"
-
-MossdeepCity_MapBlockdata::
-	.incbin "data/layouts/MossdeepCity/map.bin"
-
-	.align 2
-MossdeepCity_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte MossdeepCity_MapBorder
-	.4byte MossdeepCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
deleted file mode 100644
index 2c2fb717d..000000000
--- a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_GameCorner_1F_MapBorder::
-	.incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin"
-
-MossdeepCity_GameCorner_1F_MapBlockdata::
-	.incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_1F_Layout::
-	.4byte 0xc
-	.4byte 0xa
-	.4byte MossdeepCity_GameCorner_1F_MapBorder
-	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MossdeepGameCorner
-
diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
deleted file mode 100644
index ec5dd2a57..000000000
--- a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_GameCorner_B1F_MapBorder::
-	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin"
-
-MossdeepCity_GameCorner_B1F_MapBlockdata::
-	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_B1F_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MossdeepCity_GameCorner_B1F_MapBorder
-	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc
deleted file mode 100644
index a65212a40..000000000
--- a/data/layouts/MossdeepCity_Gym/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_Gym_MapBorder::
-	.incbin "data/layouts/MossdeepCity_Gym/border.bin"
-
-MossdeepCity_Gym_MapBlockdata::
-	.incbin "data/layouts/MossdeepCity_Gym/map.bin"
-
-	.align 2
-MossdeepCity_Gym_Layout::
-	.4byte 0x1a
-	.4byte 0x24
-	.4byte MossdeepCity_Gym_MapBorder
-	.4byte MossdeepCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MossdeepGym
-
diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
deleted file mode 100644
index 759e68891..000000000
--- a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_SpaceCenter_1F_MapBorder::
-	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin"
-
-MossdeepCity_SpaceCenter_1F_MapBlockdata::
-	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_1F_Layout::
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
deleted file mode 100644
index 6e370a7fa..000000000
--- a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_SpaceCenter_2F_MapBorder::
-	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin"
-
-MossdeepCity_SpaceCenter_2F_MapBlockdata::
-	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_2F_Layout::
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc
deleted file mode 100644
index 0db92aee9..000000000
--- a/data/layouts/MossdeepCity_StevensHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_StevensHouse_MapBorder::
-	.incbin "data/layouts/MossdeepCity_StevensHouse/border.bin"
-
-MossdeepCity_StevensHouse_MapBlockdata::
-	.incbin "data/layouts/MossdeepCity_StevensHouse/map.bin"
-
-	.align 2
-MossdeepCity_StevensHouse_Layout::
-	.4byte 0xb
-	.4byte 0x8
-	.4byte MossdeepCity_StevensHouse_MapBorder
-	.4byte MossdeepCity_StevensHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc
deleted file mode 100644
index 29a3b1ad7..000000000
--- a/data/layouts/MtChimney/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtChimney_MapBorder::
-	.incbin "data/layouts/MtChimney/border.bin"
-
-MtChimney_MapBlockdata::
-	.incbin "data/layouts/MtChimney/map.bin"
-
-	.align 2
-MtChimney_Layout::
-	.4byte 0x28
-	.4byte 0x2f
-	.4byte MtChimney_MapBorder
-	.4byte MtChimney_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc
deleted file mode 100644
index 2402e815c..000000000
--- a/data/layouts/MtPyre_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_1F_MapBorder::
-	.incbin "data/layouts/MtPyre_1F/border.bin"
-
-MtPyre_1F_MapBlockdata::
-	.incbin "data/layouts/MtPyre_1F/map.bin"
-
-	.align 2
-MtPyre_1F_Layout::
-	.4byte 0x16
-	.4byte 0x13
-	.4byte MtPyre_1F_MapBorder
-	.4byte MtPyre_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc
deleted file mode 100644
index 8d6ca1200..000000000
--- a/data/layouts/MtPyre_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_2F_MapBorder::
-	.incbin "data/layouts/MtPyre_2F/border.bin"
-
-MtPyre_2F_MapBlockdata::
-	.incbin "data/layouts/MtPyre_2F/map.bin"
-
-	.align 2
-MtPyre_2F_Layout::
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_2F_MapBorder
-	.4byte MtPyre_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc
deleted file mode 100644
index 24ed0f7b1..000000000
--- a/data/layouts/MtPyre_3F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_3F_MapBorder::
-	.incbin "data/layouts/MtPyre_3F/border.bin"
-
-MtPyre_3F_MapBlockdata::
-	.incbin "data/layouts/MtPyre_3F/map.bin"
-
-	.align 2
-MtPyre_3F_Layout::
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_3F_MapBorder
-	.4byte MtPyre_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc
deleted file mode 100644
index 65a8fcf59..000000000
--- a/data/layouts/MtPyre_4F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_4F_MapBorder::
-	.incbin "data/layouts/MtPyre_4F/border.bin"
-
-MtPyre_4F_MapBlockdata::
-	.incbin "data/layouts/MtPyre_4F/map.bin"
-
-	.align 2
-MtPyre_4F_Layout::
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_4F_MapBorder
-	.4byte MtPyre_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc
deleted file mode 100644
index 222c6eb80..000000000
--- a/data/layouts/MtPyre_5F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_5F_MapBorder::
-	.incbin "data/layouts/MtPyre_5F/border.bin"
-
-MtPyre_5F_MapBlockdata::
-	.incbin "data/layouts/MtPyre_5F/map.bin"
-
-	.align 2
-MtPyre_5F_Layout::
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_5F_MapBorder
-	.4byte MtPyre_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc
deleted file mode 100644
index 31b5288d5..000000000
--- a/data/layouts/MtPyre_6F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_6F_MapBorder::
-	.incbin "data/layouts/MtPyre_6F/border.bin"
-
-MtPyre_6F_MapBlockdata::
-	.incbin "data/layouts/MtPyre_6F/map.bin"
-
-	.align 2
-MtPyre_6F_Layout::
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_6F_MapBorder
-	.4byte MtPyre_6F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc
deleted file mode 100644
index 1b5997dba..000000000
--- a/data/layouts/MtPyre_Exterior/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_Exterior_MapBorder::
-	.incbin "data/layouts/MtPyre_Exterior/border.bin"
-
-MtPyre_Exterior_MapBlockdata::
-	.incbin "data/layouts/MtPyre_Exterior/map.bin"
-
-	.align 2
-MtPyre_Exterior_Layout::
-	.4byte 0x26
-	.4byte 0x33
-	.4byte MtPyre_Exterior_MapBorder
-	.4byte MtPyre_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc
deleted file mode 100644
index 58e932eb7..000000000
--- a/data/layouts/MtPyre_Summit/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_Summit_MapBorder::
-	.incbin "data/layouts/MtPyre_Summit/border.bin"
-
-MtPyre_Summit_MapBlockdata::
-	.incbin "data/layouts/MtPyre_Summit/map.bin"
-
-	.align 2
-MtPyre_Summit_Layout::
-	.4byte 0x32
-	.4byte 0x25
-	.4byte MtPyre_Summit_MapBorder
-	.4byte MtPyre_Summit_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc
deleted file mode 100644
index 6f15bd276..000000000
--- a/data/layouts/NavelRock_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_B1F_MapBorder::
-	.incbin "data/layouts/NavelRock_B1F/border.bin"
-
-NavelRock_B1F_MapBlockdata::
-	.incbin "data/layouts/NavelRock_B1F/map.bin"
-
-	.align 2
-NavelRock_B1F_Layout::
-	.4byte 0x17
-	.4byte 0xb
-	.4byte NavelRock_B1F_MapBorder
-	.4byte NavelRock_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc
deleted file mode 100644
index 5c96a8cef..000000000
--- a/data/layouts/NavelRock_Bottom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Bottom_MapBorder::
-	.incbin "data/layouts/NavelRock_Bottom/border.bin"
-
-NavelRock_Bottom_MapBlockdata::
-	.incbin "data/layouts/NavelRock_Bottom/map.bin"
-
-	.align 2
-NavelRock_Bottom_Layout::
-	.4byte 0x16
-	.4byte 0x16
-	.4byte NavelRock_Bottom_MapBorder
-	.4byte NavelRock_Bottom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc
deleted file mode 100644
index 6dcedcb20..000000000
--- a/data/layouts/NavelRock_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Entrance_MapBorder::
-	.incbin "data/layouts/NavelRock_Entrance/border.bin"
-
-NavelRock_Entrance_MapBlockdata::
-	.incbin "data/layouts/NavelRock_Entrance/map.bin"
-
-	.align 2
-NavelRock_Entrance_Layout::
-	.4byte 0x15
-	.4byte 0x20
-	.4byte NavelRock_Entrance_MapBorder
-	.4byte NavelRock_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc
deleted file mode 100644
index c2c4fa95e..000000000
--- a/data/layouts/NavelRock_Exterior/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Exterior_MapBorder::
-	.incbin "data/layouts/NavelRock_Exterior/border.bin"
-
-NavelRock_Exterior_MapBlockdata::
-	.incbin "data/layouts/NavelRock_Exterior/map.bin"
-
-	.align 2
-NavelRock_Exterior_Layout::
-	.4byte 0x15
-	.4byte 0x18
-	.4byte NavelRock_Exterior_MapBorder
-	.4byte NavelRock_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc
deleted file mode 100644
index ab5d9c867..000000000
--- a/data/layouts/NavelRock_Fork/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Fork_MapBorder::
-	.incbin "data/layouts/NavelRock_Fork/border.bin"
-
-NavelRock_Fork_MapBlockdata::
-	.incbin "data/layouts/NavelRock_Fork/map.bin"
-
-	.align 2
-NavelRock_Fork_Layout::
-	.4byte 0x1b
-	.4byte 0x56
-	.4byte NavelRock_Fork_MapBorder
-	.4byte NavelRock_Fork_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc
deleted file mode 100644
index a7fc73d22..000000000
--- a/data/layouts/NavelRock_LadderRoom1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_LadderRoom1_MapBorder::
-	.incbin "data/layouts/NavelRock_LadderRoom1/border.bin"
-
-NavelRock_LadderRoom1_MapBlockdata::
-	.incbin "data/layouts/NavelRock_LadderRoom1/map.bin"
-
-	.align 2
-NavelRock_LadderRoom1_Layout::
-	.4byte 0x9
-	.4byte 0x8
-	.4byte NavelRock_LadderRoom1_MapBorder
-	.4byte NavelRock_LadderRoom1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc
deleted file mode 100644
index 8fbd6e51f..000000000
--- a/data/layouts/NavelRock_LadderRoom2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_LadderRoom2_MapBorder::
-	.incbin "data/layouts/NavelRock_LadderRoom2/border.bin"
-
-NavelRock_LadderRoom2_MapBlockdata::
-	.incbin "data/layouts/NavelRock_LadderRoom2/map.bin"
-
-	.align 2
-NavelRock_LadderRoom2_Layout::
-	.4byte 0x9
-	.4byte 0x8
-	.4byte NavelRock_LadderRoom2_MapBorder
-	.4byte NavelRock_LadderRoom2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc
deleted file mode 100644
index 50698cc76..000000000
--- a/data/layouts/NavelRock_Top/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Top_MapBorder::
-	.incbin "data/layouts/NavelRock_Top/border.bin"
-
-NavelRock_Top_MapBlockdata::
-	.incbin "data/layouts/NavelRock_Top/map.bin"
-
-	.align 2
-NavelRock_Top_Layout::
-	.4byte 0x19
-	.4byte 0x1c
-	.4byte NavelRock_Top_MapBorder
-	.4byte NavelRock_Top_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc
deleted file mode 100644
index bbd81cac7..000000000
--- a/data/layouts/NewMauville_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NewMauville_Entrance_MapBorder::
-	.incbin "data/layouts/NewMauville_Entrance/border.bin"
-
-NewMauville_Entrance_MapBlockdata::
-	.incbin "data/layouts/NewMauville_Entrance/map.bin"
-
-	.align 2
-NewMauville_Entrance_Layout::
-	.4byte 0x9
-	.4byte 0x9
-	.4byte NewMauville_Entrance_MapBorder
-	.4byte NewMauville_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc
deleted file mode 100644
index 096142c6d..000000000
--- a/data/layouts/NewMauville_Inside/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NewMauville_Inside_MapBorder::
-	.incbin "data/layouts/NewMauville_Inside/border.bin"
-
-NewMauville_Inside_MapBlockdata::
-	.incbin "data/layouts/NewMauville_Inside/map.bin"
-
-	.align 2
-NewMauville_Inside_Layout::
-	.4byte 0x29
-	.4byte 0x29
-	.4byte NewMauville_Inside_MapBorder
-	.4byte NewMauville_Inside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc
deleted file mode 100644
index 9709ca1ea..000000000
--- a/data/layouts/OldaleTown/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-OldaleTown_MapBorder::
-	.incbin "data/layouts/OldaleTown/border.bin"
-
-OldaleTown_MapBlockdata::
-	.incbin "data/layouts/OldaleTown/map.bin"
-
-	.align 2
-OldaleTown_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte OldaleTown_MapBorder
-	.4byte OldaleTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc
deleted file mode 100644
index 4ba791f23..000000000
--- a/data/layouts/PacifidlogTown/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_MapBorder::
-	.incbin "data/layouts/PacifidlogTown/border.bin"
-
-PacifidlogTown_MapBlockdata::
-	.incbin "data/layouts/PacifidlogTown/map.bin"
-
-	.align 2
-PacifidlogTown_Layout::
-	.4byte 0x14
-	.4byte 0x28
-	.4byte PacifidlogTown_MapBorder
-	.4byte PacifidlogTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc
deleted file mode 100644
index b5dcf58b2..000000000
--- a/data/layouts/PacifidlogTown_House1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_House1_MapBorder::
-	.incbin "data/layouts/PacifidlogTown_House1/border.bin"
-
-PacifidlogTown_House1_MapBlockdata::
-	.incbin "data/layouts/PacifidlogTown_House1/map.bin"
-
-	.align 2
-PacifidlogTown_House1_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House1_MapBorder
-	.4byte PacifidlogTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc
deleted file mode 100644
index a10daa3cd..000000000
--- a/data/layouts/PacifidlogTown_House2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_House2_MapBorder::
-	.incbin "data/layouts/PacifidlogTown_House2/border.bin"
-
-PacifidlogTown_House2_MapBlockdata::
-	.incbin "data/layouts/PacifidlogTown_House2/map.bin"
-
-	.align 2
-PacifidlogTown_House2_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House2_MapBorder
-	.4byte PacifidlogTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc
deleted file mode 100644
index bae16b88f..000000000
--- a/data/layouts/PetalburgCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_MapBorder::
-	.incbin "data/layouts/PetalburgCity/border.bin"
-
-PetalburgCity_MapBlockdata::
-	.incbin "data/layouts/PetalburgCity/map.bin"
-
-	.align 2
-PetalburgCity_Layout::
-	.4byte 0x1e
-	.4byte 0x1e
-	.4byte PetalburgCity_MapBorder
-	.4byte PetalburgCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc
deleted file mode 100644
index 36fe1002f..000000000
--- a/data/layouts/PetalburgCity_Gym/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_Gym_MapBorder::
-	.incbin "data/layouts/PetalburgCity_Gym/border.bin"
-
-PetalburgCity_Gym_MapBlockdata::
-	.incbin "data/layouts/PetalburgCity_Gym/map.bin"
-
-	.align 2
-PetalburgCity_Gym_Layout::
-	.4byte 0x9
-	.4byte 0x70
-	.4byte PetalburgCity_Gym_MapBorder
-	.4byte PetalburgCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PetalburgGym
-
diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc
deleted file mode 100644
index 840e17f7e..000000000
--- a/data/layouts/PetalburgWoods/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgWoods_MapBorder::
-	.incbin "data/layouts/PetalburgWoods/border.bin"
-
-PetalburgWoods_MapBlockdata::
-	.incbin "data/layouts/PetalburgWoods/map.bin"
-
-	.align 2
-PetalburgWoods_Layout::
-	.4byte 0x30
-	.4byte 0x2c
-	.4byte PetalburgWoods_MapBorder
-	.4byte PetalburgWoods_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc
deleted file mode 100644
index bf1335f84..000000000
--- a/data/layouts/PokemonCenter_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PokemonCenter_1F_MapBorder::
-	.incbin "data/layouts/PokemonCenter_1F/border.bin"
-
-PokemonCenter_1F_MapBlockdata::
-	.incbin "data/layouts/PokemonCenter_1F/map.bin"
-
-	.align 2
-PokemonCenter_1F_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte PokemonCenter_1F_MapBorder
-	.4byte PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc
deleted file mode 100644
index 3cb812de7..000000000
--- a/data/layouts/PokemonCenter_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PokemonCenter_2F_MapBorder::
-	.incbin "data/layouts/PokemonCenter_2F/border.bin"
-
-PokemonCenter_2F_MapBlockdata::
-	.incbin "data/layouts/PokemonCenter_2F/map.bin"
-
-	.align 2
-PokemonCenter_2F_Layout::
-	.4byte 0xe
-	.4byte 0xa
-	.4byte PokemonCenter_2F_MapBorder
-	.4byte PokemonCenter_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc
deleted file mode 100644
index ed258b2a7..000000000
--- a/data/layouts/RecordCorner/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RecordCorner_MapBorder::
-	.incbin "data/layouts/RecordCorner/border.bin"
-
-RecordCorner_MapBlockdata::
-	.incbin "data/layouts/RecordCorner/map.bin"
-
-	.align 2
-RecordCorner_Layout::
-	.4byte 0x14
-	.4byte 0xa
-	.4byte RecordCorner_MapBorder
-	.4byte RecordCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc
deleted file mode 100644
index e42ecf340..000000000
--- a/data/layouts/Route101/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route101_MapBorder::
-	.incbin "data/layouts/Route101/border.bin"
-
-Route101_MapBlockdata::
-	.incbin "data/layouts/Route101/map.bin"
-
-	.align 2
-Route101_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte Route101_MapBorder
-	.4byte Route101_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc
deleted file mode 100644
index 194d44fce..000000000
--- a/data/layouts/Route102/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route102_MapBorder::
-	.incbin "data/layouts/Route102/border.bin"
-
-Route102_MapBlockdata::
-	.incbin "data/layouts/Route102/map.bin"
-
-	.align 2
-Route102_Layout::
-	.4byte 0x32
-	.4byte 0x14
-	.4byte Route102_MapBorder
-	.4byte Route102_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc
deleted file mode 100644
index fe3bac066..000000000
--- a/data/layouts/Route103/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route103_MapBorder::
-	.incbin "data/layouts/Route103/border.bin"
-
-Route103_MapBlockdata::
-	.incbin "data/layouts/Route103/map.bin"
-
-	.align 2
-Route103_Layout::
-	.4byte 0x50
-	.4byte 0x16
-	.4byte Route103_MapBorder
-	.4byte Route103_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc
deleted file mode 100644
index 9a9418e46..000000000
--- a/data/layouts/Route104/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_MapBorder::
-	.incbin "data/layouts/Route104/border.bin"
-
-Route104_MapBlockdata::
-	.incbin "data/layouts/Route104/map.bin"
-
-	.align 2
-Route104_Layout::
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route104_MapBorder
-	.4byte Route104_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc
deleted file mode 100644
index 3474f3335..000000000
--- a/data/layouts/Route104_MrBrineysHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_MrBrineysHouse_MapBorder::
-	.incbin "data/layouts/Route104_MrBrineysHouse/border.bin"
-
-Route104_MrBrineysHouse_MapBlockdata::
-	.incbin "data/layouts/Route104_MrBrineysHouse/map.bin"
-
-	.align 2
-Route104_MrBrineysHouse_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route104_MrBrineysHouse_MapBorder
-	.4byte Route104_MrBrineysHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
deleted file mode 100644
index a46ffc18c..000000000
--- a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_PrettyPetalFlowerShop_MapBorder::
-	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin"
-
-Route104_PrettyPetalFlowerShop_MapBlockdata::
-	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin"
-
-	.align 2
-Route104_PrettyPetalFlowerShop_Layout::
-	.4byte 0xf
-	.4byte 0x9
-	.4byte Route104_PrettyPetalFlowerShop_MapBorder
-	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PrettyPetalFlowerShop
-
diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc
deleted file mode 100644
index b2b2c4f19..000000000
--- a/data/layouts/Route104_Prototype/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_Prototype_MapBorder::
-	.incbin "data/layouts/Route104_Prototype/border.bin"
-
-Route104_Prototype_MapBlockdata::
-	.incbin "data/layouts/Route104_Prototype/map.bin"
-
-	.align 2
-Route104_Prototype_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte Route104_Prototype_MapBorder
-	.4byte Route104_Prototype_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc
deleted file mode 100644
index ce78ef9cc..000000000
--- a/data/layouts/Route105/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route105_MapBorder::
-	.incbin "data/layouts/Route105/border.bin"
-
-Route105_MapBlockdata::
-	.incbin "data/layouts/Route105/map.bin"
-
-	.align 2
-Route105_Layout::
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route105_MapBorder
-	.4byte Route105_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc
deleted file mode 100644
index ea255b383..000000000
--- a/data/layouts/Route106/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route106_MapBorder::
-	.incbin "data/layouts/Route106/border.bin"
-
-Route106_MapBlockdata::
-	.incbin "data/layouts/Route106/map.bin"
-
-	.align 2
-Route106_Layout::
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route106_MapBorder
-	.4byte Route106_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc
deleted file mode 100644
index ea305b2a7..000000000
--- a/data/layouts/Route107/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route107_MapBorder::
-	.incbin "data/layouts/Route107/border.bin"
-
-Route107_MapBlockdata::
-	.incbin "data/layouts/Route107/map.bin"
-
-	.align 2
-Route107_Layout::
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route107_MapBorder
-	.4byte Route107_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc
deleted file mode 100644
index 1ec7171cf..000000000
--- a/data/layouts/Route108/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route108_MapBorder::
-	.incbin "data/layouts/Route108/border.bin"
-
-Route108_MapBlockdata::
-	.incbin "data/layouts/Route108/map.bin"
-
-	.align 2
-Route108_Layout::
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route108_MapBorder
-	.4byte Route108_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc
deleted file mode 100644
index fa41585e9..000000000
--- a/data/layouts/Route109/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route109_MapBorder::
-	.incbin "data/layouts/Route109/border.bin"
-
-Route109_MapBlockdata::
-	.incbin "data/layouts/Route109/map.bin"
-
-	.align 2
-Route109_Layout::
-	.4byte 0x28
-	.4byte 0x3f
-	.4byte Route109_MapBorder
-	.4byte Route109_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc
deleted file mode 100644
index 9ec997b48..000000000
--- a/data/layouts/Route109_SeashoreHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route109_SeashoreHouse_MapBorder::
-	.incbin "data/layouts/Route109_SeashoreHouse/border.bin"
-
-Route109_SeashoreHouse_MapBlockdata::
-	.incbin "data/layouts/Route109_SeashoreHouse/map.bin"
-
-	.align 2
-Route109_SeashoreHouse_Layout::
-	.4byte 0xf
-	.4byte 0xa
-	.4byte Route109_SeashoreHouse_MapBorder
-	.4byte Route109_SeashoreHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SeashoreHouse
-
diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc
deleted file mode 100644
index 24e5a9321..000000000
--- a/data/layouts/Route110/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_MapBorder::
-	.incbin "data/layouts/Route110/border.bin"
-
-Route110_MapBlockdata::
-	.incbin "data/layouts/Route110/map.bin"
-
-	.align 2
-Route110_Layout::
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route110_MapBorder
-	.4byte Route110_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc
deleted file mode 100644
index abf78f62d..000000000
--- a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_SeasideCyclingRoadEntrance_MapBorder::
-	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin"
-
-Route110_SeasideCyclingRoadEntrance_MapBlockdata::
-	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin"
-
-	.align 2
-Route110_SeasideCyclingRoadEntrance_Layout::
-	.4byte 0xf
-	.4byte 0x6
-	.4byte Route110_SeasideCyclingRoadEntrance_MapBorder
-	.4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc
deleted file mode 100644
index fe6ee4d26..000000000
--- a/data/layouts/Route110_TrickHouseCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHouseCorridor_MapBorder::
-	.incbin "data/layouts/Route110_TrickHouseCorridor/border.bin"
-
-Route110_TrickHouseCorridor_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHouseCorridor/map.bin"
-
-	.align 2
-Route110_TrickHouseCorridor_Layout::
-	.4byte 0xf
-	.4byte 0x18
-	.4byte Route110_TrickHouseCorridor_MapBorder
-	.4byte Route110_TrickHouseCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc
deleted file mode 100644
index dd9474aee..000000000
--- a/data/layouts/Route110_TrickHouseEnd/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHouseEnd_MapBorder::
-	.incbin "data/layouts/Route110_TrickHouseEnd/border.bin"
-
-Route110_TrickHouseEnd_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHouseEnd/map.bin"
-
-	.align 2
-Route110_TrickHouseEnd_Layout::
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEnd_MapBorder
-	.4byte Route110_TrickHouseEnd_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc
deleted file mode 100644
index 97f3abe24..000000000
--- a/data/layouts/Route110_TrickHouseEntrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHouseEntrance_MapBorder::
-	.incbin "data/layouts/Route110_TrickHouseEntrance/border.bin"
-
-Route110_TrickHouseEntrance_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHouseEntrance/map.bin"
-
-	.align 2
-Route110_TrickHouseEntrance_Layout::
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEntrance_MapBorder
-	.4byte Route110_TrickHouseEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
deleted file mode 100644
index 546876ab0..000000000
--- a/data/layouts/Route110_TrickHousePuzzle1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle1_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin"
-
-Route110_TrickHousePuzzle1_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle1_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle1_MapBorder
-	.4byte Route110_TrickHousePuzzle1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
deleted file mode 100644
index 65caaa734..000000000
--- a/data/layouts/Route110_TrickHousePuzzle2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle2_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin"
-
-Route110_TrickHousePuzzle2_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle2_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle2_MapBorder
-	.4byte Route110_TrickHousePuzzle2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
deleted file mode 100644
index a03cf9a71..000000000
--- a/data/layouts/Route110_TrickHousePuzzle3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle3_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin"
-
-Route110_TrickHousePuzzle3_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle3_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle3_MapBorder
-	.4byte Route110_TrickHousePuzzle3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
deleted file mode 100644
index 581b41a43..000000000
--- a/data/layouts/Route110_TrickHousePuzzle4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle4_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin"
-
-Route110_TrickHousePuzzle4_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle4_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle4_MapBorder
-	.4byte Route110_TrickHousePuzzle4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
deleted file mode 100644
index 5e06ac31e..000000000
--- a/data/layouts/Route110_TrickHousePuzzle5/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle5_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin"
-
-Route110_TrickHousePuzzle5_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle5_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle5_MapBorder
-	.4byte Route110_TrickHousePuzzle5_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
deleted file mode 100644
index 398c17951..000000000
--- a/data/layouts/Route110_TrickHousePuzzle6/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle6_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin"
-
-Route110_TrickHousePuzzle6_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle6_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle6_MapBorder
-	.4byte Route110_TrickHousePuzzle6_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
deleted file mode 100644
index 1612ec41b..000000000
--- a/data/layouts/Route110_TrickHousePuzzle7/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle7_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin"
-
-Route110_TrickHousePuzzle7_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle7_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle7_MapBorder
-	.4byte Route110_TrickHousePuzzle7_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
deleted file mode 100644
index 3520b503f..000000000
--- a/data/layouts/Route110_TrickHousePuzzle8/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle8_MapBorder::
-	.incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin"
-
-Route110_TrickHousePuzzle8_MapBlockdata::
-	.incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle8_Layout::
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle8_MapBorder
-	.4byte Route110_TrickHousePuzzle8_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc
deleted file mode 100644
index 2966c06c5..000000000
--- a/data/layouts/Route111/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route111_MapBorder::
-	.incbin "data/layouts/Route111/border.bin"
-
-Route111_MapBlockdata::
-	.incbin "data/layouts/Route111/map.bin"
-
-	.align 2
-Route111_Layout::
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route111_MapBorder
-	.4byte Route111_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc
deleted file mode 100644
index bf6a188cc..000000000
--- a/data/layouts/Route111_NoMirageTower/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route111_NoMirageTower_MapBorder::
-	.incbin "data/layouts/Route111_NoMirageTower/border.bin"
-
-Route111_NoMirageTower_MapBlockdata::
-	.incbin "data/layouts/Route111_NoMirageTower/map.bin"
-
-	.align 2
-Route111_NoMirageTower_Layout::
-	.4byte 0x28
-	.4byte 0x8C
-	.4byte Route111_NoMirageTower_MapBorder
-	.4byte Route111_NoMirageTower_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc
deleted file mode 100644
index 72a0c428c..000000000
--- a/data/layouts/Route112/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route112_MapBorder::
-	.incbin "data/layouts/Route112/border.bin"
-
-Route112_MapBlockdata::
-	.incbin "data/layouts/Route112/map.bin"
-
-	.align 2
-Route112_Layout::
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte Route112_MapBorder
-	.4byte Route112_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc
deleted file mode 100644
index 0c1d76b58..000000000
--- a/data/layouts/Route113/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route113_MapBorder::
-	.incbin "data/layouts/Route113/border.bin"
-
-Route113_MapBlockdata::
-	.incbin "data/layouts/Route113/map.bin"
-
-	.align 2
-Route113_Layout::
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route113_MapBorder
-	.4byte Route113_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc
deleted file mode 100644
index 071f9e1b6..000000000
--- a/data/layouts/Route114/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_MapBorder::
-	.incbin "data/layouts/Route114/border.bin"
-
-Route114_MapBlockdata::
-	.incbin "data/layouts/Route114/map.bin"
-
-	.align 2
-Route114_Layout::
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route114_MapBorder
-	.4byte Route114_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc
deleted file mode 100644
index f915e572a..000000000
--- a/data/layouts/Route114_FossilManiacsHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_FossilManiacsHouse_MapBorder::
-	.incbin "data/layouts/Route114_FossilManiacsHouse/border.bin"
-
-Route114_FossilManiacsHouse_MapBlockdata::
-	.incbin "data/layouts/Route114_FossilManiacsHouse/map.bin"
-
-	.align 2
-Route114_FossilManiacsHouse_Layout::
-	.4byte 0xa
-	.4byte 0x8
-	.4byte Route114_FossilManiacsHouse_MapBorder
-	.4byte Route114_FossilManiacsHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
deleted file mode 100644
index c2392ff01..000000000
--- a/data/layouts/Route114_FossilManiacsTunnel/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_FossilManiacsTunnel_MapBorder::
-	.incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin"
-
-Route114_FossilManiacsTunnel_MapBlockdata::
-	.incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin"
-
-	.align 2
-Route114_FossilManiacsTunnel_Layout::
-	.4byte 0xd
-	.4byte 0x1a
-	.4byte Route114_FossilManiacsTunnel_MapBorder
-	.4byte Route114_FossilManiacsTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc
deleted file mode 100644
index be9689ae3..000000000
--- a/data/layouts/Route114_LanettesHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_LanettesHouse_MapBorder::
-	.incbin "data/layouts/Route114_LanettesHouse/border.bin"
-
-Route114_LanettesHouse_MapBlockdata::
-	.incbin "data/layouts/Route114_LanettesHouse/map.bin"
-
-	.align 2
-Route114_LanettesHouse_Layout::
-	.4byte 0xb
-	.4byte 0x8
-	.4byte Route114_LanettesHouse_MapBorder
-	.4byte Route114_LanettesHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc
deleted file mode 100644
index 9d6c3c969..000000000
--- a/data/layouts/Route115/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route115_MapBorder::
-	.incbin "data/layouts/Route115/border.bin"
-
-Route115_MapBlockdata::
-	.incbin "data/layouts/Route115/map.bin"
-
-	.align 2
-Route115_Layout::
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route115_MapBorder
-	.4byte Route115_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc
deleted file mode 100644
index 232cc41f8..000000000
--- a/data/layouts/Route116/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route116_MapBorder::
-	.incbin "data/layouts/Route116/border.bin"
-
-Route116_MapBlockdata::
-	.incbin "data/layouts/Route116/map.bin"
-
-	.align 2
-Route116_Layout::
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route116_MapBorder
-	.4byte Route116_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc
deleted file mode 100644
index 1bd42eafc..000000000
--- a/data/layouts/Route116_TunnelersRestHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route116_TunnelersRestHouse_MapBorder::
-	.incbin "data/layouts/Route116_TunnelersRestHouse/border.bin"
-
-Route116_TunnelersRestHouse_MapBlockdata::
-	.incbin "data/layouts/Route116_TunnelersRestHouse/map.bin"
-
-	.align 2
-Route116_TunnelersRestHouse_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route116_TunnelersRestHouse_MapBorder
-	.4byte Route116_TunnelersRestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc
deleted file mode 100644
index 25e133f28..000000000
--- a/data/layouts/Route117/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route117_MapBorder::
-	.incbin "data/layouts/Route117/border.bin"
-
-Route117_MapBlockdata::
-	.incbin "data/layouts/Route117/map.bin"
-
-	.align 2
-Route117_Layout::
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route117_MapBorder
-	.4byte Route117_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc
deleted file mode 100644
index 403881bfe..000000000
--- a/data/layouts/Route117_PokemonDayCare/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route117_PokemonDayCare_MapBorder::
-	.incbin "data/layouts/Route117_PokemonDayCare/border.bin"
-
-Route117_PokemonDayCare_MapBlockdata::
-	.incbin "data/layouts/Route117_PokemonDayCare/map.bin"
-
-	.align 2
-Route117_PokemonDayCare_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route117_PokemonDayCare_MapBorder
-	.4byte Route117_PokemonDayCare_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonDayCare
-
diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc
deleted file mode 100644
index cb87f8414..000000000
--- a/data/layouts/Route118/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route118_MapBorder::
-	.incbin "data/layouts/Route118/border.bin"
-
-Route118_MapBlockdata::
-	.incbin "data/layouts/Route118/map.bin"
-
-	.align 2
-Route118_Layout::
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route118_MapBorder
-	.4byte Route118_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc
deleted file mode 100644
index 66502fb15..000000000
--- a/data/layouts/Route119/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119_MapBorder::
-	.incbin "data/layouts/Route119/border.bin"
-
-Route119_MapBlockdata::
-	.incbin "data/layouts/Route119/map.bin"
-
-	.align 2
-Route119_Layout::
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route119_MapBorder
-	.4byte Route119_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
deleted file mode 100644
index 9637beea5..000000000
--- a/data/layouts/Route119_WeatherInstitute_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119_WeatherInstitute_1F_MapBorder::
-	.incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin"
-
-Route119_WeatherInstitute_1F_MapBlockdata::
-	.incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_1F_Layout::
-	.4byte 0x14
-	.4byte 0xd
-	.4byte Route119_WeatherInstitute_1F_MapBorder
-	.4byte Route119_WeatherInstitute_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
deleted file mode 100644
index 4f0948f7b..000000000
--- a/data/layouts/Route119_WeatherInstitute_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119_WeatherInstitute_2F_MapBorder::
-	.incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin"
-
-Route119_WeatherInstitute_2F_MapBlockdata::
-	.incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_2F_Layout::
-	.4byte 0x14
-	.4byte 0xb
-	.4byte Route119_WeatherInstitute_2F_MapBorder
-	.4byte Route119_WeatherInstitute_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc
deleted file mode 100644
index f9e9255a0..000000000
--- a/data/layouts/Route120/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route120_MapBorder::
-	.incbin "data/layouts/Route120/border.bin"
-
-Route120_MapBlockdata::
-	.incbin "data/layouts/Route120/map.bin"
-
-	.align 2
-Route120_Layout::
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route120_MapBorder
-	.4byte Route120_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc
deleted file mode 100644
index 4d2c9744a..000000000
--- a/data/layouts/Route121/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route121_MapBorder::
-	.incbin "data/layouts/Route121/border.bin"
-
-Route121_MapBlockdata::
-	.incbin "data/layouts/Route121/map.bin"
-
-	.align 2
-Route121_Layout::
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route121_MapBorder
-	.4byte Route121_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc
deleted file mode 100644
index 38ad9e97e..000000000
--- a/data/layouts/Route121_SafariZoneEntrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route121_SafariZoneEntrance_MapBorder::
-	.incbin "data/layouts/Route121_SafariZoneEntrance/border.bin"
-
-Route121_SafariZoneEntrance_MapBlockdata::
-	.incbin "data/layouts/Route121_SafariZoneEntrance/map.bin"
-
-	.align 2
-Route121_SafariZoneEntrance_Layout::
-	.4byte 0x12
-	.4byte 0xe
-	.4byte Route121_SafariZoneEntrance_MapBorder
-	.4byte Route121_SafariZoneEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc
deleted file mode 100644
index 7f0baac20..000000000
--- a/data/layouts/Route122/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route122_MapBorder::
-	.incbin "data/layouts/Route122/border.bin"
-
-Route122_MapBlockdata::
-	.incbin "data/layouts/Route122/map.bin"
-
-	.align 2
-Route122_Layout::
-	.4byte 0x28
-	.4byte 0x28
-	.4byte Route122_MapBorder
-	.4byte Route122_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc
deleted file mode 100644
index 0c76c2b7b..000000000
--- a/data/layouts/Route123/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route123_MapBorder::
-	.incbin "data/layouts/Route123/border.bin"
-
-Route123_MapBlockdata::
-	.incbin "data/layouts/Route123/map.bin"
-
-	.align 2
-Route123_Layout::
-	.4byte 0x8c
-	.4byte 0x14
-	.4byte Route123_MapBorder
-	.4byte Route123_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc
deleted file mode 100644
index d27ed902a..000000000
--- a/data/layouts/Route124/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route124_MapBorder::
-	.incbin "data/layouts/Route124/border.bin"
-
-Route124_MapBlockdata::
-	.incbin "data/layouts/Route124/map.bin"
-
-	.align 2
-Route124_Layout::
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route124_MapBorder
-	.4byte Route124_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
deleted file mode 100644
index 263571235..000000000
--- a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route124_DivingTreasureHuntersHouse_MapBorder::
-	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin"
-
-Route124_DivingTreasureHuntersHouse_MapBlockdata::
-	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin"
-
-	.align 2
-Route124_DivingTreasureHuntersHouse_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
-	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc
deleted file mode 100644
index f0d4e13b7..000000000
--- a/data/layouts/Route125/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route125_MapBorder::
-	.incbin "data/layouts/Route125/border.bin"
-
-Route125_MapBlockdata::
-	.incbin "data/layouts/Route125/map.bin"
-
-	.align 2
-Route125_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route125_MapBorder
-	.4byte Route125_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc
deleted file mode 100644
index 859d025a5..000000000
--- a/data/layouts/Route126/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route126_MapBorder::
-	.incbin "data/layouts/Route126/border.bin"
-
-Route126_MapBlockdata::
-	.incbin "data/layouts/Route126/map.bin"
-
-	.align 2
-Route126_Layout::
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route126_MapBorder
-	.4byte Route126_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc
deleted file mode 100644
index 767330aff..000000000
--- a/data/layouts/Route127/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route127_MapBorder::
-	.incbin "data/layouts/Route127/border.bin"
-
-Route127_MapBlockdata::
-	.incbin "data/layouts/Route127/map.bin"
-
-	.align 2
-Route127_Layout::
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route127_MapBorder
-	.4byte Route127_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc
deleted file mode 100644
index 16624fa02..000000000
--- a/data/layouts/Route128/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route128_MapBorder::
-	.incbin "data/layouts/Route128/border.bin"
-
-Route128_MapBlockdata::
-	.incbin "data/layouts/Route128/map.bin"
-
-	.align 2
-Route128_Layout::
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Route128_MapBorder
-	.4byte Route128_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc
deleted file mode 100644
index 9b7d6af1d..000000000
--- a/data/layouts/Route129/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route129_MapBorder::
-	.incbin "data/layouts/Route129/border.bin"
-
-Route129_MapBlockdata::
-	.incbin "data/layouts/Route129/map.bin"
-
-	.align 2
-Route129_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route129_MapBorder
-	.4byte Route129_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc
deleted file mode 100644
index 41db11cb4..000000000
--- a/data/layouts/Route130/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route130_MapBorder::
-	.incbin "data/layouts/Route130/border.bin"
-
-Route130_MapBlockdata::
-	.incbin "data/layouts/Route130/map.bin"
-
-	.align 2
-Route130_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route130_MapBorder
-	.4byte Route130_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/Route130_MirageIsland/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnknownMap_08417FC4/border.bin
+++ b/data/layouts/Route130_MirageIsland/border.bin
diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/Route130_MirageIsland/map.bin
index 17a14a8d5..17a14a8d5 100644
--- a/data/layouts/UnknownMap_08417FC4/map.bin
+++ b/data/layouts/Route130_MirageIsland/map.bin
diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc
deleted file mode 100644
index 7fae261cc..000000000
--- a/data/layouts/Route131/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route131_MapBorder::
-	.incbin "data/layouts/Route131/border.bin"
-
-Route131_MapBlockdata::
-	.incbin "data/layouts/Route131/map.bin"
-
-	.align 2
-Route131_Layout::
-	.4byte 0x3c
-	.4byte 0x28
-	.4byte Route131_MapBorder
-	.4byte Route131_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/Route131_SkyPillar/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnknownMap_0845D470/border.bin
+++ b/data/layouts/Route131_SkyPillar/border.bin
diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/Route131_SkyPillar/map.bin
index cd136de41..cd136de41 100644
--- a/data/layouts/UnknownMap_0845D470/map.bin
+++ b/data/layouts/Route131_SkyPillar/map.bin
diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc
deleted file mode 100644
index afaa7fb58..000000000
--- a/data/layouts/Route132/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route132_MapBorder::
-	.incbin "data/layouts/Route132/border.bin"
-
-Route132_MapBlockdata::
-	.incbin "data/layouts/Route132/map.bin"
-
-	.align 2
-Route132_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route132_MapBorder
-	.4byte Route132_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc
deleted file mode 100644
index 5ff11108b..000000000
--- a/data/layouts/Route133/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route133_MapBorder::
-	.incbin "data/layouts/Route133/border.bin"
-
-Route133_MapBlockdata::
-	.incbin "data/layouts/Route133/map.bin"
-
-	.align 2
-Route133_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route133_MapBorder
-	.4byte Route133_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc
deleted file mode 100644
index 9eeca6cc9..000000000
--- a/data/layouts/Route134/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route134_MapBorder::
-	.incbin "data/layouts/Route134/border.bin"
-
-Route134_MapBlockdata::
-	.incbin "data/layouts/Route134/map.bin"
-
-	.align 2
-Route134_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route134_MapBorder
-	.4byte Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc
deleted file mode 100644
index 00c45dcc2..000000000
--- a/data/layouts/RustboroCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_MapBorder::
-	.incbin "data/layouts/RustboroCity/border.bin"
-
-RustboroCity_MapBlockdata::
-	.incbin "data/layouts/RustboroCity/map.bin"
-
-	.align 2
-RustboroCity_Layout::
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte RustboroCity_MapBorder
-	.4byte RustboroCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc
deleted file mode 100644
index 0c86dede9..000000000
--- a/data/layouts/RustboroCity_CuttersHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_CuttersHouse_MapBorder::
-	.incbin "data/layouts/RustboroCity_CuttersHouse/border.bin"
-
-RustboroCity_CuttersHouse_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_CuttersHouse/map.bin"
-
-	.align 2
-RustboroCity_CuttersHouse_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte RustboroCity_CuttersHouse_MapBorder
-	.4byte RustboroCity_CuttersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
deleted file mode 100644
index dbf6b388e..000000000
--- a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_1F_MapBorder::
-	.incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin"
-
-RustboroCity_DevonCorp_1F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_1F_Layout::
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_1F_MapBorder
-	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
deleted file mode 100644
index 34d581ae5..000000000
--- a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_2F_MapBorder::
-	.incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin"
-
-RustboroCity_DevonCorp_2F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_2F_Layout::
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_2F_MapBorder
-	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
deleted file mode 100644
index 64c555be5..000000000
--- a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_3F_MapBorder::
-	.incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin"
-
-RustboroCity_DevonCorp_3F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_3F_Layout::
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_3F_MapBorder
-	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc
deleted file mode 100644
index b904524a6..000000000
--- a/data/layouts/RustboroCity_Flat1_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat1_1F_MapBorder::
-	.incbin "data/layouts/RustboroCity_Flat1_1F/border.bin"
-
-RustboroCity_Flat1_1F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_Flat1_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_1F_Layout::
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_1F_MapBorder
-	.4byte RustboroCity_Flat1_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc
deleted file mode 100644
index aa6e3ebdf..000000000
--- a/data/layouts/RustboroCity_Flat1_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat1_2F_MapBorder::
-	.incbin "data/layouts/RustboroCity_Flat1_2F/border.bin"
-
-RustboroCity_Flat1_2F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_Flat1_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_2F_Layout::
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_2F_MapBorder
-	.4byte RustboroCity_Flat1_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc
deleted file mode 100644
index 8e44c97b7..000000000
--- a/data/layouts/RustboroCity_Flat2_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat2_1F_MapBorder::
-	.incbin "data/layouts/RustboroCity_Flat2_1F/border.bin"
-
-RustboroCity_Flat2_1F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_Flat2_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_1F_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_1F_MapBorder
-	.4byte RustboroCity_Flat2_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc
deleted file mode 100644
index ffcba8d17..000000000
--- a/data/layouts/RustboroCity_Flat2_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat2_2F_MapBorder::
-	.incbin "data/layouts/RustboroCity_Flat2_2F/border.bin"
-
-RustboroCity_Flat2_2F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_Flat2_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_2F_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_2F_MapBorder
-	.4byte RustboroCity_Flat2_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc
deleted file mode 100644
index 77775b4e0..000000000
--- a/data/layouts/RustboroCity_Flat2_3F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat2_3F_MapBorder::
-	.incbin "data/layouts/RustboroCity_Flat2_3F/border.bin"
-
-RustboroCity_Flat2_3F_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_Flat2_3F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_3F_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_3F_MapBorder
-	.4byte RustboroCity_Flat2_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc
deleted file mode 100644
index 8c064171b..000000000
--- a/data/layouts/RustboroCity_Gym/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Gym_MapBorder::
-	.incbin "data/layouts/RustboroCity_Gym/border.bin"
-
-RustboroCity_Gym_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_Gym/map.bin"
-
-	.align 2
-RustboroCity_Gym_Layout::
-	.4byte 0xb
-	.4byte 0x14
-	.4byte RustboroCity_Gym_MapBorder
-	.4byte RustboroCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_RustboroGym
-
diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc
deleted file mode 100644
index 0c8a2075e..000000000
--- a/data/layouts/RustboroCity_House/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_House_MapBorder::
-	.incbin "data/layouts/RustboroCity_House/border.bin"
-
-RustboroCity_House_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_House/map.bin"
-
-	.align 2
-RustboroCity_House_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte RustboroCity_House_MapBorder
-	.4byte RustboroCity_House_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc
deleted file mode 100644
index 27893f2fb..000000000
--- a/data/layouts/RustboroCity_House1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_House1_MapBorder::
-	.incbin "data/layouts/RustboroCity_House1/border.bin"
-
-RustboroCity_House1_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_House1/map.bin"
-
-	.align 2
-RustboroCity_House1_Layout::
-	.4byte 0xd
-	.4byte 0x8
-	.4byte RustboroCity_House1_MapBorder
-	.4byte RustboroCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc
deleted file mode 100644
index 2c4eb3977..000000000
--- a/data/layouts/RustboroCity_PokemonSchool/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_PokemonSchool_MapBorder::
-	.incbin "data/layouts/RustboroCity_PokemonSchool/border.bin"
-
-RustboroCity_PokemonSchool_MapBlockdata::
-	.incbin "data/layouts/RustboroCity_PokemonSchool/map.bin"
-
-	.align 2
-RustboroCity_PokemonSchool_Layout::
-	.4byte 0xc
-	.4byte 0xb
-	.4byte RustboroCity_PokemonSchool_MapBorder
-	.4byte RustboroCity_PokemonSchool_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonSchool
-
diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc
deleted file mode 100644
index 7a063b922..000000000
--- a/data/layouts/RusturfTunnel/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RusturfTunnel_MapBorder::
-	.incbin "data/layouts/RusturfTunnel/border.bin"
-
-RusturfTunnel_MapBlockdata::
-	.incbin "data/layouts/RusturfTunnel/map.bin"
-
-	.align 2
-RusturfTunnel_Layout::
-	.4byte 0x24
-	.4byte 0x18
-	.4byte RusturfTunnel_MapBorder
-	.4byte RusturfTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_RusturfTunnel
-
diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc
deleted file mode 100644
index bcc034ecd..000000000
--- a/data/layouts/SSTidalCorridor/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SSTidalCorridor_MapBorder::
-	.incbin "data/layouts/SSTidalCorridor/border.bin"
-
-SSTidalCorridor_MapBlockdata::
-	.incbin "data/layouts/SSTidalCorridor/map.bin"
-
-	.align 2
-SSTidalCorridor_Layout::
-	.4byte 0x12
-	.4byte 0xd
-	.4byte SSTidalCorridor_MapBorder
-	.4byte SSTidalCorridor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc
deleted file mode 100644
index 807da09a1..000000000
--- a/data/layouts/SSTidalLowerDeck/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SSTidalLowerDeck_MapBorder::
-	.incbin "data/layouts/SSTidalLowerDeck/border.bin"
-
-SSTidalLowerDeck_MapBlockdata::
-	.incbin "data/layouts/SSTidalLowerDeck/map.bin"
-
-	.align 2
-SSTidalLowerDeck_Layout::
-	.4byte 0x11
-	.4byte 0xd
-	.4byte SSTidalLowerDeck_MapBorder
-	.4byte SSTidalLowerDeck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc
deleted file mode 100644
index e44aac53c..000000000
--- a/data/layouts/SSTidalRooms/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SSTidalRooms_MapBorder::
-	.incbin "data/layouts/SSTidalRooms/border.bin"
-
-SSTidalRooms_MapBlockdata::
-	.incbin "data/layouts/SSTidalRooms/map.bin"
-
-	.align 2
-SSTidalRooms_Layout::
-	.4byte 0x24
-	.4byte 0x12
-	.4byte SSTidalRooms_MapBorder
-	.4byte SSTidalRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc
deleted file mode 100644
index c6986540f..000000000
--- a/data/layouts/SafariZone_North/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_North_MapBorder::
-	.incbin "data/layouts/SafariZone_North/border.bin"
-
-SafariZone_North_MapBlockdata::
-	.incbin "data/layouts/SafariZone_North/map.bin"
-
-	.align 2
-SafariZone_North_Layout::
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_North_MapBorder
-	.4byte SafariZone_North_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc
deleted file mode 100644
index 026e4a7c7..000000000
--- a/data/layouts/SafariZone_Northeast/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Northeast_MapBorder::
-	.incbin "data/layouts/SafariZone_Northeast/border.bin"
-
-SafariZone_Northeast_MapBlockdata::
-	.incbin "data/layouts/SafariZone_Northeast/map.bin"
-
-	.align 2
-SafariZone_Northeast_Layout::
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northeast_MapBorder
-	.4byte SafariZone_Northeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc
deleted file mode 100644
index 09d8bd482..000000000
--- a/data/layouts/SafariZone_Northwest/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Northwest_MapBorder::
-	.incbin "data/layouts/SafariZone_Northwest/border.bin"
-
-SafariZone_Northwest_MapBlockdata::
-	.incbin "data/layouts/SafariZone_Northwest/map.bin"
-
-	.align 2
-SafariZone_Northwest_Layout::
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northwest_MapBorder
-	.4byte SafariZone_Northwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc
deleted file mode 100644
index 4176cb370..000000000
--- a/data/layouts/SafariZone_RestHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_RestHouse_MapBorder::
-	.incbin "data/layouts/SafariZone_RestHouse/border.bin"
-
-SafariZone_RestHouse_MapBlockdata::
-	.incbin "data/layouts/SafariZone_RestHouse/map.bin"
-
-	.align 2
-SafariZone_RestHouse_Layout::
-	.4byte 0xa
-	.4byte 0x9
-	.4byte SafariZone_RestHouse_MapBorder
-	.4byte SafariZone_RestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc
deleted file mode 100644
index ec83ba5b0..000000000
--- a/data/layouts/SafariZone_South/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_South_MapBorder::
-	.incbin "data/layouts/SafariZone_South/border.bin"
-
-SafariZone_South_MapBlockdata::
-	.incbin "data/layouts/SafariZone_South/map.bin"
-
-	.align 2
-SafariZone_South_Layout::
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_South_MapBorder
-	.4byte SafariZone_South_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc
deleted file mode 100644
index e55309b46..000000000
--- a/data/layouts/SafariZone_Southeast/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Southeast_MapBorder::
-	.incbin "data/layouts/SafariZone_Southeast/border.bin"
-
-SafariZone_Southeast_MapBlockdata::
-	.incbin "data/layouts/SafariZone_Southeast/map.bin"
-
-	.align 2
-SafariZone_Southeast_Layout::
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southeast_MapBorder
-	.4byte SafariZone_Southeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc
deleted file mode 100644
index 1236d4d4b..000000000
--- a/data/layouts/SafariZone_Southwest/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Southwest_MapBorder::
-	.incbin "data/layouts/SafariZone_Southwest/border.bin"
-
-SafariZone_Southwest_MapBlockdata::
-	.incbin "data/layouts/SafariZone_Southwest/map.bin"
-
-	.align 2
-SafariZone_Southwest_Layout::
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southwest_MapBorder
-	.4byte SafariZone_Southwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc
deleted file mode 100644
index 897d873ab..000000000
--- a/data/layouts/ScorchedSlab/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ScorchedSlab_MapBorder::
-	.incbin "data/layouts/ScorchedSlab/border.bin"
-
-ScorchedSlab_MapBlockdata::
-	.incbin "data/layouts/ScorchedSlab/map.bin"
-
-	.align 2
-ScorchedSlab_Layout::
-	.4byte 0xf
-	.4byte 0x14
-	.4byte ScorchedSlab_MapBorder
-	.4byte ScorchedSlab_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc
deleted file mode 100644
index 1d6ce495b..000000000
--- a/data/layouts/SeafloorCavern_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Entrance_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Entrance/border.bin"
-
-SeafloorCavern_Entrance_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Entrance/map.bin"
-
-	.align 2
-SeafloorCavern_Entrance_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Entrance_MapBorder
-	.4byte SeafloorCavern_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc
deleted file mode 100644
index 7f7cf0570..000000000
--- a/data/layouts/SeafloorCavern_Room1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room1_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room1/border.bin"
-
-SeafloorCavern_Room1_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room1/map.bin"
-
-	.align 2
-SeafloorCavern_Room1_Layout::
-	.4byte 0x14
-	.4byte 0x15
-	.4byte SeafloorCavern_Room1_MapBorder
-	.4byte SeafloorCavern_Room1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc
deleted file mode 100644
index 89f4e6a79..000000000
--- a/data/layouts/SeafloorCavern_Room2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room2_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room2/border.bin"
-
-SeafloorCavern_Room2_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room2/map.bin"
-
-	.align 2
-SeafloorCavern_Room2_Layout::
-	.4byte 0x12
-	.4byte 0xc
-	.4byte SeafloorCavern_Room2_MapBorder
-	.4byte SeafloorCavern_Room2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc
deleted file mode 100644
index 070842a9f..000000000
--- a/data/layouts/SeafloorCavern_Room3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room3_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room3/border.bin"
-
-SeafloorCavern_Room3_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room3/map.bin"
-
-	.align 2
-SeafloorCavern_Room3_Layout::
-	.4byte 0x10
-	.4byte 0x11
-	.4byte SeafloorCavern_Room3_MapBorder
-	.4byte SeafloorCavern_Room3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc
deleted file mode 100644
index 6c984109d..000000000
--- a/data/layouts/SeafloorCavern_Room4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room4_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room4/border.bin"
-
-SeafloorCavern_Room4_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room4/map.bin"
-
-	.align 2
-SeafloorCavern_Room4_Layout::
-	.4byte 0x12
-	.4byte 0x13
-	.4byte SeafloorCavern_Room4_MapBorder
-	.4byte SeafloorCavern_Room4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc
deleted file mode 100644
index c48b00dba..000000000
--- a/data/layouts/SeafloorCavern_Room5/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room5_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room5/border.bin"
-
-SeafloorCavern_Room5_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room5/map.bin"
-
-	.align 2
-SeafloorCavern_Room5_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Room5_MapBorder
-	.4byte SeafloorCavern_Room5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc
deleted file mode 100644
index f729d0b1b..000000000
--- a/data/layouts/SeafloorCavern_Room6/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room6_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room6/border.bin"
-
-SeafloorCavern_Room6_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room6/map.bin"
-
-	.align 2
-SeafloorCavern_Room6_Layout::
-	.4byte 0x18
-	.4byte 0x17
-	.4byte SeafloorCavern_Room6_MapBorder
-	.4byte SeafloorCavern_Room6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc
deleted file mode 100644
index 784b9bbb9..000000000
--- a/data/layouts/SeafloorCavern_Room7/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room7_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room7/border.bin"
-
-SeafloorCavern_Room7_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room7/map.bin"
-
-	.align 2
-SeafloorCavern_Room7_Layout::
-	.4byte 0x17
-	.4byte 0x19
-	.4byte SeafloorCavern_Room7_MapBorder
-	.4byte SeafloorCavern_Room7_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc
deleted file mode 100644
index 8f3d826c7..000000000
--- a/data/layouts/SeafloorCavern_Room8/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room8_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room8/border.bin"
-
-SeafloorCavern_Room8_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room8/map.bin"
-
-	.align 2
-SeafloorCavern_Room8_Layout::
-	.4byte 0xb
-	.4byte 0xe
-	.4byte SeafloorCavern_Room8_MapBorder
-	.4byte SeafloorCavern_Room8_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc
deleted file mode 100644
index a5039da8f..000000000
--- a/data/layouts/SeafloorCavern_Room9/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room9_MapBorder::
-	.incbin "data/layouts/SeafloorCavern_Room9/border.bin"
-
-SeafloorCavern_Room9_MapBlockdata::
-	.incbin "data/layouts/SeafloorCavern_Room9/map.bin"
-
-	.align 2
-SeafloorCavern_Room9_Layout::
-	.4byte 0x1b
-	.4byte 0x2e
-	.4byte SeafloorCavern_Room9_MapBorder
-	.4byte SeafloorCavern_Room9_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0845ECB4/border.bin b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/layouts/UnknownMap_0845ECB4/border.bin
+++ b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
index ec344933f..ec344933f 100644
--- a/data/layouts/UnknownMap_0845ECB4/map.bin
+++ b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc
deleted file mode 100644
index 7a064d5f0..000000000
--- a/data/layouts/SealedChamber_InnerRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SealedChamber_InnerRoom_MapBorder::
-	.incbin "data/layouts/SealedChamber_InnerRoom/border.bin"
-
-SealedChamber_InnerRoom_MapBlockdata::
-	.incbin "data/layouts/SealedChamber_InnerRoom/map.bin"
-
-	.align 2
-SealedChamber_InnerRoom_Layout::
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_InnerRoom_MapBorder
-	.4byte SealedChamber_InnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc
deleted file mode 100644
index bc6afaf29..000000000
--- a/data/layouts/SealedChamber_OuterRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SealedChamber_OuterRoom_MapBorder::
-	.incbin "data/layouts/SealedChamber_OuterRoom/border.bin"
-
-SealedChamber_OuterRoom_MapBlockdata::
-	.incbin "data/layouts/SealedChamber_OuterRoom/map.bin"
-
-	.align 2
-SealedChamber_OuterRoom_Layout::
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_OuterRoom_MapBorder
-	.4byte SealedChamber_OuterRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc
deleted file mode 100644
index ec138440a..000000000
--- a/data/layouts/SecretBase_BlueCave1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave1_MapBorder::
-	.incbin "data/layouts/SecretBase_BlueCave1/border.bin"
-
-SecretBase_BlueCave1_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BlueCave1/map.bin"
-
-	.align 2
-SecretBase_BlueCave1_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BlueCave1_MapBorder
-	.4byte SecretBase_BlueCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc
deleted file mode 100644
index 8c2b48661..000000000
--- a/data/layouts/SecretBase_BlueCave2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave2_MapBorder::
-	.incbin "data/layouts/SecretBase_BlueCave2/border.bin"
-
-SecretBase_BlueCave2_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BlueCave2/map.bin"
-
-	.align 2
-SecretBase_BlueCave2_Layout::
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_BlueCave2_MapBorder
-	.4byte SecretBase_BlueCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc
deleted file mode 100644
index 0ac8bee1b..000000000
--- a/data/layouts/SecretBase_BlueCave3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave3_MapBorder::
-	.incbin "data/layouts/SecretBase_BlueCave3/border.bin"
-
-SecretBase_BlueCave3_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BlueCave3/map.bin"
-
-	.align 2
-SecretBase_BlueCave3_Layout::
-	.4byte 0xa
-	.4byte 0x11
-	.4byte SecretBase_BlueCave3_MapBorder
-	.4byte SecretBase_BlueCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc
deleted file mode 100644
index d0e5ed45f..000000000
--- a/data/layouts/SecretBase_BlueCave4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave4_MapBorder::
-	.incbin "data/layouts/SecretBase_BlueCave4/border.bin"
-
-SecretBase_BlueCave4_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BlueCave4/map.bin"
-
-	.align 2
-SecretBase_BlueCave4_Layout::
-	.4byte 0x9
-	.4byte 0x11
-	.4byte SecretBase_BlueCave4_MapBorder
-	.4byte SecretBase_BlueCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc
deleted file mode 100644
index 9044fd6d1..000000000
--- a/data/layouts/SecretBase_BrownCave1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave1_MapBorder::
-	.incbin "data/layouts/SecretBase_BrownCave1/border.bin"
-
-SecretBase_BrownCave1_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BrownCave1/map.bin"
-
-	.align 2
-SecretBase_BrownCave1_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BrownCave1_MapBorder
-	.4byte SecretBase_BrownCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc
deleted file mode 100644
index 7cfb9573b..000000000
--- a/data/layouts/SecretBase_BrownCave2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave2_MapBorder::
-	.incbin "data/layouts/SecretBase_BrownCave2/border.bin"
-
-SecretBase_BrownCave2_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BrownCave2/map.bin"
-
-	.align 2
-SecretBase_BrownCave2_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_BrownCave2_MapBorder
-	.4byte SecretBase_BrownCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc
deleted file mode 100644
index 5ad1bf526..000000000
--- a/data/layouts/SecretBase_BrownCave3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave3_MapBorder::
-	.incbin "data/layouts/SecretBase_BrownCave3/border.bin"
-
-SecretBase_BrownCave3_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BrownCave3/map.bin"
-
-	.align 2
-SecretBase_BrownCave3_Layout::
-	.4byte 0xf
-	.4byte 0xb
-	.4byte SecretBase_BrownCave3_MapBorder
-	.4byte SecretBase_BrownCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc
deleted file mode 100644
index 6094a3832..000000000
--- a/data/layouts/SecretBase_BrownCave4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave4_MapBorder::
-	.incbin "data/layouts/SecretBase_BrownCave4/border.bin"
-
-SecretBase_BrownCave4_MapBlockdata::
-	.incbin "data/layouts/SecretBase_BrownCave4/map.bin"
-
-	.align 2
-SecretBase_BrownCave4_Layout::
-	.4byte 0xe
-	.4byte 0xc
-	.4byte SecretBase_BrownCave4_MapBorder
-	.4byte SecretBase_BrownCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc
deleted file mode 100644
index a4664d509..000000000
--- a/data/layouts/SecretBase_RedCave1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave1_MapBorder::
-	.incbin "data/layouts/SecretBase_RedCave1/border.bin"
-
-SecretBase_RedCave1_MapBlockdata::
-	.incbin "data/layouts/SecretBase_RedCave1/map.bin"
-
-	.align 2
-SecretBase_RedCave1_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_RedCave1_MapBorder
-	.4byte SecretBase_RedCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc
deleted file mode 100644
index 7999395d8..000000000
--- a/data/layouts/SecretBase_RedCave2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave2_MapBorder::
-	.incbin "data/layouts/SecretBase_RedCave2/border.bin"
-
-SecretBase_RedCave2_MapBlockdata::
-	.incbin "data/layouts/SecretBase_RedCave2/map.bin"
-
-	.align 2
-SecretBase_RedCave2_Layout::
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_RedCave2_MapBorder
-	.4byte SecretBase_RedCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc
deleted file mode 100644
index 6a3cc123b..000000000
--- a/data/layouts/SecretBase_RedCave3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave3_MapBorder::
-	.incbin "data/layouts/SecretBase_RedCave3/border.bin"
-
-SecretBase_RedCave3_MapBlockdata::
-	.incbin "data/layouts/SecretBase_RedCave3/map.bin"
-
-	.align 2
-SecretBase_RedCave3_Layout::
-	.4byte 0xf
-	.4byte 0x8
-	.4byte SecretBase_RedCave3_MapBorder
-	.4byte SecretBase_RedCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc
deleted file mode 100644
index 665f44709..000000000
--- a/data/layouts/SecretBase_RedCave4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave4_MapBorder::
-	.incbin "data/layouts/SecretBase_RedCave4/border.bin"
-
-SecretBase_RedCave4_MapBlockdata::
-	.incbin "data/layouts/SecretBase_RedCave4/map.bin"
-
-	.align 2
-SecretBase_RedCave4_Layout::
-	.4byte 0x9
-	.4byte 0xf
-	.4byte SecretBase_RedCave4_MapBorder
-	.4byte SecretBase_RedCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc
deleted file mode 100644
index 2bcc9f58a..000000000
--- a/data/layouts/SecretBase_Shrub1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub1_MapBorder::
-	.incbin "data/layouts/SecretBase_Shrub1/border.bin"
-
-SecretBase_Shrub1_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Shrub1/map.bin"
-
-	.align 2
-SecretBase_Shrub1_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Shrub1_MapBorder
-	.4byte SecretBase_Shrub1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc
deleted file mode 100644
index e94376c3b..000000000
--- a/data/layouts/SecretBase_Shrub2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub2_MapBorder::
-	.incbin "data/layouts/SecretBase_Shrub2/border.bin"
-
-SecretBase_Shrub2_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Shrub2/map.bin"
-
-	.align 2
-SecretBase_Shrub2_Layout::
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_Shrub2_MapBorder
-	.4byte SecretBase_Shrub2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc
deleted file mode 100644
index 449f1a11f..000000000
--- a/data/layouts/SecretBase_Shrub3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub3_MapBorder::
-	.incbin "data/layouts/SecretBase_Shrub3/border.bin"
-
-SecretBase_Shrub3_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Shrub3/map.bin"
-
-	.align 2
-SecretBase_Shrub3_Layout::
-	.4byte 0xd
-	.4byte 0xb
-	.4byte SecretBase_Shrub3_MapBorder
-	.4byte SecretBase_Shrub3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc
deleted file mode 100644
index 139a82050..000000000
--- a/data/layouts/SecretBase_Shrub4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub4_MapBorder::
-	.incbin "data/layouts/SecretBase_Shrub4/border.bin"
-
-SecretBase_Shrub4_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Shrub4/map.bin"
-
-	.align 2
-SecretBase_Shrub4_Layout::
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SecretBase_Shrub4_MapBorder
-	.4byte SecretBase_Shrub4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc
deleted file mode 100644
index 73e6e41a6..000000000
--- a/data/layouts/SecretBase_Tree1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree1_MapBorder::
-	.incbin "data/layouts/SecretBase_Tree1/border.bin"
-
-SecretBase_Tree1_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Tree1/map.bin"
-
-	.align 2
-SecretBase_Tree1_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Tree1_MapBorder
-	.4byte SecretBase_Tree1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc
deleted file mode 100644
index 95b122220..000000000
--- a/data/layouts/SecretBase_Tree2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree2_MapBorder::
-	.incbin "data/layouts/SecretBase_Tree2/border.bin"
-
-SecretBase_Tree2_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Tree2/map.bin"
-
-	.align 2
-SecretBase_Tree2_Layout::
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_Tree2_MapBorder
-	.4byte SecretBase_Tree2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc
deleted file mode 100644
index 66716a404..000000000
--- a/data/layouts/SecretBase_Tree3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree3_MapBorder::
-	.incbin "data/layouts/SecretBase_Tree3/border.bin"
-
-SecretBase_Tree3_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Tree3/map.bin"
-
-	.align 2
-SecretBase_Tree3_Layout::
-	.4byte 0x11
-	.4byte 0x8
-	.4byte SecretBase_Tree3_MapBorder
-	.4byte SecretBase_Tree3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc
deleted file mode 100644
index 20d4c3e01..000000000
--- a/data/layouts/SecretBase_Tree4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree4_MapBorder::
-	.incbin "data/layouts/SecretBase_Tree4/border.bin"
-
-SecretBase_Tree4_MapBlockdata::
-	.incbin "data/layouts/SecretBase_Tree4/map.bin"
-
-	.align 2
-SecretBase_Tree4_Layout::
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SecretBase_Tree4_MapBorder
-	.4byte SecretBase_Tree4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc
deleted file mode 100644
index 7fa3aa823..000000000
--- a/data/layouts/SecretBase_YellowCave1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave1_MapBorder::
-	.incbin "data/layouts/SecretBase_YellowCave1/border.bin"
-
-SecretBase_YellowCave1_MapBlockdata::
-	.incbin "data/layouts/SecretBase_YellowCave1/map.bin"
-
-	.align 2
-SecretBase_YellowCave1_Layout::
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_YellowCave1_MapBorder
-	.4byte SecretBase_YellowCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc
deleted file mode 100644
index 0ae872e08..000000000
--- a/data/layouts/SecretBase_YellowCave2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave2_MapBorder::
-	.incbin "data/layouts/SecretBase_YellowCave2/border.bin"
-
-SecretBase_YellowCave2_MapBlockdata::
-	.incbin "data/layouts/SecretBase_YellowCave2/map.bin"
-
-	.align 2
-SecretBase_YellowCave2_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_YellowCave2_MapBorder
-	.4byte SecretBase_YellowCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc
deleted file mode 100644
index f42d88920..000000000
--- a/data/layouts/SecretBase_YellowCave3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave3_MapBorder::
-	.incbin "data/layouts/SecretBase_YellowCave3/border.bin"
-
-SecretBase_YellowCave3_MapBlockdata::
-	.incbin "data/layouts/SecretBase_YellowCave3/map.bin"
-
-	.align 2
-SecretBase_YellowCave3_Layout::
-	.4byte 0xc
-	.4byte 0xb
-	.4byte SecretBase_YellowCave3_MapBorder
-	.4byte SecretBase_YellowCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc
deleted file mode 100644
index b7a11df5a..000000000
--- a/data/layouts/SecretBase_YellowCave4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave4_MapBorder::
-	.incbin "data/layouts/SecretBase_YellowCave4/border.bin"
-
-SecretBase_YellowCave4_MapBlockdata::
-	.incbin "data/layouts/SecretBase_YellowCave4/map.bin"
-
-	.align 2
-SecretBase_YellowCave4_Layout::
-	.4byte 0xd
-	.4byte 0xe
-	.4byte SecretBase_YellowCave4_MapBorder
-	.4byte SecretBase_YellowCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
deleted file mode 100644
index a52425e15..000000000
--- a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_HighTideEntranceRoom_MapBorder::
-	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin"
-
-ShoalCave_HighTideEntranceRoom_MapBlockdata::
-	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideEntranceRoom_Layout::
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
-	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
deleted file mode 100644
index 2d323b9e0..000000000
--- a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_HighTideInnerRoom_MapBorder::
-	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin"
-
-ShoalCave_HighTideInnerRoom_MapBlockdata::
-	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideInnerRoom_Layout::
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_HighTideInnerRoom_MapBorder
-	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
deleted file mode 100644
index 0a1eee113..000000000
--- a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideEntranceRoom_MapBorder::
-	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin"
-
-ShoalCave_LowTideEntranceRoom_MapBlockdata::
-	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideEntranceRoom_Layout::
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
-	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
deleted file mode 100644
index 6d7a51575..000000000
--- a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideIceRoom_MapBorder::
-	.incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin"
-
-ShoalCave_LowTideIceRoom_MapBlockdata::
-	.incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideIceRoom_Layout::
-	.4byte 0x14
-	.4byte 0x1e
-	.4byte ShoalCave_LowTideIceRoom_MapBorder
-	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
deleted file mode 100644
index f66fc9723..000000000
--- a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideInnerRoom_MapBorder::
-	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin"
-
-ShoalCave_LowTideInnerRoom_MapBlockdata::
-	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideInnerRoom_Layout::
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_LowTideInnerRoom_MapBorder
-	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
deleted file mode 100644
index 79cc82e8c..000000000
--- a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideLowerRoom_MapBorder::
-	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin"
-
-ShoalCave_LowTideLowerRoom_MapBlockdata::
-	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideLowerRoom_Layout::
-	.4byte 0x1f
-	.4byte 0xe
-	.4byte ShoalCave_LowTideLowerRoom_MapBorder
-	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
deleted file mode 100644
index 62dbff40e..000000000
--- a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideStairsRoom_MapBorder::
-	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin"
-
-ShoalCave_LowTideStairsRoom_MapBlockdata::
-	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideStairsRoom_Layout::
-	.4byte 0x15
-	.4byte 0xf
-	.4byte ShoalCave_LowTideStairsRoom_MapBorder
-	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc
deleted file mode 100644
index f42855de8..000000000
--- a/data/layouts/SingleBattleColosseum/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SingleBattleColosseum_MapBorder::
-	.incbin "data/layouts/SingleBattleColosseum/border.bin"
-
-SingleBattleColosseum_MapBlockdata::
-	.incbin "data/layouts/SingleBattleColosseum/map.bin"
-
-	.align 2
-SingleBattleColosseum_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SingleBattleColosseum_MapBorder
-	.4byte SingleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc
deleted file mode 100644
index 235f04935..000000000
--- a/data/layouts/SkyPillar_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_1F_MapBorder::
-	.incbin "data/layouts/SkyPillar_1F/border.bin"
-
-SkyPillar_1F_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_1F/map.bin"
-
-	.align 2
-SkyPillar_1F_Layout::
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_1F_MapBorder
-	.4byte SkyPillar_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/SkyPillar_1F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084294C4/border.bin
+++ b/data/layouts/SkyPillar_1F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/SkyPillar_1F_Clean/map.bin
index f0d9c299c..f0d9c299c 100644
--- a/data/layouts/UnknownMap_08480F54/map.bin
+++ b/data/layouts/SkyPillar_1F_Clean/map.bin
diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc
deleted file mode 100644
index 368fcd518..000000000
--- a/data/layouts/SkyPillar_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_2F_MapBorder::
-	.incbin "data/layouts/SkyPillar_2F/border.bin"
-
-SkyPillar_2F_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_2F/map.bin"
-
-	.align 2
-SkyPillar_2F_Layout::
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_2F_MapBorder
-	.4byte SkyPillar_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/SkyPillar_2F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084294E8/border.bin
+++ b/data/layouts/SkyPillar_2F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/SkyPillar_2F_Clean/map.bin
index 908158cf4..908158cf4 100644
--- a/data/layouts/UnknownMap_084810FC/map.bin
+++ b/data/layouts/SkyPillar_2F_Clean/map.bin
diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc
deleted file mode 100644
index 32ac95143..000000000
--- a/data/layouts/SkyPillar_3F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_3F_MapBorder::
-	.incbin "data/layouts/SkyPillar_3F/border.bin"
-
-SkyPillar_3F_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_3F/map.bin"
-
-	.align 2
-SkyPillar_3F_Layout::
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_3F_MapBorder
-	.4byte SkyPillar_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/SkyPillar_3F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08480DAC/border.bin
+++ b/data/layouts/SkyPillar_3F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/SkyPillar_3F_Clean/map.bin
index d033bc4d2..d033bc4d2 100644
--- a/data/layouts/UnknownMap_084812A4/map.bin
+++ b/data/layouts/SkyPillar_3F_Clean/map.bin
diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc
deleted file mode 100644
index 055abf133..000000000
--- a/data/layouts/SkyPillar_4F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_4F_MapBorder::
-	.incbin "data/layouts/SkyPillar_4F/border.bin"
-
-SkyPillar_4F_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_4F/map.bin"
-
-	.align 2
-SkyPillar_4F_Layout::
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_4F_MapBorder
-	.4byte SkyPillar_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/SkyPillar_4F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08480F54/border.bin
+++ b/data/layouts/SkyPillar_4F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/SkyPillar_4F_Clean/map.bin
index eeccae9ae..eeccae9ae 100644
--- a/data/layouts/UnknownMap_0848144C/map.bin
+++ b/data/layouts/SkyPillar_4F_Clean/map.bin
diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc
deleted file mode 100644
index 3f3bb5bc1..000000000
--- a/data/layouts/SkyPillar_5F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_5F_MapBorder::
-	.incbin "data/layouts/SkyPillar_5F/border.bin"
-
-SkyPillar_5F_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_5F/map.bin"
-
-	.align 2
-SkyPillar_5F_Layout::
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_5F_MapBorder
-	.4byte SkyPillar_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/SkyPillar_5F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084810FC/border.bin
+++ b/data/layouts/SkyPillar_5F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/SkyPillar_5F_Clean/map.bin
index 8507a4932..8507a4932 100644
--- a/data/layouts/UnknownMap_084815F4/map.bin
+++ b/data/layouts/SkyPillar_5F_Clean/map.bin
diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc
deleted file mode 100644
index 1313bd196..000000000
--- a/data/layouts/SkyPillar_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_Entrance_MapBorder::
-	.incbin "data/layouts/SkyPillar_Entrance/border.bin"
-
-SkyPillar_Entrance_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_Entrance/map.bin"
-
-	.align 2
-SkyPillar_Entrance_Layout::
-	.4byte 0x12
-	.4byte 0x12
-	.4byte SkyPillar_Entrance_MapBorder
-	.4byte SkyPillar_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc
deleted file mode 100644
index 5eb9df563..000000000
--- a/data/layouts/SkyPillar_Outside/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_Outside_MapBorder::
-	.incbin "data/layouts/SkyPillar_Outside/border.bin"
-
-SkyPillar_Outside_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_Outside/map.bin"
-
-	.align 2
-SkyPillar_Outside_Layout::
-	.4byte 0x1c
-	.4byte 0x17
-	.4byte SkyPillar_Outside_MapBorder
-	.4byte SkyPillar_Outside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc
deleted file mode 100644
index 646c6f95f..000000000
--- a/data/layouts/SkyPillar_Top/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_Top_MapBorder::
-	.incbin "data/layouts/SkyPillar_Top/border.bin"
-
-SkyPillar_Top_MapBlockdata::
-	.incbin "data/layouts/SkyPillar_Top/map.bin"
-
-	.align 2
-SkyPillar_Top_Layout::
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SkyPillar_Top_MapBorder
-	.4byte SkyPillar_Top_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/SkyPillar_Top_Clean/border.bin
index e9d1c658c..e9d1c658c 100644
--- a/data/layouts/UnknownMap_08481B24/border.bin
+++ b/data/layouts/SkyPillar_Top_Clean/border.bin
diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/SkyPillar_Top_Clean/map.bin
index 2a47bca91..2a47bca91 100644
--- a/data/layouts/UnknownMap_08481B24/map.bin
+++ b/data/layouts/SkyPillar_Top_Clean/map.bin
diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc
deleted file mode 100644
index dfa184764..000000000
--- a/data/layouts/SlateportCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_MapBorder::
-	.incbin "data/layouts/SlateportCity/border.bin"
-
-SlateportCity_MapBlockdata::
-	.incbin "data/layouts/SlateportCity/map.bin"
-
-	.align 2
-SlateportCity_Layout::
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte SlateportCity_MapBorder
-	.4byte SlateportCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
deleted file mode 100644
index f921eb5fc..000000000
--- a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_OceanicMuseum_1F_MapBorder::
-	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin"
-
-SlateportCity_OceanicMuseum_1F_MapBlockdata::
-	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_1F_Layout::
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
deleted file mode 100644
index 7a6998987..000000000
--- a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_OceanicMuseum_2F_MapBorder::
-	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin"
-
-SlateportCity_OceanicMuseum_2F_MapBlockdata::
-	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_2F_Layout::
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
deleted file mode 100644
index 44f9a559f..000000000
--- a/data/layouts/SlateportCity_PokemonFanClub/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_PokemonFanClub_MapBorder::
-	.incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin"
-
-SlateportCity_PokemonFanClub_MapBlockdata::
-	.incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin"
-
-	.align 2
-SlateportCity_PokemonFanClub_Layout::
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SlateportCity_PokemonFanClub_MapBorder
-	.4byte SlateportCity_PokemonFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonFanClub
-
diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
deleted file mode 100644
index 00d5840c6..000000000
--- a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_SternsShipyard_1F_MapBorder::
-	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin"
-
-SlateportCity_SternsShipyard_1F_MapBlockdata::
-	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_1F_Layout::
-	.4byte 0x15
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_1F_MapBorder
-	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
deleted file mode 100644
index 01a969a3a..000000000
--- a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_SternsShipyard_2F_MapBorder::
-	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin"
-
-SlateportCity_SternsShipyard_2F_MapBlockdata::
-	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_2F_Layout::
-	.4byte 0x11
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_2F_MapBorder
-	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc
deleted file mode 100644
index 400a29cbd..000000000
--- a/data/layouts/SootopolisCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_MapBorder::
-	.incbin "data/layouts/SootopolisCity/border.bin"
-
-SootopolisCity_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity/map.bin"
-
-	.align 2
-SootopolisCity_Layout::
-	.4byte 0x3c
-	.4byte 0x3c
-	.4byte SootopolisCity_MapBorder
-	.4byte SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Sootopolis
-
diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc
deleted file mode 100644
index 4c6a6eeef..000000000
--- a/data/layouts/SootopolisCity_Gym_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_Gym_1F_MapBorder::
-	.incbin "data/layouts/SootopolisCity_Gym_1F/border.bin"
-
-SootopolisCity_Gym_1F_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_Gym_1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_1F_Layout::
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_1F_MapBorder
-	.4byte SootopolisCity_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
deleted file mode 100644
index 7eb90fb71..000000000
--- a/data/layouts/SootopolisCity_Gym_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_Gym_B1F_MapBorder::
-	.incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin"
-
-SootopolisCity_Gym_B1F_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_B1F_Layout::
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_B1F_MapBorder
-	.4byte SootopolisCity_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc
deleted file mode 100644
index 1ad9cc41c..000000000
--- a/data/layouts/SootopolisCity_House1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House1_MapBorder::
-	.incbin "data/layouts/SootopolisCity_House1/border.bin"
-
-SootopolisCity_House1_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_House1/map.bin"
-
-	.align 2
-SootopolisCity_House1_Layout::
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House1_MapBorder
-	.4byte SootopolisCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc
deleted file mode 100644
index 9007d584b..000000000
--- a/data/layouts/SootopolisCity_House2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House2_MapBorder::
-	.incbin "data/layouts/SootopolisCity_House2/border.bin"
-
-SootopolisCity_House2_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_House2/map.bin"
-
-	.align 2
-SootopolisCity_House2_Layout::
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House2_MapBorder
-	.4byte SootopolisCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc
deleted file mode 100644
index 540f4306c..000000000
--- a/data/layouts/SootopolisCity_House3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House3_MapBorder::
-	.incbin "data/layouts/SootopolisCity_House3/border.bin"
-
-SootopolisCity_House3_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_House3/map.bin"
-
-	.align 2
-SootopolisCity_House3_Layout::
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House3_MapBorder
-	.4byte SootopolisCity_House3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/UnknownMap_08469200/border.bin b/data/layouts/SootopolisCity_LegendsBattle/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/layouts/UnknownMap_08469200/border.bin
+++ b/data/layouts/SootopolisCity_LegendsBattle/border.bin
diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/SootopolisCity_LegendsBattle/map.bin
index 67085fd37..67085fd37 100644
--- a/data/layouts/UnknownMap_08469200/map.bin
+++ b/data/layouts/SootopolisCity_LegendsBattle/map.bin
diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc
deleted file mode 100644
index 152563eb6..000000000
--- a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_LotadAndSeedotHouse_MapBorder::
-	.incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin"
-
-SootopolisCity_LotadAndSeedotHouse_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin"
-
-	.align 2
-SootopolisCity_LotadAndSeedotHouse_Layout::
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapBorder
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc
deleted file mode 100644
index 0b846950e..000000000
--- a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_MysteryEventsHouse_1F_MapBorder::
-	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin"
-
-SootopolisCity_MysteryEventsHouse_1F_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin"
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_1F_Layout::
-	.4byte 0xb
-	.4byte 0x8
-	.4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder
-	.4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MysteryEventsHouse
-
diff --git a/data/layouts/UnknownMap_084693AC/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnknownMap_084693AC/border.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
index 603f55c93..603f55c93 100644
--- a/data/layouts/UnknownMap_08481DBC/map.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc
deleted file mode 100644
index 1bb92b933..000000000
--- a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_MysteryEventsHouse_B1F_MapBorder::
-	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin"
-
-SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata::
-	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_B1F_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MysteryEventsHouse
-
diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc
deleted file mode 100644
index 4a62cd3f5..000000000
--- a/data/layouts/SouthernIsland_Exterior/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SouthernIsland_Exterior_MapBorder::
-	.incbin "data/layouts/SouthernIsland_Exterior/border.bin"
-
-SouthernIsland_Exterior_MapBlockdata::
-	.incbin "data/layouts/SouthernIsland_Exterior/map.bin"
-
-	.align 2
-SouthernIsland_Exterior_Layout::
-	.4byte 0x21
-	.4byte 0x1e
-	.4byte SouthernIsland_Exterior_MapBorder
-	.4byte SouthernIsland_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc
deleted file mode 100644
index b4d9a35d2..000000000
--- a/data/layouts/SouthernIsland_Interior/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SouthernIsland_Interior_MapBorder::
-	.incbin "data/layouts/SouthernIsland_Interior/border.bin"
-
-SouthernIsland_Interior_MapBlockdata::
-	.incbin "data/layouts/SouthernIsland_Interior/map.bin"
-
-	.align 2
-SouthernIsland_Interior_Layout::
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SouthernIsland_Interior_MapBorder
-	.4byte SouthernIsland_Interior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc
deleted file mode 100644
index 0865a8e5b..000000000
--- a/data/layouts/TerraCave_End/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TerraCave_End_MapBorder::
-	.incbin "data/layouts/TerraCave_End/border.bin"
-
-TerraCave_End_MapBlockdata::
-	.incbin "data/layouts/TerraCave_End/map.bin"
-
-	.align 2
-TerraCave_End_Layout::
-	.4byte 0x1b
-	.4byte 0x1e
-	.4byte TerraCave_End_MapBorder
-	.4byte TerraCave_End_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc
deleted file mode 100644
index 19d50ef44..000000000
--- a/data/layouts/TerraCave_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TerraCave_Entrance_MapBorder::
-	.incbin "data/layouts/TerraCave_Entrance/border.bin"
-
-TerraCave_Entrance_MapBlockdata::
-	.incbin "data/layouts/TerraCave_Entrance/map.bin"
-
-	.align 2
-TerraCave_Entrance_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte TerraCave_Entrance_MapBorder
-	.4byte TerraCave_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc
deleted file mode 100644
index 5e0297e7a..000000000
--- a/data/layouts/TradeCenter/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TradeCenter_MapBorder::
-	.incbin "data/layouts/TradeCenter/border.bin"
-
-TradeCenter_MapBlockdata::
-	.incbin "data/layouts/TradeCenter/map.bin"
-
-	.align 2
-TradeCenter_Layout::
-	.4byte 0xc
-	.4byte 0x9
-	.4byte TradeCenter_MapBorder
-	.4byte TradeCenter_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc
deleted file mode 100644
index 2009cd49e..000000000
--- a/data/layouts/TrainerHill_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_1F_MapBorder::
-	.incbin "data/layouts/TrainerHill_1F/border.bin"
-
-TrainerHill_1F_MapBlockdata::
-	.incbin "data/layouts/TrainerHill_1F/map.bin"
-
-	.align 2
-TrainerHill_1F_Layout::
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_1F_MapBorder
-	.4byte TrainerHill_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc
deleted file mode 100644
index f67b54bf1..000000000
--- a/data/layouts/TrainerHill_2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_2F_MapBorder::
-	.incbin "data/layouts/TrainerHill_2F/border.bin"
-
-TrainerHill_2F_MapBlockdata::
-	.incbin "data/layouts/TrainerHill_2F/map.bin"
-
-	.align 2
-TrainerHill_2F_Layout::
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_2F_MapBorder
-	.4byte TrainerHill_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc
deleted file mode 100644
index 280517f41..000000000
--- a/data/layouts/TrainerHill_3F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_3F_MapBorder::
-	.incbin "data/layouts/TrainerHill_3F/border.bin"
-
-TrainerHill_3F_MapBlockdata::
-	.incbin "data/layouts/TrainerHill_3F/map.bin"
-
-	.align 2
-TrainerHill_3F_Layout::
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_3F_MapBorder
-	.4byte TrainerHill_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc
deleted file mode 100644
index eed0b0120..000000000
--- a/data/layouts/TrainerHill_4F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_4F_MapBorder::
-	.incbin "data/layouts/TrainerHill_4F/border.bin"
-
-TrainerHill_4F_MapBlockdata::
-	.incbin "data/layouts/TrainerHill_4F/map.bin"
-
-	.align 2
-TrainerHill_4F_Layout::
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_4F_MapBorder
-	.4byte TrainerHill_4F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc
deleted file mode 100644
index 896f43e0d..000000000
--- a/data/layouts/TrainerHill_Entrance/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_Entrance_MapBorder::
-	.incbin "data/layouts/TrainerHill_Entrance/border.bin"
-
-TrainerHill_Entrance_MapBlockdata::
-	.incbin "data/layouts/TrainerHill_Entrance/map.bin"
-
-	.align 2
-TrainerHill_Entrance_Layout::
-	.4byte 0x13
-	.4byte 0x11
-	.4byte TrainerHill_Entrance_MapBorder
-	.4byte TrainerHill_Entrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc
deleted file mode 100644
index 9477dceda..000000000
--- a/data/layouts/TrainerHill_Roof/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_Roof_MapBorder::
-	.incbin "data/layouts/TrainerHill_Roof/border.bin"
-
-TrainerHill_Roof_MapBlockdata::
-	.incbin "data/layouts/TrainerHill_Roof/map.bin"
-
-	.align 2
-TrainerHill_Roof_Layout::
-	.4byte 0x19
-	.4byte 0x10
-	.4byte TrainerHill_Roof_MapBorder
-	.4byte TrainerHill_Roof_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc
deleted file mode 100644
index 8e027bbd2..000000000
--- a/data/layouts/Underwater1/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater1_MapBorder::
-	.incbin "data/layouts/Underwater1/border.bin"
-
-Underwater1_MapBlockdata::
-	.incbin "data/layouts/Underwater1/map.bin"
-
-	.align 2
-Underwater1_Layout::
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater1_MapBorder
-	.4byte Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc
deleted file mode 100644
index ac6350d47..000000000
--- a/data/layouts/Underwater2/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater2_MapBorder::
-	.incbin "data/layouts/Underwater2/border.bin"
-
-Underwater2_MapBlockdata::
-	.incbin "data/layouts/Underwater2/map.bin"
-
-	.align 2
-Underwater2_Layout::
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater2_MapBorder
-	.4byte Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc
deleted file mode 100644
index c365b6b8f..000000000
--- a/data/layouts/Underwater3/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater3_MapBorder::
-	.incbin "data/layouts/Underwater3/border.bin"
-
-Underwater3_MapBlockdata::
-	.incbin "data/layouts/Underwater3/map.bin"
-
-	.align 2
-Underwater3_Layout::
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater3_MapBorder
-	.4byte Underwater3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc
deleted file mode 100644
index 9e22e4e40..000000000
--- a/data/layouts/Underwater4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater4_MapBorder::
-	.incbin "data/layouts/Underwater4/border.bin"
-
-Underwater4_MapBlockdata::
-	.incbin "data/layouts/Underwater4/map.bin"
-
-	.align 2
-Underwater4_Layout::
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Underwater4_MapBorder
-	.4byte Underwater4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc
deleted file mode 100644
index 6394eec54..000000000
--- a/data/layouts/Underwater5/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater5_MapBorder::
-	.incbin "data/layouts/Underwater5/border.bin"
-
-Underwater5_MapBlockdata::
-	.incbin "data/layouts/Underwater5/map.bin"
-
-	.align 2
-Underwater5_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Underwater5_MapBorder
-	.4byte Underwater5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc
deleted file mode 100644
index 247af44bd..000000000
--- a/data/layouts/Underwater6/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater6_MapBorder::
-	.incbin "data/layouts/Underwater6/border.bin"
-
-Underwater6_MapBlockdata::
-	.incbin "data/layouts/Underwater6/map.bin"
-
-	.align 2
-Underwater6_Layout::
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Underwater6_MapBorder
-	.4byte Underwater6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc
deleted file mode 100644
index 5c2670b11..000000000
--- a/data/layouts/Underwater7/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater7_MapBorder::
-	.incbin "data/layouts/Underwater7/border.bin"
-
-Underwater7_MapBlockdata::
-	.incbin "data/layouts/Underwater7/map.bin"
-
-	.align 2
-Underwater7_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Underwater7_MapBorder
-	.4byte Underwater7_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc
deleted file mode 100644
index 52a3a7851..000000000
--- a/data/layouts/Underwater_MarineCave/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_MarineCave_MapBorder::
-	.incbin "data/layouts/Underwater_MarineCave/border.bin"
-
-Underwater_MarineCave_MapBlockdata::
-	.incbin "data/layouts/Underwater_MarineCave/map.bin"
-
-	.align 2
-Underwater_MarineCave_Layout::
-	.4byte 0x14
-	.4byte 0xa
-	.4byte Underwater_MarineCave_MapBorder
-	.4byte Underwater_MarineCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc
deleted file mode 100644
index 1534564a4..000000000
--- a/data/layouts/Underwater_Route134/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_Route134_MapBorder::
-	.incbin "data/layouts/Underwater_Route134/border.bin"
-
-Underwater_Route134_MapBlockdata::
-	.incbin "data/layouts/Underwater_Route134/map.bin"
-
-	.align 2
-Underwater_Route134_Layout::
-	.4byte 0x12
-	.4byte 0xa
-	.4byte Underwater_Route134_MapBorder
-	.4byte Underwater_Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc
deleted file mode 100644
index 5bce06a6b..000000000
--- a/data/layouts/Underwater_SeafloorCavern/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_SeafloorCavern_MapBorder::
-	.incbin "data/layouts/Underwater_SeafloorCavern/border.bin"
-
-Underwater_SeafloorCavern_MapBlockdata::
-	.incbin "data/layouts/Underwater_SeafloorCavern/map.bin"
-
-	.align 2
-Underwater_SeafloorCavern_Layout::
-	.4byte 0xe
-	.4byte 0x9
-	.4byte Underwater_SeafloorCavern_MapBorder
-	.4byte Underwater_SeafloorCavern_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc
deleted file mode 100644
index 5baf5dde8..000000000
--- a/data/layouts/Underwater_SealedChamber/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_SealedChamber_MapBorder::
-	.incbin "data/layouts/Underwater_SealedChamber/border.bin"
-
-Underwater_SealedChamber_MapBlockdata::
-	.incbin "data/layouts/Underwater_SealedChamber/map.bin"
-
-	.align 2
-Underwater_SealedChamber_Layout::
-	.4byte 0x16
-	.4byte 0x30
-	.4byte Underwater_SealedChamber_MapBorder
-	.4byte Underwater_SealedChamber_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc
deleted file mode 100644
index 4a1b0aa02..000000000
--- a/data/layouts/Underwater_SootopolisCity/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_SootopolisCity_MapBorder::
-	.incbin "data/layouts/Underwater_SootopolisCity/border.bin"
-
-Underwater_SootopolisCity_MapBlockdata::
-	.incbin "data/layouts/Underwater_SootopolisCity/map.bin"
-
-	.align 2
-Underwater_SootopolisCity_Layout::
-	.4byte 0x14
-	.4byte 0xa
-	.4byte Underwater_SootopolisCity_MapBorder
-	.4byte Underwater_SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc
deleted file mode 100644
index 0c2a065a5..000000000
--- a/data/layouts/UnionRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnionRoom_MapBorder::
-	.incbin "data/layouts/UnionRoom/border.bin"
-
-UnionRoom_MapBlockdata::
-	.incbin "data/layouts/UnionRoom/map.bin"
-
-	.align 2
-UnionRoom_Layout::
-	.4byte 0xf
-	.4byte 0xc
-	.4byte UnionRoom_MapBorder
-	.4byte UnionRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_UnionRoom
-
diff --git a/data/layouts/UnknownMap_084812A4/border.bin b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084812A4/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_29/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_0848144C/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_30/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
diff --git a/data/layouts/UnknownMap_084815F4/border.bin b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084815F4/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_31/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
diff --git a/data/layouts/UnknownMap_25_29/border.bin b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_29/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_32/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_30/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_33/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_31/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_34/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc
deleted file mode 100644
index 41e954b4e..000000000
--- a/data/layouts/UnknownMap_08417FC4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08417FC4_MapBorder::
-	.incbin "data/layouts/UnknownMap_08417FC4/border.bin"
-
-UnknownMap_08417FC4_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08417FC4/map.bin"
-
-	.align 2
-UnknownMap_08417FC4_Layout::
-	.4byte 0x50
-	.4byte 0x28
-	.4byte UnknownMap_08417FC4_MapBorder
-	.4byte UnknownMap_08417FC4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc
deleted file mode 100644
index f1695ec66..000000000
--- a/data/layouts/UnknownMap_08428450/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08428450_MapBorder::
-	.incbin "data/layouts/UnknownMap_08428450/border.bin"
-
-UnknownMap_08428450_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08428450/map.bin"
-
-	.align 2
-UnknownMap_08428450_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_08428450_MapBorder
-	.4byte UnknownMap_08428450_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc
deleted file mode 100644
index f19bd682d..000000000
--- a/data/layouts/UnknownMap_084294C4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_084294C4_MapBorder::
-	.incbin "data/layouts/UnknownMap_084294C4/border.bin"
-
-UnknownMap_084294C4_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_084294C4/map.bin"
-
-	.align 2
-UnknownMap_084294C4_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_084294C4_MapBorder
-	.4byte UnknownMap_084294C4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc
deleted file mode 100644
index e351524e1..000000000
--- a/data/layouts/UnknownMap_084294E8/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_084294E8_MapBorder::
-	.incbin "data/layouts/UnknownMap_084294E8/border.bin"
-
-UnknownMap_084294E8_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_084294E8/map.bin"
-
-	.align 2
-UnknownMap_084294E8_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_084294E8_MapBorder
-	.4byte UnknownMap_084294E8_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc
deleted file mode 100644
index fd01ddc10..000000000
--- a/data/layouts/UnknownMap_0843E6C0/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E6C0_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E6C0/border.bin"
-
-UnknownMap_0843E6C0_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E6C0/map.bin"
-
-	.align 2
-UnknownMap_0843E6C0_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E6C0_MapBorder
-	.4byte UnknownMap_0843E6C0_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc
deleted file mode 100644
index 80ad93127..000000000
--- a/data/layouts/UnknownMap_0843E6E4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E6E4_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E6E4/border.bin"
-
-UnknownMap_0843E6E4_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E6E4/map.bin"
-
-	.align 2
-UnknownMap_0843E6E4_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E6E4_MapBorder
-	.4byte UnknownMap_0843E6E4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc
deleted file mode 100644
index 16d4e400c..000000000
--- a/data/layouts/UnknownMap_0843E708/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E708_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E708/border.bin"
-
-UnknownMap_0843E708_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E708/map.bin"
-
-	.align 2
-UnknownMap_0843E708_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E708_MapBorder
-	.4byte UnknownMap_0843E708_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc
deleted file mode 100644
index c6541b3ea..000000000
--- a/data/layouts/UnknownMap_0843E72C/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E72C_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E72C/border.bin"
-
-UnknownMap_0843E72C_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E72C/map.bin"
-
-	.align 2
-UnknownMap_0843E72C_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E72C_MapBorder
-	.4byte UnknownMap_0843E72C_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc
deleted file mode 100644
index e566a93b7..000000000
--- a/data/layouts/UnknownMap_0843E750/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E750_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E750/border.bin"
-
-UnknownMap_0843E750_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E750/map.bin"
-
-	.align 2
-UnknownMap_0843E750_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E750_MapBorder
-	.4byte UnknownMap_0843E750_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc
deleted file mode 100644
index ce1a438eb..000000000
--- a/data/layouts/UnknownMap_0843E774/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E774_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E774/border.bin"
-
-UnknownMap_0843E774_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E774/map.bin"
-
-	.align 2
-UnknownMap_0843E774_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E774_MapBorder
-	.4byte UnknownMap_0843E774_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc
deleted file mode 100644
index 179e0d881..000000000
--- a/data/layouts/UnknownMap_0843E798/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E798_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E798/border.bin"
-
-UnknownMap_0843E798_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E798/map.bin"
-
-	.align 2
-UnknownMap_0843E798_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E798_MapBorder
-	.4byte UnknownMap_0843E798_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc
deleted file mode 100644
index 907ec6266..000000000
--- a/data/layouts/UnknownMap_0843E7BC/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E7BC_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E7BC/border.bin"
-
-UnknownMap_0843E7BC_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E7BC/map.bin"
-
-	.align 2
-UnknownMap_0843E7BC_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E7BC_MapBorder
-	.4byte UnknownMap_0843E7BC_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc
deleted file mode 100644
index c56046ef1..000000000
--- a/data/layouts/UnknownMap_0843E7E0/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E7E0_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E7E0/border.bin"
-
-UnknownMap_0843E7E0_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E7E0/map.bin"
-
-	.align 2
-UnknownMap_0843E7E0_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E7E0_MapBorder
-	.4byte UnknownMap_0843E7E0_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc
deleted file mode 100644
index 49e32dbc7..000000000
--- a/data/layouts/UnknownMap_0843E804/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E804_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E804/border.bin"
-
-UnknownMap_0843E804_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E804/map.bin"
-
-	.align 2
-UnknownMap_0843E804_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E804_MapBorder
-	.4byte UnknownMap_0843E804_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc
deleted file mode 100644
index 3cbe67299..000000000
--- a/data/layouts/UnknownMap_0843E828/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E828_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E828/border.bin"
-
-UnknownMap_0843E828_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E828/map.bin"
-
-	.align 2
-UnknownMap_0843E828_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E828_MapBorder
-	.4byte UnknownMap_0843E828_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc
deleted file mode 100644
index 7449536bf..000000000
--- a/data/layouts/UnknownMap_0843E84C/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E84C_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E84C/border.bin"
-
-UnknownMap_0843E84C_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E84C/map.bin"
-
-	.align 2
-UnknownMap_0843E84C_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E84C_MapBorder
-	.4byte UnknownMap_0843E84C_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc
deleted file mode 100644
index 23880a79c..000000000
--- a/data/layouts/UnknownMap_0843E870/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E870_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E870/border.bin"
-
-UnknownMap_0843E870_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E870/map.bin"
-
-	.align 2
-UnknownMap_0843E870_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E870_MapBorder
-	.4byte UnknownMap_0843E870_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc
deleted file mode 100755
index e42bfcdd9..000000000
--- a/data/layouts/UnknownMap_0843E894/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0843E894_MapBorder::
-	.incbin "data/layouts/UnknownMap_0843E894/border.bin"
-
-UnknownMap_0843E894_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0843E894/map.bin"
-
-	.align 2
-UnknownMap_0843E894_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_0843E894_MapBorder
-	.4byte UnknownMap_0843E894_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc
deleted file mode 100644
index 39d7bb18a..000000000
--- a/data/layouts/UnknownMap_08447028/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08447028_MapBorder::
-	.incbin "data/layouts/UnknownMap_08447028/border.bin"
-
-UnknownMap_08447028_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08447028/map.bin"
-
-	.align 2
-UnknownMap_08447028_Layout::
-	.4byte 0x3A
-	.4byte 0x1A
-	.4byte UnknownMap_08447028_MapBorder
-	.4byte UnknownMap_08447028_MapBlockdata
-	.4byte gTileset_General
-	.4byte 0
-
diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc
deleted file mode 100644
index a180340f8..000000000
--- a/data/layouts/UnknownMap_0845A394/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0845A394_MapBorder::
-	.incbin "data/layouts/UnknownMap_0845A394/border.bin"
-
-UnknownMap_0845A394_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0845A394/map.bin"
-
-	.align 2
-UnknownMap_0845A394_Layout::
-	.4byte 0x13
-	.4byte 0x13
-	.4byte UnknownMap_0845A394_MapBorder
-	.4byte UnknownMap_0845A394_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc
deleted file mode 100644
index ce6a4c819..000000000
--- a/data/layouts/UnknownMap_0845D470/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0845D470_MapBorder::
-	.incbin "data/layouts/UnknownMap_0845D470/border.bin"
-
-UnknownMap_0845D470_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0845D470/map.bin"
-
-	.align 2
-UnknownMap_0845D470_Layout::
-	.4byte 0x3C
-	.4byte 0x28
-	.4byte UnknownMap_0845D470_MapBorder
-	.4byte UnknownMap_0845D470_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc
deleted file mode 100644
index 535c4a6e9..000000000
--- a/data/layouts/UnknownMap_0845ECB4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0845ECB4_MapBorder::
-	.incbin "data/layouts/UnknownMap_0845ECB4/border.bin"
-
-UnknownMap_0845ECB4_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0845ECB4/map.bin"
-
-	.align 2
-UnknownMap_0845ECB4_Layout::
-	.4byte 0x1B
-	.4byte 0x2E
-	.4byte UnknownMap_0845ECB4_MapBorder
-	.4byte UnknownMap_0845ECB4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc
deleted file mode 100644
index 22191c61c..000000000
--- a/data/layouts/UnknownMap_08469200/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08469200_MapBorder::
-	.incbin "data/layouts/UnknownMap_08469200/border.bin"
-
-UnknownMap_08469200_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08469200/map.bin"
-
-	.align 2
-UnknownMap_08469200_Layout::
-	.4byte 0x3C
-	.4byte 0x3C
-	.4byte UnknownMap_08469200_MapBorder
-	.4byte UnknownMap_08469200_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Sootopolis
-
diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc
deleted file mode 100644
index 0106c666a..000000000
--- a/data/layouts/UnknownMap_084693AC/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_084693AC_MapBorder::
-	.incbin "data/layouts/UnknownMap_084693AC/border.bin"
-
-UnknownMap_084693AC_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_084693AC/map.bin"
-
-	.align 2
-UnknownMap_084693AC_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_084693AC_MapBorder
-	.4byte UnknownMap_084693AC_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc
deleted file mode 100644
index b44036239..000000000
--- a/data/layouts/UnknownMap_08480DAC/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08480DAC_MapBorder::
-	.incbin "data/layouts/UnknownMap_08480DAC/border.bin"
-
-UnknownMap_08480DAC_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08480DAC/map.bin"
-
-	.align 2
-UnknownMap_08480DAC_Layout::
-	.4byte 0xD
-	.4byte 0xD
-	.4byte UnknownMap_08480DAC_MapBorder
-	.4byte UnknownMap_08480DAC_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc
deleted file mode 100644
index 4593a8ba4..000000000
--- a/data/layouts/UnknownMap_08480F54/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08480F54_MapBorder::
-	.incbin "data/layouts/UnknownMap_08480F54/border.bin"
-
-UnknownMap_08480F54_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08480F54/map.bin"
-
-	.align 2
-UnknownMap_08480F54_Layout::
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMap_08480F54_MapBorder
-	.4byte UnknownMap_08480F54_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc
deleted file mode 100644
index 6b73bfdce..000000000
--- a/data/layouts/UnknownMap_084810FC/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_084810FC_MapBorder::
-	.incbin "data/layouts/UnknownMap_084810FC/border.bin"
-
-UnknownMap_084810FC_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_084810FC/map.bin"
-
-	.align 2
-UnknownMap_084810FC_Layout::
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMap_084810FC_MapBorder
-	.4byte UnknownMap_084810FC_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc
deleted file mode 100644
index a394c8ef3..000000000
--- a/data/layouts/UnknownMap_084812A4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_084812A4_MapBorder::
-	.incbin "data/layouts/UnknownMap_084812A4/border.bin"
-
-UnknownMap_084812A4_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_084812A4/map.bin"
-
-	.align 2
-UnknownMap_084812A4_Layout::
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMap_084812A4_MapBorder
-	.4byte UnknownMap_084812A4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc
deleted file mode 100644
index cabe0b25b..000000000
--- a/data/layouts/UnknownMap_0848144C/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_0848144C_MapBorder::
-	.incbin "data/layouts/UnknownMap_0848144C/border.bin"
-
-UnknownMap_0848144C_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_0848144C/map.bin"
-
-	.align 2
-UnknownMap_0848144C_Layout::
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMap_0848144C_MapBorder
-	.4byte UnknownMap_0848144C_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc
deleted file mode 100644
index 73ed49c79..000000000
--- a/data/layouts/UnknownMap_084815F4/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_084815F4_MapBorder::
-	.incbin "data/layouts/UnknownMap_084815F4/border.bin"
-
-UnknownMap_084815F4_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_084815F4/map.bin"
-
-	.align 2
-UnknownMap_084815F4_Layout::
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMap_084815F4_MapBorder
-	.4byte UnknownMap_084815F4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc
deleted file mode 100644
index 250528be0..000000000
--- a/data/layouts/UnknownMap_08481B24/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08481B24_MapBorder::
-	.incbin "data/layouts/UnknownMap_08481B24/border.bin"
-
-UnknownMap_08481B24_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08481B24/map.bin"
-
-	.align 2
-UnknownMap_08481B24_Layout::
-	.4byte 0x1B
-	.4byte 0x18
-	.4byte UnknownMap_08481B24_MapBorder
-	.4byte UnknownMap_08481B24_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc
deleted file mode 100644
index 465b92dc8..000000000
--- a/data/layouts/UnknownMap_08481DBC/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08481DBC_MapBorder::
-	.incbin "data/layouts/UnknownMap_08481DBC/border.bin"
-
-UnknownMap_08481DBC_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08481DBC/map.bin"
-
-	.align 2
-UnknownMap_08481DBC_Layout::
-	.4byte 0xB
-	.4byte 0x8
-	.4byte UnknownMap_08481DBC_MapBorder
-	.4byte UnknownMap_08481DBC_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MysteryEventsHouse
-
diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc
deleted file mode 100644
index bb7002a20..000000000
--- a/data/layouts/UnknownMap_25_29/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_29_MapBorder::
-	.incbin "data/layouts/UnknownMap_25_29/border.bin"
-
-UnknownMap_25_29_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_25_29/map.bin"
-
-	.align 2
-UnknownMap_25_29_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_29_MapBorder
-	.4byte UnknownMap_25_29_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc
deleted file mode 100644
index 5937a2195..000000000
--- a/data/layouts/UnknownMap_25_30/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_30_MapBorder::
-	.incbin "data/layouts/UnknownMap_25_30/border.bin"
-
-UnknownMap_25_30_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_25_30/map.bin"
-
-	.align 2
-UnknownMap_25_30_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_30_MapBorder
-	.4byte UnknownMap_25_30_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc
deleted file mode 100644
index 3dcbc7986..000000000
--- a/data/layouts/UnknownMap_25_31/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_31_MapBorder::
-	.incbin "data/layouts/UnknownMap_25_31/border.bin"
-
-UnknownMap_25_31_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_25_31/map.bin"
-
-	.align 2
-UnknownMap_25_31_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_31_MapBorder
-	.4byte UnknownMap_25_31_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc
deleted file mode 100644
index 0ffe4c0b7..000000000
--- a/data/layouts/UnknownMap_25_32/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_32_MapBorder::
-	.incbin "data/layouts/UnknownMap_25_32/border.bin"
-
-UnknownMap_25_32_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_25_32/map.bin"
-
-	.align 2
-UnknownMap_25_32_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_32_MapBorder
-	.4byte UnknownMap_25_32_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc
deleted file mode 100644
index 3f8113a6f..000000000
--- a/data/layouts/UnknownMap_25_33/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_33_MapBorder::
-	.incbin "data/layouts/UnknownMap_25_33/border.bin"
-
-UnknownMap_25_33_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_25_33/map.bin"
-
-	.align 2
-UnknownMap_25_33_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_33_MapBorder
-	.4byte UnknownMap_25_33_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc
deleted file mode 100644
index 6001d8fe7..000000000
--- a/data/layouts/UnknownMap_25_34/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_34_MapBorder::
-	.incbin "data/layouts/UnknownMap_25_34/border.bin"
-
-UnknownMap_25_34_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_25_34/map.bin"
-
-	.align 2
-UnknownMap_25_34_Layout::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_34_MapBorder
-	.4byte UnknownMap_25_34_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/Unknown_08428450/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_32/border.bin
+++ b/data/layouts/Unknown_08428450/border.bin
diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/Unknown_08428450/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/UnknownMap_08428450/map.bin
+++ b/data/layouts/Unknown_08428450/map.bin
diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/Unknown_084294C4/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_33/border.bin
+++ b/data/layouts/Unknown_084294C4/border.bin
diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/Unknown_084294C4/map.bin
index 37f05b971..37f05b971 100644
--- a/data/layouts/UnknownMap_084294C4/map.bin
+++ b/data/layouts/Unknown_084294C4/map.bin
diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/Unknown_084294E8/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_34/border.bin
+++ b/data/layouts/Unknown_084294E8/border.bin
diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/Unknown_084294E8/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/UnknownMap_084294E8/map.bin
+++ b/data/layouts/Unknown_084294E8/map.bin
diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/Unknown_0843E6C0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E6C0/border.bin
+++ b/data/layouts/Unknown_0843E6C0/border.bin
diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/Unknown_0843E6C0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E6C0/map.bin
+++ b/data/layouts/Unknown_0843E6C0/map.bin
diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/Unknown_0843E6E4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E6E4/border.bin
+++ b/data/layouts/Unknown_0843E6E4/border.bin
diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/Unknown_0843E6E4/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E6E4/map.bin
+++ b/data/layouts/Unknown_0843E6E4/map.bin
diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/Unknown_0843E708/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E708/border.bin
+++ b/data/layouts/Unknown_0843E708/border.bin
diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/Unknown_0843E708/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E708/map.bin
+++ b/data/layouts/Unknown_0843E708/map.bin
diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/Unknown_0843E72C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E72C/border.bin
+++ b/data/layouts/Unknown_0843E72C/border.bin
diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/Unknown_0843E72C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E72C/map.bin
+++ b/data/layouts/Unknown_0843E72C/map.bin
diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/Unknown_0843E750/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E750/border.bin
+++ b/data/layouts/Unknown_0843E750/border.bin
diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/Unknown_0843E750/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E750/map.bin
+++ b/data/layouts/Unknown_0843E750/map.bin
diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/Unknown_0843E774/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E774/border.bin
+++ b/data/layouts/Unknown_0843E774/border.bin
diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/Unknown_0843E774/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E774/map.bin
+++ b/data/layouts/Unknown_0843E774/map.bin
diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/Unknown_0843E798/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E798/border.bin
+++ b/data/layouts/Unknown_0843E798/border.bin
diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/Unknown_0843E798/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E798/map.bin
+++ b/data/layouts/Unknown_0843E798/map.bin
diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/Unknown_0843E7BC/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E7BC/border.bin
+++ b/data/layouts/Unknown_0843E7BC/border.bin
diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/Unknown_0843E7BC/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E7BC/map.bin
+++ b/data/layouts/Unknown_0843E7BC/map.bin
diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/Unknown_0843E7E0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E7E0/border.bin
+++ b/data/layouts/Unknown_0843E7E0/border.bin
diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/Unknown_0843E7E0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E7E0/map.bin
+++ b/data/layouts/Unknown_0843E7E0/map.bin
diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/Unknown_0843E804/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E804/border.bin
+++ b/data/layouts/Unknown_0843E804/border.bin
diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/Unknown_0843E804/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E804/map.bin
+++ b/data/layouts/Unknown_0843E804/map.bin
diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/Unknown_0843E828/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E828/border.bin
+++ b/data/layouts/Unknown_0843E828/border.bin
diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/Unknown_0843E828/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E828/map.bin
+++ b/data/layouts/Unknown_0843E828/map.bin
diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/Unknown_0843E84C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E84C/border.bin
+++ b/data/layouts/Unknown_0843E84C/border.bin
diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/Unknown_0843E84C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E84C/map.bin
+++ b/data/layouts/Unknown_0843E84C/map.bin
diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/Unknown_0843E870/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E870/border.bin
+++ b/data/layouts/Unknown_0843E870/border.bin
diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/Unknown_0843E870/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E870/map.bin
+++ b/data/layouts/Unknown_0843E870/map.bin
diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/Unknown_0843E894/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E894/border.bin
+++ b/data/layouts/Unknown_0843E894/border.bin
diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/Unknown_0843E894/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E894/map.bin
+++ b/data/layouts/Unknown_0843E894/map.bin
diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/Unknown_08447028/border.bin
index 9e4b3fb7a..9e4b3fb7a 100644
--- a/data/layouts/UnknownMap_08447028/border.bin
+++ b/data/layouts/Unknown_08447028/border.bin
diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/Unknown_08447028/map.bin
index 028da0526..028da0526 100644
--- a/data/layouts/UnknownMap_08447028/map.bin
+++ b/data/layouts/Unknown_08447028/map.bin
diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/Unknown_084693AC/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnknownMap_08481DBC/border.bin
+++ b/data/layouts/Unknown_084693AC/border.bin
diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/Unknown_084693AC/map.bin
index a179d8997..a179d8997 100644
--- a/data/layouts/UnknownMap_084693AC/map.bin
+++ b/data/layouts/Unknown_084693AC/map.bin
diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc
deleted file mode 100644
index ce58c0798..000000000
--- a/data/layouts/VerdanturfTown/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_MapBorder::
-	.incbin "data/layouts/VerdanturfTown/border.bin"
-
-VerdanturfTown_MapBlockdata::
-	.incbin "data/layouts/VerdanturfTown/map.bin"
-
-	.align 2
-VerdanturfTown_Layout::
-	.4byte 0x14
-	.4byte 0x14
-	.4byte VerdanturfTown_MapBorder
-	.4byte VerdanturfTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc
deleted file mode 100644
index 21fca6953..000000000
--- a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_BattleTentBattleRoom_MapBorder::
-	.incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin"
-
-VerdanturfTown_BattleTentBattleRoom_MapBlockdata::
-	.incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin"
-
-	.align 2
-VerdanturfTown_BattleTentBattleRoom_Layout::
-	.4byte 0xd
-	.4byte 0x9
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapBorder
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleTent
-
diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
deleted file mode 100644
index ae5d1a7cf..000000000
--- a/data/layouts/VerdanturfTown_WandasHouse/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_WandasHouse_MapBorder::
-	.incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin"
-
-VerdanturfTown_WandasHouse_MapBlockdata::
-	.incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin"
-
-	.align 2
-VerdanturfTown_WandasHouse_Layout::
-	.4byte 0x11
-	.4byte 0x8
-	.4byte VerdanturfTown_WandasHouse_MapBorder
-	.4byte VerdanturfTown_WandasHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc
deleted file mode 100644
index 31e0fede3..000000000
--- a/data/layouts/VictoryRoad_1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VictoryRoad_1F_MapBorder::
-	.incbin "data/layouts/VictoryRoad_1F/border.bin"
-
-VictoryRoad_1F_MapBlockdata::
-	.incbin "data/layouts/VictoryRoad_1F/map.bin"
-
-	.align 2
-VictoryRoad_1F_Layout::
-	.4byte 0x2e
-	.4byte 0x2d
-	.4byte VictoryRoad_1F_MapBorder
-	.4byte VictoryRoad_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc
deleted file mode 100644
index 9ce7223e1..000000000
--- a/data/layouts/VictoryRoad_B1F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VictoryRoad_B1F_MapBorder::
-	.incbin "data/layouts/VictoryRoad_B1F/border.bin"
-
-VictoryRoad_B1F_MapBlockdata::
-	.incbin "data/layouts/VictoryRoad_B1F/map.bin"
-
-	.align 2
-VictoryRoad_B1F_Layout::
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B1F_MapBorder
-	.4byte VictoryRoad_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc
deleted file mode 100644
index 23c500cbe..000000000
--- a/data/layouts/VictoryRoad_B2F/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VictoryRoad_B2F_MapBorder::
-	.incbin "data/layouts/VictoryRoad_B2F/border.bin"
-
-VictoryRoad_B2F_MapBlockdata::
-	.incbin "data/layouts/VictoryRoad_B2F/map.bin"
-
-	.align 2
-VictoryRoad_B2F_Layout::
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B2F_MapBorder
-	.4byte VictoryRoad_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
new file mode 100644
index 000000000..353b9a284
--- /dev/null
+++ b/data/layouts/layouts.json
@@ -0,0 +1,4415 @@
+{
+  "layouts_table_label": "gMapLayouts",
+  "layouts": [
+    {
+      "id": "LAYOUT_PETALBURG_CITY",
+      "name": "PetalburgCity_Layout",
+      "width": 30,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/PetalburgCity/border.bin",
+      "blockdata_filepath": "data/layouts/PetalburgCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_SLATEPORT_CITY",
+      "name": "SlateportCity_Layout",
+      "width": 40,
+      "height": 60,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Slateport",
+      "border_filepath": "data/layouts/SlateportCity/border.bin",
+      "blockdata_filepath": "data/layouts/SlateportCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAUVILLE_CITY",
+      "name": "MauvilleCity_Layout",
+      "width": 40,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/MauvilleCity/border.bin",
+      "blockdata_filepath": "data/layouts/MauvilleCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY",
+      "name": "RustboroCity_Layout",
+      "width": 40,
+      "height": 60,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/RustboroCity/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_FORTREE_CITY",
+      "name": "FortreeCity_Layout",
+      "width": 40,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/FortreeCity/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY",
+      "name": "LilycoveCity_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/LilycoveCity/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_MOSSDEEP_CITY",
+      "name": "MossdeepCity_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mossdeep",
+      "border_filepath": "data/layouts/MossdeepCity/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY",
+      "name": "SootopolisCity_Layout",
+      "width": 60,
+      "height": 60,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Sootopolis",
+      "border_filepath": "data/layouts/SootopolisCity/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY",
+      "name": "EverGrandeCity_Layout",
+      "width": 40,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_EverGrande",
+      "border_filepath": "data/layouts/EverGrandeCity/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_LITTLEROOT_TOWN",
+      "name": "LittlerootTown_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/LittlerootTown/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_OLDALE_TOWN",
+      "name": "OldaleTown_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/OldaleTown/border.bin",
+      "blockdata_filepath": "data/layouts/OldaleTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_DEWFORD_TOWN",
+      "name": "DewfordTown_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Dewford",
+      "border_filepath": "data/layouts/DewfordTown/border.bin",
+      "blockdata_filepath": "data/layouts/DewfordTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_LAVARIDGE_TOWN",
+      "name": "LavaridgeTown_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/LavaridgeTown/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_FALLARBOR_TOWN",
+      "name": "FallarborTown_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fallarbor",
+      "border_filepath": "data/layouts/FallarborTown/border.bin",
+      "blockdata_filepath": "data/layouts/FallarborTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_VERDANTURF_TOWN",
+      "name": "VerdanturfTown_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/VerdanturfTown/border.bin",
+      "blockdata_filepath": "data/layouts/VerdanturfTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_PACIFIDLOG_TOWN",
+      "name": "PacifidlogTown_Layout",
+      "width": 20,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/PacifidlogTown/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE101",
+      "name": "Route101_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/Route101/border.bin",
+      "blockdata_filepath": "data/layouts/Route101/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE102",
+      "name": "Route102_Layout",
+      "width": 50,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/Route102/border.bin",
+      "blockdata_filepath": "data/layouts/Route102/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE103",
+      "name": "Route103_Layout",
+      "width": 80,
+      "height": 22,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/Route103/border.bin",
+      "blockdata_filepath": "data/layouts/Route103/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE104",
+      "name": "Route104_Layout",
+      "width": 40,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/Route104/border.bin",
+      "blockdata_filepath": "data/layouts/Route104/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE105",
+      "name": "Route105_Layout",
+      "width": 40,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Dewford",
+      "border_filepath": "data/layouts/Route105/border.bin",
+      "blockdata_filepath": "data/layouts/Route105/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE106",
+      "name": "Route106_Layout",
+      "width": 80,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Dewford",
+      "border_filepath": "data/layouts/Route106/border.bin",
+      "blockdata_filepath": "data/layouts/Route106/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE107",
+      "name": "Route107_Layout",
+      "width": 60,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Dewford",
+      "border_filepath": "data/layouts/Route107/border.bin",
+      "blockdata_filepath": "data/layouts/Route107/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE108",
+      "name": "Route108_Layout",
+      "width": 60,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Slateport",
+      "border_filepath": "data/layouts/Route108/border.bin",
+      "blockdata_filepath": "data/layouts/Route108/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE109",
+      "name": "Route109_Layout",
+      "width": 40,
+      "height": 63,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Slateport",
+      "border_filepath": "data/layouts/Route109/border.bin",
+      "blockdata_filepath": "data/layouts/Route109/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110",
+      "name": "Route110_Layout",
+      "width": 40,
+      "height": 100,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/Route110/border.bin",
+      "blockdata_filepath": "data/layouts/Route110/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE111",
+      "name": "Route111_Layout",
+      "width": 40,
+      "height": 140,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/Route111/border.bin",
+      "blockdata_filepath": "data/layouts/Route111/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE112",
+      "name": "Route112_Layout",
+      "width": 40,
+      "height": 60,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/Route112/border.bin",
+      "blockdata_filepath": "data/layouts/Route112/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE113",
+      "name": "Route113_Layout",
+      "width": 100,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fallarbor",
+      "border_filepath": "data/layouts/Route113/border.bin",
+      "blockdata_filepath": "data/layouts/Route113/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE114",
+      "name": "Route114_Layout",
+      "width": 40,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fallarbor",
+      "border_filepath": "data/layouts/Route114/border.bin",
+      "blockdata_filepath": "data/layouts/Route114/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE115",
+      "name": "Route115_Layout",
+      "width": 40,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fallarbor",
+      "border_filepath": "data/layouts/Route115/border.bin",
+      "blockdata_filepath": "data/layouts/Route115/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE116",
+      "name": "Route116_Layout",
+      "width": 100,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/Route116/border.bin",
+      "blockdata_filepath": "data/layouts/Route116/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE117",
+      "name": "Route117_Layout",
+      "width": 60,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/Route117/border.bin",
+      "blockdata_filepath": "data/layouts/Route117/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE118",
+      "name": "Route118_Layout",
+      "width": 80,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/Route118/border.bin",
+      "blockdata_filepath": "data/layouts/Route118/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE119",
+      "name": "Route119_Layout",
+      "width": 40,
+      "height": 140,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/Route119/border.bin",
+      "blockdata_filepath": "data/layouts/Route119/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE120",
+      "name": "Route120_Layout",
+      "width": 40,
+      "height": 100,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/Route120/border.bin",
+      "blockdata_filepath": "data/layouts/Route120/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE121",
+      "name": "Route121_Layout",
+      "width": 80,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/Route121/border.bin",
+      "blockdata_filepath": "data/layouts/Route121/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE122",
+      "name": "Route122_Layout",
+      "width": 40,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/Route122/border.bin",
+      "blockdata_filepath": "data/layouts/Route122/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE123",
+      "name": "Route123_Layout",
+      "width": 140,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/Route123/border.bin",
+      "blockdata_filepath": "data/layouts/Route123/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE124",
+      "name": "Route124_Layout",
+      "width": 80,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mossdeep",
+      "border_filepath": "data/layouts/Route124/border.bin",
+      "blockdata_filepath": "data/layouts/Route124/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE125",
+      "name": "Route125_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mossdeep",
+      "border_filepath": "data/layouts/Route125/border.bin",
+      "blockdata_filepath": "data/layouts/Route125/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE126",
+      "name": "Route126_Layout",
+      "width": 80,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mossdeep",
+      "border_filepath": "data/layouts/Route126/border.bin",
+      "blockdata_filepath": "data/layouts/Route126/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE127",
+      "name": "Route127_Layout",
+      "width": 80,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mossdeep",
+      "border_filepath": "data/layouts/Route127/border.bin",
+      "blockdata_filepath": "data/layouts/Route127/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE128",
+      "name": "Route128_Layout",
+      "width": 120,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mossdeep",
+      "border_filepath": "data/layouts/Route128/border.bin",
+      "blockdata_filepath": "data/layouts/Route128/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE129",
+      "name": "Route129_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mossdeep",
+      "border_filepath": "data/layouts/Route129/border.bin",
+      "blockdata_filepath": "data/layouts/Route129/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE130_MIRAGE_ISLAND",
+      "name": "Route130_MirageIsland_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Route130_MirageIsland/border.bin",
+      "blockdata_filepath": "data/layouts/Route130_MirageIsland/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE131",
+      "name": "Route131_Layout",
+      "width": 60,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/Route131/border.bin",
+      "blockdata_filepath": "data/layouts/Route131/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE132",
+      "name": "Route132_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/Route132/border.bin",
+      "blockdata_filepath": "data/layouts/Route132/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE133",
+      "name": "Route133_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/Route133/border.bin",
+      "blockdata_filepath": "data/layouts/Route133/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE134",
+      "name": "Route134_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/Route134/border.bin",
+      "blockdata_filepath": "data/layouts/Route134/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER2",
+      "name": "Underwater2_Layout",
+      "width": 80,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater2/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater2/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER3",
+      "name": "Underwater3_Layout",
+      "width": 80,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater3/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater3/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER4",
+      "name": "Underwater4_Layout",
+      "width": 120,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater4/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater4/map.bin"
+    },
+    {
+      "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
+      "name": "LittlerootTown_BrendansHouse_1F_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BrendansMaysHouse",
+      "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
+      "name": "LittlerootTown_BrendansHouse_2F_Layout",
+      "width": 9,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BrendansMaysHouse",
+      "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
+      "name": "LittlerootTown_MaysHouse_1F_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BrendansMaysHouse",
+      "border_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+      "name": "LittlerootTown_MaysHouse_2F_Layout",
+      "width": 9,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BrendansMaysHouse",
+      "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
+      "name": "LittlerootTown_ProfessorBirchsLab_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
+      "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE1",
+      "name": "House1_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/House1/border.bin",
+      "blockdata_filepath": "data/layouts/House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE2",
+      "name": "House2_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/House2/border.bin",
+      "blockdata_filepath": "data/layouts/House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_CENTER_1F",
+      "name": "PokemonCenter_1F_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_POKEMON_CENTER_2F",
+      "name": "PokemonCenter_2F_Layout",
+      "width": 14,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/PokemonCenter_2F/border.bin",
+      "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MART",
+      "name": "Mart_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/Mart/border.bin",
+      "blockdata_filepath": "data/layouts/Mart/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE3",
+      "name": "House3_Layout",
+      "width": 10,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/House3/border.bin",
+      "blockdata_filepath": "data/layouts/House3/map.bin"
+    },
+    {
+      "id": "LAYOUT_DEWFORD_TOWN_GYM",
+      "name": "DewfordTown_Gym_Layout",
+      "width": 18,
+      "height": 28,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DewfordGym",
+      "border_filepath": "data/layouts/DewfordTown_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/DewfordTown_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_DEWFORD_TOWN_HALL",
+      "name": "DewfordTown_Hall_Layout",
+      "width": 17,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/DewfordTown_Hall/border.bin",
+      "blockdata_filepath": "data/layouts/DewfordTown_Hall/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE4",
+      "name": "House4_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/House4/border.bin",
+      "blockdata_filepath": "data/layouts/House4/map.bin"
+    },
+    {
+      "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP",
+      "name": "LavaridgeTown_HerbShop_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin"
+    },
+    {
+      "id": "LAYOUT_LAVARIDGE_TOWN_GYM_1F",
+      "name": "LavaridgeTown_Gym_1F_Layout",
+      "width": 17,
+      "height": 19,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_LavaridgeGym",
+      "border_filepath": "data/layouts/LavaridgeTown_Gym_1F/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F",
+      "name": "LavaridgeTown_Gym_B1F_Layout",
+      "width": 17,
+      "height": 19,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_LavaridgeGym",
+      "border_filepath": "data/layouts/LavaridgeTown_Gym_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+      "name": "LavaridgeTown_PokemonCenter_1F_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY",
+      "name": "FallarborTown_LeftoverRSContestLobby_Layout",
+      "width": 15,
+      "height": 7,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin",
+      "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL",
+      "name": "FallarborTown_LeftoverRSContestHall_Layout",
+      "width": 21,
+      "height": 18,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin",
+      "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_HOUSE2",
+      "name": "LilycoveCity_House2_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/LilycoveCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_08428450",
+      "name": "Unknown_08428450_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/Unknown_08428450/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_08428450/map.bin"
+    },
+    {
+      "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE",
+      "name": "VerdanturfTown_WandasHouse_Layout",
+      "width": 17,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/VerdanturfTown_WandasHouse/border.bin",
+      "blockdata_filepath": "data/layouts/VerdanturfTown_WandasHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
+      "name": "PacifidlogTown_House1_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
+      "name": "PacifidlogTown_House2_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_PETALBURG_CITY_GYM",
+      "name": "PetalburgCity_Gym_Layout",
+      "width": 9,
+      "height": 112,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PetalburgGym",
+      "border_filepath": "data/layouts/PetalburgCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/PetalburgCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_HOUSE_WITH_BED",
+      "name": "HouseWithBed_Layout",
+      "width": 10,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/HouseWithBed/border.bin",
+      "blockdata_filepath": "data/layouts/HouseWithBed/map.bin"
+    },
+    {
+      "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
+      "name": "SlateportCity_SternsShipyard_1F_Layout",
+      "width": 21,
+      "height": 15,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
+      "name": "SlateportCity_SternsShipyard_2F_Layout",
+      "width": 17,
+      "height": 15,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_084294C4",
+      "name": "Unknown_084294C4_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/Unknown_084294C4/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_084294E8",
+      "name": "Unknown_084294E8_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/Unknown_084294E8/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084294E8/map.bin"
+    },
+    {
+      "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB",
+      "name": "SlateportCity_PokemonFanClub_Layout",
+      "width": 14,
+      "height": 11,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonFanClub",
+      "border_filepath": "data/layouts/SlateportCity_PokemonFanClub/border.bin",
+      "blockdata_filepath": "data/layouts/SlateportCity_PokemonFanClub/map.bin"
+    },
+    {
+      "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+      "name": "SlateportCity_OceanicMuseum_1F_Layout",
+      "width": 20,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_OceanicMuseum",
+      "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
+      "name": "SlateportCity_OceanicMuseum_2F_Layout",
+      "width": 20,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_OceanicMuseum",
+      "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_HARBOR",
+      "name": "Harbor_Layout",
+      "width": 24,
+      "height": 15,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/Harbor/border.bin",
+      "blockdata_filepath": "data/layouts/Harbor/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAUVILLE_CITY_GYM",
+      "name": "MauvilleCity_Gym_Layout",
+      "width": 10,
+      "height": 21,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MauvilleGym",
+      "border_filepath": "data/layouts/MauvilleCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/MauvilleCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP",
+      "name": "MauvilleCity_BikeShop_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BikeShop",
+      "border_filepath": "data/layouts/MauvilleCity_BikeShop/border.bin",
+      "blockdata_filepath": "data/layouts/MauvilleCity_BikeShop/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAUVILLE_CITY_GAME_CORNER",
+      "name": "MauvilleCity_GameCorner_Layout",
+      "width": 22,
+      "height": 11,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MauvilleGameCorner",
+      "border_filepath": "data/layouts/MauvilleCity_GameCorner/border.bin",
+      "blockdata_filepath": "data/layouts/MauvilleCity_GameCorner/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F",
+      "name": "RustboroCity_DevonCorp_1F_Layout",
+      "width": 19,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/RustboroCity_DevonCorp_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F",
+      "name": "RustboroCity_DevonCorp_2F_Layout",
+      "width": 19,
+      "height": 9,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/RustboroCity_DevonCorp_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_GYM",
+      "name": "RustboroCity_Gym_Layout",
+      "width": 11,
+      "height": 20,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RustboroGym",
+      "border_filepath": "data/layouts/RustboroCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL",
+      "name": "RustboroCity_PokemonSchool_Layout",
+      "width": 12,
+      "height": 11,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonSchool",
+      "border_filepath": "data/layouts/RustboroCity_PokemonSchool/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_PokemonSchool/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_HOUSE",
+      "name": "RustboroCity_House_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_House/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_House/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_HOUSE1",
+      "name": "RustboroCity_House1_Layout",
+      "width": 13,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE",
+      "name": "RustboroCity_CuttersHouse_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_FORTREE_CITY_HOUSE1",
+      "name": "FortreeCity_House1_Layout",
+      "width": 8,
+      "height": 6,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_FORTREE_CITY_GYM",
+      "name": "FortreeCity_Gym_Layout",
+      "width": 20,
+      "height": 25,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FortreeGym",
+      "border_filepath": "data/layouts/FortreeCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_FORTREE_CITY_HOUSE2",
+      "name": "FortreeCity_House2_Layout",
+      "width": 8,
+      "height": 6,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE",
+      "name": "Route104_MrBrineysHouse_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/Route104_MrBrineysHouse/border.bin",
+      "blockdata_filepath": "data/layouts/Route104_MrBrineysHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+      "name": "LilycoveCity_LilycoveMuseum_1F_Layout",
+      "width": 21,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_LilycoveMuseum",
+      "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
+      "name": "LilycoveCity_LilycoveMuseum_2F_Layout",
+      "width": 22,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_LilycoveMuseum",
+      "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY",
+      "name": "LilycoveCity_ContestLobby_Layout",
+      "width": 31,
+      "height": 12,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LilycoveCity_ContestLobby/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_ContestLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL",
+      "name": "LilycoveCity_ContestHall_Layout",
+      "width": 51,
+      "height": 33,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LilycoveCity_ContestHall/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_ContestHall/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
+      "name": "LilycoveCity_PokemonTrainerFanClub_Layout",
+      "width": 12,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin"
+    },
+    {
+      "id": "LAYOUT_MOSSDEEP_CITY_GYM",
+      "name": "MossdeepCity_Gym_Layout",
+      "width": 26,
+      "height": 36,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MossdeepGym",
+      "border_filepath": "data/layouts/MossdeepCity_Gym/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_Gym/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F",
+      "name": "SootopolisCity_Gym_1F_Layout",
+      "width": 17,
+      "height": 26,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SootopolisGym",
+      "border_filepath": "data/layouts/SootopolisCity_Gym_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_Gym_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F",
+      "name": "SootopolisCity_Gym_B1F_Layout",
+      "width": 17,
+      "height": 26,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SootopolisGym",
+      "border_filepath": "data/layouts/SootopolisCity_Gym_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_Gym_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+      "name": "EverGrandeCity_SidneysRoom_Layout",
+      "width": 13,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_EliteFour",
+      "border_filepath": "data/layouts/EverGrandeCity_SidneysRoom/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_SidneysRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM",
+      "name": "EverGrandeCity_PhoebesRoom_Layout",
+      "width": 13,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_EliteFour",
+      "border_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM",
+      "name": "EverGrandeCity_GlaciasRoom_Layout",
+      "width": 13,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_EliteFour",
+      "border_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM",
+      "name": "EverGrandeCity_DrakesRoom_Layout",
+      "width": 13,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_EliteFour",
+      "border_filepath": "data/layouts/EverGrandeCity_DrakesRoom/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_DrakesRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
+      "name": "EverGrandeCity_ChampionsRoom_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_EliteFour",
+      "border_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
+      "name": "EverGrandeCity_ShortHall_Layout",
+      "width": 11,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_EliteFour",
+      "border_filepath": "data/layouts/EverGrandeCity_ShortHall/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_ShortHall/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
+      "name": "Route104_PrettyPetalFlowerShop_Layout",
+      "width": 15,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PrettyPetalFlowerShop",
+      "border_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/border.bin",
+      "blockdata_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/map.bin"
+    },
+    {
+      "id": "LAYOUT_CABLE_CAR_STATION",
+      "name": "CableCarStation_Layout",
+      "width": 13,
+      "height": 12,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/CableCarStation/border.bin",
+      "blockdata_filepath": "data/layouts/CableCarStation/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE",
+      "name": "Route114_FossilManiacsHouse_Layout",
+      "width": 10,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/Route114_FossilManiacsHouse/border.bin",
+      "blockdata_filepath": "data/layouts/Route114_FossilManiacsHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL",
+      "name": "Route114_FossilManiacsTunnel_Layout",
+      "width": 13,
+      "height": 26,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fallarbor",
+      "border_filepath": "data/layouts/Route114_FossilManiacsTunnel/border.bin",
+      "blockdata_filepath": "data/layouts/Route114_FossilManiacsTunnel/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE114_LANETTES_HOUSE",
+      "name": "Route114_LanettesHouse_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
+      "border_filepath": "data/layouts/Route114_LanettesHouse/border.bin",
+      "blockdata_filepath": "data/layouts/Route114_LanettesHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE",
+      "name": "Route116_TunnelersRestHouse_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/Route116_TunnelersRestHouse/border.bin",
+      "blockdata_filepath": "data/layouts/Route116_TunnelersRestHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE117_POKEMON_DAY_CARE",
+      "name": "Route117_PokemonDayCare_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonDayCare",
+      "border_filepath": "data/layouts/Route117_PokemonDayCare/border.bin",
+      "blockdata_filepath": "data/layouts/Route117_PokemonDayCare/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE",
+      "name": "Route121_SafariZoneEntrance_Layout",
+      "width": 18,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/Route121_SafariZoneEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/Route121_SafariZoneEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_METEOR_FALLS_1F_1R",
+      "name": "MeteorFalls_1F_1R_Layout",
+      "width": 30,
+      "height": 42,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MeteorFalls",
+      "border_filepath": "data/layouts/MeteorFalls_1F_1R/border.bin",
+      "blockdata_filepath": "data/layouts/MeteorFalls_1F_1R/map.bin"
+    },
+    {
+      "id": "LAYOUT_METEOR_FALLS_1F_2R",
+      "name": "MeteorFalls_1F_2R_Layout",
+      "width": 30,
+      "height": 32,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MeteorFalls",
+      "border_filepath": "data/layouts/MeteorFalls_1F_2R/border.bin",
+      "blockdata_filepath": "data/layouts/MeteorFalls_1F_2R/map.bin"
+    },
+    {
+      "id": "LAYOUT_METEOR_FALLS_B1F_1R",
+      "name": "MeteorFalls_B1F_1R_Layout",
+      "width": 29,
+      "height": 38,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MeteorFalls",
+      "border_filepath": "data/layouts/MeteorFalls_B1F_1R/border.bin",
+      "blockdata_filepath": "data/layouts/MeteorFalls_B1F_1R/map.bin"
+    },
+    {
+      "id": "LAYOUT_METEOR_FALLS_B1F_2R",
+      "name": "MeteorFalls_B1F_2R_Layout",
+      "width": 11,
+      "height": 18,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MeteorFalls",
+      "border_filepath": "data/layouts/MeteorFalls_B1F_2R/border.bin",
+      "blockdata_filepath": "data/layouts/MeteorFalls_B1F_2R/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTURF_TUNNEL",
+      "name": "RusturfTunnel_Layout",
+      "width": 36,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RusturfTunnel",
+      "border_filepath": "data/layouts/RusturfTunnel/border.bin",
+      "blockdata_filepath": "data/layouts/RusturfTunnel/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY",
+      "name": "Underwater_SootopolisCity_Layout",
+      "width": 20,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater_SootopolisCity/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater_SootopolisCity/map.bin"
+    },
+    {
+      "id": "LAYOUT_DESERT_RUINS",
+      "name": "DesertRuins_Layout",
+      "width": 17,
+      "height": 33,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/DesertRuins/border.bin",
+      "blockdata_filepath": "data/layouts/DesertRuins/map.bin"
+    },
+    {
+      "id": "LAYOUT_GRANITE_CAVE_1F",
+      "name": "GraniteCave_1F_Layout",
+      "width": 42,
+      "height": 15,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/GraniteCave_1F/border.bin",
+      "blockdata_filepath": "data/layouts/GraniteCave_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_GRANITE_CAVE_B1F",
+      "name": "GraniteCave_B1F_Layout",
+      "width": 32,
+      "height": 26,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/GraniteCave_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/GraniteCave_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_GRANITE_CAVE_B2F",
+      "name": "GraniteCave_B2F_Layout",
+      "width": 32,
+      "height": 26,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/GraniteCave_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/GraniteCave_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_PETALBURG_WOODS",
+      "name": "PetalburgWoods_Layout",
+      "width": 48,
+      "height": 44,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/PetalburgWoods/border.bin",
+      "blockdata_filepath": "data/layouts/PetalburgWoods/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_CHIMNEY",
+      "name": "MtChimney_Layout",
+      "width": 40,
+      "height": 47,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MtChimney/border.bin",
+      "blockdata_filepath": "data/layouts/MtChimney/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_1F",
+      "name": "MtPyre_1F_Layout",
+      "width": 22,
+      "height": 19,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_2F",
+      "name": "MtPyre_2F_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_2F/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_3F",
+      "name": "MtPyre_3F_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_3F/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_4F",
+      "name": "MtPyre_4F_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_4F/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_5F",
+      "name": "MtPyre_5F_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_5F/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_6F",
+      "name": "MtPyre_6F_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_6F/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_6F/map.bin"
+    },
+    {
+      "id": "LAYOUT_AQUA_HIDEOUT_1F",
+      "name": "AquaHideout_1F_Layout",
+      "width": 28,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AquaHideout_1F/border.bin",
+      "blockdata_filepath": "data/layouts/AquaHideout_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_AQUA_HIDEOUT_B1F",
+      "name": "AquaHideout_B1F_Layout",
+      "width": 51,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AquaHideout_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/AquaHideout_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_AQUA_HIDEOUT_B2F",
+      "name": "AquaHideout_B2F_Layout",
+      "width": 34,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AquaHideout_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/AquaHideout_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN",
+      "name": "Underwater_SeafloorCavern_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater_SeafloorCavern/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater_SeafloorCavern/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE",
+      "name": "SeafloorCavern_Entrance_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM1",
+      "name": "SeafloorCavern_Room1_Layout",
+      "width": 20,
+      "height": 21,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room1/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM2",
+      "name": "SeafloorCavern_Room2_Layout",
+      "width": 18,
+      "height": 12,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room2/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM3",
+      "name": "SeafloorCavern_Room3_Layout",
+      "width": 16,
+      "height": 17,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room3/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room3/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM4",
+      "name": "SeafloorCavern_Room4_Layout",
+      "width": 18,
+      "height": 19,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room4/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room4/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM5",
+      "name": "SeafloorCavern_Room5_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room5/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room5/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM6",
+      "name": "SeafloorCavern_Room6_Layout",
+      "width": 24,
+      "height": 23,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SeafloorCavern_Room6/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room6/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM7",
+      "name": "SeafloorCavern_Room7_Layout",
+      "width": 23,
+      "height": 25,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SeafloorCavern_Room7/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room7/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM8",
+      "name": "SeafloorCavern_Room8_Layout",
+      "width": 11,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room8/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room8/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9",
+      "name": "SeafloorCavern_Room9_Layout",
+      "width": 27,
+      "height": 46,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room9/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room9/map.bin"
+    },
+    {
+      "id": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE",
+      "name": "CaveOfOrigin_Entrance_Layout",
+      "width": 19,
+      "height": 26,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/CaveOfOrigin_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_CAVE_OF_ORIGIN_1F",
+      "name": "CaveOfOrigin_1F_Layout",
+      "width": 23,
+      "height": 23,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/CaveOfOrigin_1F/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
+      "name": "CaveOfOrigin_UnusedRubySapphireMap1_Layout",
+      "width": 23,
+      "height": 23,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin"
+    },
+    {
+      "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
+      "name": "CaveOfOrigin_UnusedRubySapphireMap2_Layout",
+      "width": 21,
+      "height": 21,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin"
+    },
+    {
+      "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
+      "name": "CaveOfOrigin_UnusedRubySapphireMap3_Layout",
+      "width": 19,
+      "height": 21,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin"
+    },
+    {
+      "id": "LAYOUT_CAVE_OF_ORIGIN_B1F",
+      "name": "CaveOfOrigin_B1F_Layout",
+      "width": 19,
+      "height": 19,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/CaveOfOrigin_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_VICTORY_ROAD_1F",
+      "name": "VictoryRoad_1F_Layout",
+      "width": 46,
+      "height": 45,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/VictoryRoad_1F/border.bin",
+      "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+      "name": "ShoalCave_LowTideEntranceRoom_Layout",
+      "width": 35,
+      "height": 35,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin",
+      "blockdata_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "name": "ShoalCave_LowTideInnerRoom_Layout",
+      "width": 46,
+      "height": 38,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/border.bin",
+      "blockdata_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+      "name": "ShoalCave_LowTideStairsRoom_Layout",
+      "width": 21,
+      "height": 15,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/border.bin",
+      "blockdata_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+      "name": "ShoalCave_LowTideLowerRoom_Layout",
+      "width": 31,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/border.bin",
+      "blockdata_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM",
+      "name": "ShoalCave_HighTideEntranceRoom_Layout",
+      "width": 35,
+      "height": 35,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin",
+      "blockdata_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM",
+      "name": "ShoalCave_HighTideInnerRoom_Layout",
+      "width": 46,
+      "height": 38,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/border.bin",
+      "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E6C0",
+      "name": "Unknown_0843E6C0_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E6C0/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E6E4",
+      "name": "Unknown_0843E6E4_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E6E4/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E708",
+      "name": "Unknown_0843E708_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E708/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E72C",
+      "name": "Unknown_0843E72C_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E72C/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E750",
+      "name": "Unknown_0843E750_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E750/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E774",
+      "name": "Unknown_0843E774_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E774/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E798",
+      "name": "Unknown_0843E798_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E798/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E7BC",
+      "name": "Unknown_0843E7BC_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E7BC/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E7E0",
+      "name": "Unknown_0843E7E0_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E7E0/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E804",
+      "name": "Unknown_0843E804_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E804/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E828",
+      "name": "Unknown_0843E828_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E828/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E84C",
+      "name": "Unknown_0843E84C_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E84C/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E870",
+      "name": "Unknown_0843E870_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E870/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_0843E894",
+      "name": "Unknown_0843E894_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Unknown_0843E894/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E894/map.bin"
+    },
+    {
+      "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE",
+      "name": "NewMauville_Entrance_Layout",
+      "width": 9,
+      "height": 9,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/NewMauville_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/NewMauville_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_NEW_MAUVILLE_INSIDE",
+      "name": "NewMauville_Inside_Layout",
+      "width": 41,
+      "height": 41,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BikeShop",
+      "border_filepath": "data/layouts/NewMauville_Inside/border.bin",
+      "blockdata_filepath": "data/layouts/NewMauville_Inside/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_DECK",
+      "name": "AbandonedShip_Deck_Layout",
+      "width": 23,
+      "height": 21,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AbandonedShip_Deck/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Deck/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F",
+      "name": "AbandonedShip_Corridors_1F_Layout",
+      "width": 18,
+      "height": 12,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Corridors_1F/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_ROOMS_1F",
+      "name": "AbandonedShip_Rooms_1F_Layout",
+      "width": 18,
+      "height": 17,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Rooms_1F/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F",
+      "name": "AbandonedShip_Corridors_B1F_Layout",
+      "width": 13,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Corridors_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F",
+      "name": "AbandonedShip_Rooms_B1F_Layout",
+      "width": 27,
+      "height": 8,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Rooms_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F",
+      "name": "AbandonedShip_Rooms2_B1F_Layout",
+      "width": 18,
+      "height": 8,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER1",
+      "name": "AbandonedShip_Underwater1_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Underwater1/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Underwater1/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_ROOM_B1F",
+      "name": "AbandonedShip_Room_B1F_Layout",
+      "width": 9,
+      "height": 8,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Room_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Room_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F",
+      "name": "AbandonedShip_Rooms2_1F_Layout",
+      "width": 9,
+      "height": 17,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Rooms2_1F/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE",
+      "name": "AbandonedShip_CaptainsOffice_Layout",
+      "width": 9,
+      "height": 7,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AbandonedShip_CaptainsOffice/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER2",
+      "name": "AbandonedShip_Underwater2_Layout",
+      "width": 21,
+      "height": 7,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_Underwater2/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_Underwater2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_RED_CAVE1",
+      "name": "SecretBase_RedCave1_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseRedCave",
+      "border_filepath": "data/layouts/SecretBase_RedCave1/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_RedCave1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BROWN_CAVE1",
+      "name": "SecretBase_BrownCave1_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBrownCave",
+      "border_filepath": "data/layouts/SecretBase_BrownCave1/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BrownCave1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BLUE_CAVE1",
+      "name": "SecretBase_BlueCave1_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBlueCave",
+      "border_filepath": "data/layouts/SecretBase_BlueCave1/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BlueCave1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE1",
+      "name": "SecretBase_YellowCave1_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseYellowCave",
+      "border_filepath": "data/layouts/SecretBase_YellowCave1/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_YellowCave1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_TREE1",
+      "name": "SecretBase_Tree1_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseTree",
+      "border_filepath": "data/layouts/SecretBase_Tree1/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Tree1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_SHRUB1",
+      "name": "SecretBase_Shrub1_Layout",
+      "width": 11,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseShrub",
+      "border_filepath": "data/layouts/SecretBase_Shrub1/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Shrub1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_RED_CAVE2",
+      "name": "SecretBase_RedCave2_Layout",
+      "width": 7,
+      "height": 16,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseRedCave",
+      "border_filepath": "data/layouts/SecretBase_RedCave2/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_RedCave2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BROWN_CAVE2",
+      "name": "SecretBase_BrownCave2_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBrownCave",
+      "border_filepath": "data/layouts/SecretBase_BrownCave2/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BrownCave2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BLUE_CAVE2",
+      "name": "SecretBase_BlueCave2_Layout",
+      "width": 15,
+      "height": 7,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBlueCave",
+      "border_filepath": "data/layouts/SecretBase_BlueCave2/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BlueCave2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE2",
+      "name": "SecretBase_YellowCave2_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseYellowCave",
+      "border_filepath": "data/layouts/SecretBase_YellowCave2/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_YellowCave2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_TREE2",
+      "name": "SecretBase_Tree2_Layout",
+      "width": 7,
+      "height": 16,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseTree",
+      "border_filepath": "data/layouts/SecretBase_Tree2/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Tree2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_SHRUB2",
+      "name": "SecretBase_Shrub2_Layout",
+      "width": 15,
+      "height": 7,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseShrub",
+      "border_filepath": "data/layouts/SecretBase_Shrub2/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Shrub2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_RED_CAVE3",
+      "name": "SecretBase_RedCave3_Layout",
+      "width": 15,
+      "height": 8,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseRedCave",
+      "border_filepath": "data/layouts/SecretBase_RedCave3/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_RedCave3/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BROWN_CAVE3",
+      "name": "SecretBase_BrownCave3_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBrownCave",
+      "border_filepath": "data/layouts/SecretBase_BrownCave3/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BrownCave3/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BLUE_CAVE3",
+      "name": "SecretBase_BlueCave3_Layout",
+      "width": 10,
+      "height": 17,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBlueCave",
+      "border_filepath": "data/layouts/SecretBase_BlueCave3/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BlueCave3/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE3",
+      "name": "SecretBase_YellowCave3_Layout",
+      "width": 12,
+      "height": 11,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseYellowCave",
+      "border_filepath": "data/layouts/SecretBase_YellowCave3/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_YellowCave3/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_TREE3",
+      "name": "SecretBase_Tree3_Layout",
+      "width": 17,
+      "height": 8,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseTree",
+      "border_filepath": "data/layouts/SecretBase_Tree3/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Tree3/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_SHRUB3",
+      "name": "SecretBase_Shrub3_Layout",
+      "width": 13,
+      "height": 11,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseShrub",
+      "border_filepath": "data/layouts/SecretBase_Shrub3/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Shrub3/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_RED_CAVE4",
+      "name": "SecretBase_RedCave4_Layout",
+      "width": 9,
+      "height": 15,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseRedCave",
+      "border_filepath": "data/layouts/SecretBase_RedCave4/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_RedCave4/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BROWN_CAVE4",
+      "name": "SecretBase_BrownCave4_Layout",
+      "width": 14,
+      "height": 12,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBrownCave",
+      "border_filepath": "data/layouts/SecretBase_BrownCave4/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BrownCave4/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_BLUE_CAVE4",
+      "name": "SecretBase_BlueCave4_Layout",
+      "width": 9,
+      "height": 17,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseBlueCave",
+      "border_filepath": "data/layouts/SecretBase_BlueCave4/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_BlueCave4/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE4",
+      "name": "SecretBase_YellowCave4_Layout",
+      "width": 13,
+      "height": 14,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseYellowCave",
+      "border_filepath": "data/layouts/SecretBase_YellowCave4/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_YellowCave4/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_TREE4",
+      "name": "SecretBase_Tree4_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseTree",
+      "border_filepath": "data/layouts/SecretBase_Tree4/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Tree4/map.bin"
+    },
+    {
+      "id": "LAYOUT_SECRET_BASE_SHRUB4",
+      "name": "SecretBase_Shrub4_Layout",
+      "width": 14,
+      "height": 11,
+      "primary_tileset": "gTileset_SecretBase",
+      "secondary_tileset": "gTileset_SecretBaseShrub",
+      "border_filepath": "data/layouts/SecretBase_Shrub4/border.bin",
+      "blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin"
+    },
+    {
+      "id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
+      "name": "SingleBattleColosseum_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/SingleBattleColosseum/border.bin",
+      "blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin"
+    },
+    {
+      "id": "LAYOUT_TRADE_CENTER",
+      "name": "TradeCenter_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/TradeCenter/border.bin",
+      "blockdata_filepath": "data/layouts/TradeCenter/map.bin"
+    },
+    {
+      "id": "LAYOUT_RECORD_CORNER",
+      "name": "RecordCorner_Layout",
+      "width": 20,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/RecordCorner/border.bin",
+      "blockdata_filepath": "data/layouts/RecordCorner/map.bin"
+    },
+    {
+      "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
+      "name": "DoubleBattleColosseum_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/DoubleBattleColosseum/border.bin",
+      "blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin"
+    },
+    {
+      "id": "LAYOUT_LINK_CONTEST_ROOM1",
+      "name": "LinkContestRoom1_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LinkContestRoom1/border.bin",
+      "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
+      "name": "UnknownLinkContestRoom_25_29_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
+      "name": "UnknownLinkContestRoom_25_30_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
+      "name": "UnknownLinkContestRoom_25_31_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
+      "name": "UnknownLinkContestRoom_25_32_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
+      "name": "UnknownLinkContestRoom_25_33_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
+      "name": "UnknownLinkContestRoom_25_34_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
+    },
+    {
+      "id": "LAYOUT_LINK_CONTEST_ROOM2",
+      "name": "LinkContestRoom2_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LinkContestRoom2/border.bin",
+      "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin"
+    },
+    {
+      "id": "LAYOUT_LINK_CONTEST_ROOM3",
+      "name": "LinkContestRoom3_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LinkContestRoom3/border.bin",
+      "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin"
+    },
+    {
+      "id": "LAYOUT_LINK_CONTEST_ROOM4",
+      "name": "LinkContestRoom4_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LinkContestRoom4/border.bin",
+      "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin"
+    },
+    {
+      "id": "LAYOUT_LINK_CONTEST_ROOM5",
+      "name": "LinkContestRoom5_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LinkContestRoom5/border.bin",
+      "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin"
+    },
+    {
+      "id": "LAYOUT_LINK_CONTEST_ROOM6",
+      "name": "LinkContestRoom6_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/LinkContestRoom6/border.bin",
+      "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin"
+    },
+    {
+      "id": "LAYOUT_INSIDE_OF_TRUCK",
+      "name": "InsideOfTruck_Layout",
+      "width": 5,
+      "height": 5,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideOfTruck",
+      "border_filepath": "data/layouts/InsideOfTruck/border.bin",
+      "blockdata_filepath": "data/layouts/InsideOfTruck/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_NORTHWEST",
+      "name": "SafariZone_Northwest_Layout",
+      "width": 40,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/SafariZone_Northwest/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_Northwest/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_NORTH",
+      "name": "SafariZone_North_Layout",
+      "width": 40,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/SafariZone_North/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_North/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_SOUTHWEST",
+      "name": "SafariZone_Southwest_Layout",
+      "width": 40,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/SafariZone_Southwest/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_Southwest/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_SOUTH",
+      "name": "SafariZone_South_Layout",
+      "width": 40,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/SafariZone_South/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_South/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_08447028",
+      "name": "Unknown_08447028_Layout",
+      "width": 58,
+      "height": 26,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "0",
+      "border_filepath": "data/layouts/Unknown_08447028/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_08447028/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE",
+      "name": "Route109_SeashoreHouse_Layout",
+      "width": 15,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SeashoreHouse",
+      "border_filepath": "data/layouts/Route109_SeashoreHouse/border.bin",
+      "blockdata_filepath": "data/layouts/Route109_SeashoreHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "name": "Route110_TrickHouseEntrance_Layout",
+      "width": 12,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/Route110_TrickHouseEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHouseEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_END",
+      "name": "Route110_TrickHouseEnd_Layout",
+      "width": 12,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/Route110_TrickHouseEnd/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHouseEnd/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR",
+      "name": "Route110_TrickHouseCorridor_Layout",
+      "width": 15,
+      "height": 24,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/Route110_TrickHouseCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHouseCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1",
+      "name": "Route110_TrickHousePuzzle1_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle1/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle1/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2",
+      "name": "Route110_TrickHousePuzzle2_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle2/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle2/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3",
+      "name": "Route110_TrickHousePuzzle3_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle3/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle3/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4",
+      "name": "Route110_TrickHousePuzzle4_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle4/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle4/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5",
+      "name": "Route110_TrickHousePuzzle5_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle5/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle5/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6",
+      "name": "Route110_TrickHousePuzzle6_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle6/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle6/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "name": "Route110_TrickHousePuzzle7_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle7/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle7/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8",
+      "name": "Route110_TrickHousePuzzle8_Layout",
+      "width": 15,
+      "height": 22,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrickHousePuzzle",
+      "border_filepath": "data/layouts/Route110_TrickHousePuzzle8/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle8/map.bin"
+    },
+    {
+      "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP",
+      "name": "FortreeCity_DecorationShop_Layout",
+      "width": 8,
+      "height": 6,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE",
+      "name": "Route110_SeasideCyclingRoadEntrance_Layout",
+      "width": 15,
+      "height": 6,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin",
+      "blockdata_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
+      "name": "LilycoveCity_DepartmentStore_1F_Layout",
+      "width": 18,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
+      "name": "LilycoveCity_DepartmentStore_2F_Layout",
+      "width": 18,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
+      "name": "LilycoveCity_DepartmentStore_3F_Layout",
+      "width": 18,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
+      "name": "LilycoveCity_DepartmentStore_4F_Layout",
+      "width": 18,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
+      "name": "LilycoveCity_DepartmentStore_5F_Layout",
+      "width": 18,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
+      "name": "LilycoveCity_DepartmentStoreRooftop_Layout",
+      "width": 18,
+      "height": 12,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE130",
+      "name": "Route130_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Route130/border.bin",
+      "blockdata_filepath": "data/layouts/Route130/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+      "name": "BattleFrontier_BattleTowerLobby_Layout",
+      "width": 25,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "name": "BattleFrontier_OutsideWest_Layout",
+      "width": 56,
+      "height": 72,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BattleFrontierOutsideWest",
+      "border_filepath": "data/layouts/BattleFrontier_OutsideWest/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_OutsideWest/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_ELEVATOR",
+      "name": "BattleElevator_Layout",
+      "width": 5,
+      "height": 7,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleElevator/border.bin",
+      "blockdata_filepath": "data/layouts/BattleElevator/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
+      "name": "BattleFrontier_BattleTowerCorridor_Layout",
+      "width": 17,
+      "height": 5,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
+      "name": "BattleFrontier_BattleTowerBattleRoom_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F",
+      "name": "RustboroCity_DevonCorp_3F_Layout",
+      "width": 19,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/RustboroCity_DevonCorp_3F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+      "name": "EverGrandeCity_PokemonLeague_1F_Layout",
+      "width": 19,
+      "height": 12,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F",
+      "name": "Route119_WeatherInstitute_1F_Layout",
+      "width": 20,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
+      "border_filepath": "data/layouts/Route119_WeatherInstitute_1F/border.bin",
+      "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F",
+      "name": "Route119_WeatherInstitute_2F_Layout",
+      "width": 20,
+      "height": 11,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
+      "border_filepath": "data/layouts/Route119_WeatherInstitute_2F/border.bin",
+      "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "name": "LilycoveCity_DepartmentStoreElevator_Layout",
+      "width": 5,
+      "height": 6,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER1",
+      "name": "Underwater1_Layout",
+      "width": 80,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater1/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater1/map.bin"
+    },
+    {
+      "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F",
+      "name": "MossdeepCity_SpaceCenter_1F_Layout",
+      "width": 16,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F",
+      "name": "MossdeepCity_SpaceCenter_2F_Layout",
+      "width": 16,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SS_TIDAL_CORRIDOR",
+      "name": "SSTidalCorridor_Layout",
+      "width": 18,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/SSTidalCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidalCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_SS_TIDAL_LOWER_DECK",
+      "name": "SSTidalLowerDeck_Layout",
+      "width": 17,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/SSTidalLowerDeck/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidalLowerDeck/map.bin"
+    },
+    {
+      "id": "LAYOUT_SS_TIDAL_ROOMS",
+      "name": "SSTidalRooms_Layout",
+      "width": 36,
+      "height": 18,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/SSTidalRooms/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidalRooms/map.bin"
+    },
+    {
+      "id": "LAYOUT_ISLAND_CAVE",
+      "name": "IslandCave_Layout",
+      "width": 17,
+      "height": 33,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/IslandCave/border.bin",
+      "blockdata_filepath": "data/layouts/IslandCave/map.bin"
+    },
+    {
+      "id": "LAYOUT_ANCIENT_TOMB",
+      "name": "AncientTomb_Layout",
+      "width": 17,
+      "height": 33,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/AncientTomb/border.bin",
+      "blockdata_filepath": "data/layouts/AncientTomb/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER_ROUTE134",
+      "name": "Underwater_Route134_Layout",
+      "width": 18,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater_Route134/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater_Route134/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER_SEALED_CHAMBER",
+      "name": "Underwater_SealedChamber_Layout",
+      "width": 22,
+      "height": 48,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater_SealedChamber/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater_SealedChamber/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM",
+      "name": "SealedChamber_OuterRoom_Layout",
+      "width": 21,
+      "height": 23,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SealedChamber_OuterRoom/border.bin",
+      "blockdata_filepath": "data/layouts/SealedChamber_OuterRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_VICTORY_ROAD_B1F",
+      "name": "VictoryRoad_B1F_Layout",
+      "width": 46,
+      "height": 31,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/VictoryRoad_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/VictoryRoad_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_VICTORY_ROAD_B2F",
+      "name": "VictoryRoad_B2F_Layout",
+      "width": 46,
+      "height": 31,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/VictoryRoad_B2F/border.bin",
+      "blockdata_filepath": "data/layouts/VictoryRoad_B2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE104_PROTOTYPE",
+      "name": "Route104_Prototype_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/Route104_Prototype/border.bin",
+      "blockdata_filepath": "data/layouts/Route104_Prototype/map.bin"
+    },
+    {
+      "id": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM",
+      "name": "GraniteCave_StevensRoom_Layout",
+      "width": 15,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/GraniteCave_StevensRoom/border.bin",
+      "blockdata_filepath": "data/layouts/GraniteCave_StevensRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "name": "AbandonedShip_HiddenFloorCorridors_Layout",
+      "width": 13,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR",
+      "name": "SouthernIsland_Exterior_Layout",
+      "width": 33,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/SouthernIsland_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/SouthernIsland_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOUTHERN_ISLAND_INTERIOR",
+      "name": "SouthernIsland_Interior_Layout",
+      "width": 27,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/SouthernIsland_Interior/border.bin",
+      "blockdata_filepath": "data/layouts/SouthernIsland_Interior/map.bin"
+    },
+    {
+      "id": "LAYOUT_JAGGED_PASS",
+      "name": "JaggedPass_Layout",
+      "width": 30,
+      "height": 46,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/JaggedPass/border.bin",
+      "blockdata_filepath": "data/layouts/JaggedPass/map.bin"
+    },
+    {
+      "id": "LAYOUT_FIERY_PATH",
+      "name": "FieryPath_Layout",
+      "width": 35,
+      "height": 38,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/FieryPath/border.bin",
+      "blockdata_filepath": "data/layouts/FieryPath/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F",
+      "name": "RustboroCity_Flat2_1F_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F",
+      "name": "RustboroCity_Flat2_2F_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F",
+      "name": "RustboroCity_Flat2_3F_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
+      "name": "SootopolisCity_LotadAndSeedotHouse_Layout",
+      "width": 8,
+      "height": 7,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME",
+      "name": "EverGrandeCity_HallOfFame_Layout",
+      "width": 15,
+      "height": 17,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
+      "name": "LilycoveCity_CoveLilyMotel_1F_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
+      "name": "LilycoveCity_CoveLilyMotel_2F_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
+      "name": "Route124_DivingTreasureHuntersHouse_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin",
+      "blockdata_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_EXTERIOR",
+      "name": "MtPyre_Exterior_Layout",
+      "width": 38,
+      "height": 51,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_MT_PYRE_SUMMIT",
+      "name": "MtPyre_Summit_Layout",
+      "width": 50,
+      "height": 37,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/MtPyre_Summit/border.bin",
+      "blockdata_filepath": "data/layouts/MtPyre_Summit/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEALED_CHAMBER_INNER_ROOM",
+      "name": "SealedChamber_InnerRoom_Layout",
+      "width": 21,
+      "height": 23,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SealedChamber_InnerRoom/border.bin",
+      "blockdata_filepath": "data/layouts/SealedChamber_InnerRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F",
+      "name": "MossdeepCity_GameCorner_1F_Layout",
+      "width": 12,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MossdeepGameCorner",
+      "border_filepath": "data/layouts/MossdeepCity_GameCorner_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F",
+      "name": "MossdeepCity_GameCorner_B1F_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
+      "name": "SootopolisCity_House1_Layout",
+      "width": 8,
+      "height": 7,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
+      "name": "SootopolisCity_House2_Layout",
+      "width": 8,
+      "height": 7,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
+      "name": "SootopolisCity_House3_Layout",
+      "width": 8,
+      "height": 7,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House3/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin"
+    },
+    {
+      "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+      "name": "AbandonedShip_HiddenFloorRooms_Layout",
+      "width": 44,
+      "height": 15,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_InsideShip",
+      "border_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin",
+      "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
+    },
+    {
+      "id": "LAYOUT_SCORCHED_SLAB",
+      "name": "ScorchedSlab_Layout",
+      "width": 15,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ScorchedSlab/border.bin",
+      "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin"
+    },
+    {
+      "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA",
+      "name": "CaveOfOrigin_Unused_B4F_Lava_Layout",
+      "width": 19,
+      "height": 19,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
+      "name": "RustboroCity_Flat1_1F_Layout",
+      "width": 14,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F",
+      "name": "RustboroCity_Flat1_2F_Layout",
+      "width": 14,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_EVER_GRANDE_CITY_HALL4",
+      "name": "EverGrandeCity_Hall4_Layout",
+      "width": 11,
+      "height": 34,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_EliteFour",
+      "border_filepath": "data/layouts/EverGrandeCity_Hall4/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_Hall4/map.bin"
+    },
+    {
+      "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1",
+      "name": "AquaHideout_UnusedRubyMap1_Layout",
+      "width": 28,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/border.bin",
+      "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/map.bin"
+    },
+    {
+      "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
+      "name": "AquaHideout_UnusedRubyMap2_Layout",
+      "width": 62,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/border.bin",
+      "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/map.bin"
+    },
+    {
+      "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3",
+      "name": "AquaHideout_UnusedRubyMap3_Layout",
+      "width": 34,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Facility",
+      "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/border.bin",
+      "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE131_SKY_PILLAR",
+      "name": "Route131_SkyPillar_Layout",
+      "width": 60,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/Route131_SkyPillar/border.bin",
+      "blockdata_filepath": "data/layouts/Route131_SkyPillar/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_ENTRANCE",
+      "name": "SkyPillar_Entrance_Layout",
+      "width": 18,
+      "height": 18,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SkyPillar_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_OUTSIDE",
+      "name": "SkyPillar_Outside_Layout",
+      "width": 28,
+      "height": 23,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_Outside/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_Outside/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_1F",
+      "name": "SkyPillar_1F_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_2F",
+      "name": "SkyPillar_2F_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_3F",
+      "name": "SkyPillar_3F_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_3F/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_4F",
+      "name": "SkyPillar_4F_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_4F/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA",
+      "name": "SeafloorCavern_Room9_Lava_Layout",
+      "width": 27,
+      "height": 46,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/SeafloorCavern_Room9_Lava/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room9_Lava/map.bin"
+    },
+    {
+      "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE",
+      "name": "MossdeepCity_StevensHouse_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_StevensHouse/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_StevensHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
+      "name": "ShoalCave_LowTideIceRoom_Layout",
+      "width": 20,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ShoalCave_LowTideIceRoom/border.bin",
+      "blockdata_filepath": "data/layouts/ShoalCave_LowTideIceRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
+      "name": "SafariZone_RestHouse_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_5F",
+      "name": "SkyPillar_5F_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_5F/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_5F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_TOP",
+      "name": "SkyPillar_Top_Layout",
+      "width": 27,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_Top/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_Top/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
+      "name": "BattleFrontier_BattleDomeLobby_Layout",
+      "width": 23,
+      "height": 17,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleDome",
+      "border_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
+      "name": "BattleFrontier_BattleDomeCorridor_Layout",
+      "width": 48,
+      "height": 7,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleDome",
+      "border_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM",
+      "name": "BattleFrontier_BattleDomePreBattleRoom_Layout",
+      "width": 9,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleDome",
+      "border_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM",
+      "name": "BattleFrontier_BattleDomeBattleRoom_Layout",
+      "width": 20,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleDome",
+      "border_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_1F",
+      "name": "MagmaHideout_1F_Layout",
+      "width": 37,
+      "height": 38,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_2F_1R",
+      "name": "MagmaHideout_2F_1R_Layout",
+      "width": 33,
+      "height": 39,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_2F_1R/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_2F_1R/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_2F_2R",
+      "name": "MagmaHideout_2F_2R_Layout",
+      "width": 49,
+      "height": 28,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_2F_2R/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_2F_2R/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_3F_1R",
+      "name": "MagmaHideout_3F_1R_Layout",
+      "width": 28,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_3F_1R/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_3F_1R/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_3F_2R",
+      "name": "MagmaHideout_3F_2R_Layout",
+      "width": 24,
+      "height": 17,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_3F_2R/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_3F_2R/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_4F",
+      "name": "MagmaHideout_4F_Layout",
+      "width": 59,
+      "height": 28,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_4F/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+      "name": "BattleFrontier_BattlePalaceLobby_Layout",
+      "width": 25,
+      "height": 12,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePalace",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+      "name": "BattleFrontier_BattlePalaceCorridor_Layout",
+      "width": 17,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BattlePalace",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
+      "name": "BattleFrontier_BattlePalaceBattleRoom_Layout",
+      "width": 15,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BattlePalace",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "name": "BattleFrontier_OutsideEast_Layout",
+      "width": 72,
+      "height": 72,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BattleFrontierOutsideEast",
+      "border_filepath": "data/layouts/BattleFrontier_OutsideEast/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_OutsideEast/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+      "name": "BattleFrontier_BattleFactoryLobby_Layout",
+      "width": 19,
+      "height": 12,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFactory",
+      "border_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM",
+      "name": "BattleFrontier_BattleFactoryPreBattleRoom_Layout",
+      "width": 17,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFactory",
+      "border_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM",
+      "name": "BattleFrontier_BattleFactoryBattleRoom_Layout",
+      "width": 13,
+      "height": 12,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFactory",
+      "border_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
+      "name": "BattleFrontier_BattlePikeLobby_Layout",
+      "width": 11,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
+      "name": "BattleFrontier_BattlePikeCorridor_Layout",
+      "width": 14,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
+      "name": "BattleFrontier_BattlePikeThreePathRoom_Layout",
+      "width": 13,
+      "height": 11,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1",
+      "name": "BattleFrontier_BattlePikeRandomRoom1_Layout",
+      "width": 9,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2",
+      "name": "BattleFrontier_BattlePikeRandomRoom2_Layout",
+      "width": 5,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
+      "name": "BattleFrontier_BattleArenaLobby_Layout",
+      "width": 16,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleArena",
+      "border_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR",
+      "name": "BattleFrontier_BattleArenaCorridor_Layout",
+      "width": 18,
+      "height": 14,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleArena",
+      "border_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM",
+      "name": "BattleFrontier_BattleArenaBattleRoom_Layout",
+      "width": 16,
+      "height": 11,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleArena",
+      "border_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE",
+      "name": "SootopolisCity_LegendsBattle_Layout",
+      "width": 60,
+      "height": 60,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Sootopolis",
+      "border_filepath": "data/layouts/SootopolisCity_LegendsBattle/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_LegendsBattle/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
+      "name": "BattleFrontier_BattlePikeRandomRoom3_Layout",
+      "width": 9,
+      "height": 20,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_084693AC",
+      "name": "Unknown_084693AC_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/Unknown_084693AC/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084693AC/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
+      "name": "BattleFrontier_BattlePyramidLobby_Layout",
+      "width": 15,
+      "height": 18,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
+      "name": "BattleFrontier_BattlePyramidEmptySquare_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
+      "name": "BattlePyramidSquare01_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare01/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare01/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE02",
+      "name": "BattlePyramidSquare02_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare02/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare02/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE03",
+      "name": "BattlePyramidSquare03_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare03/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare03/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE04",
+      "name": "BattlePyramidSquare04_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare04/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare04/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE05",
+      "name": "BattlePyramidSquare05_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare05/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare05/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE06",
+      "name": "BattlePyramidSquare06_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare06/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare06/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE07",
+      "name": "BattlePyramidSquare07_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare07/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare07/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE08",
+      "name": "BattlePyramidSquare08_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare08/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare08/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE09",
+      "name": "BattlePyramidSquare09_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare09/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare09/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE10",
+      "name": "BattlePyramidSquare10_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare10/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare10/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE11",
+      "name": "BattlePyramidSquare11_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare11/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare11/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE12",
+      "name": "BattlePyramidSquare12_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare12/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare12/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE13",
+      "name": "BattlePyramidSquare13_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare13/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare13/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE14",
+      "name": "BattlePyramidSquare14_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare14/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare14/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE15",
+      "name": "BattlePyramidSquare15_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare15/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare15/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_PYRAMID_SQUARE16",
+      "name": "BattlePyramidSquare16_Layout",
+      "width": 8,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattlePyramidSquare16/border.bin",
+      "blockdata_filepath": "data/layouts/BattlePyramidSquare16/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
+      "name": "BattleFrontier_BattlePyramidTop_Layout",
+      "width": 34,
+      "height": 23,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePyramid",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_3F_3R",
+      "name": "MagmaHideout_3F_3R_Layout",
+      "width": 33,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_3F_3R/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_3F_3R/map.bin"
+    },
+    {
+      "id": "LAYOUT_MAGMA_HIDEOUT_2F_3R",
+      "name": "MagmaHideout_2F_3R_Layout",
+      "width": 60,
+      "height": 19,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lavaridge",
+      "border_filepath": "data/layouts/MagmaHideout_2F_3R/border.bin",
+      "blockdata_filepath": "data/layouts/MagmaHideout_2F_3R/map.bin"
+    },
+    {
+      "id": "LAYOUT_MIRAGE_TOWER_1F",
+      "name": "MirageTower_1F_Layout",
+      "width": 21,
+      "height": 17,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MirageTower",
+      "border_filepath": "data/layouts/MirageTower_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MirageTower_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MIRAGE_TOWER_2F",
+      "name": "MirageTower_2F_Layout",
+      "width": 21,
+      "height": 17,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MirageTower",
+      "border_filepath": "data/layouts/MirageTower_2F/border.bin",
+      "blockdata_filepath": "data/layouts/MirageTower_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_MIRAGE_TOWER_3F",
+      "name": "MirageTower_3F_Layout",
+      "width": 21,
+      "height": 17,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MirageTower",
+      "border_filepath": "data/layouts/MirageTower_3F/border.bin",
+      "blockdata_filepath": "data/layouts/MirageTower_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_TENT_LOBBY",
+      "name": "BattleTentLobby_Layout",
+      "width": 13,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleTent",
+      "border_filepath": "data/layouts/BattleTentLobby/border.bin",
+      "blockdata_filepath": "data/layouts/BattleTentLobby/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_TENT_CORRIDOR",
+      "name": "BattleTentCorridor_Layout",
+      "width": 5,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleTent",
+      "border_filepath": "data/layouts/BattleTentCorridor/border.bin",
+      "blockdata_filepath": "data/layouts/BattleTentCorridor/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_TENT_BATTLE_ROOM",
+      "name": "BattleTentBattleRoom_Layout",
+      "width": 10,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleTent",
+      "border_filepath": "data/layouts/BattleTentBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleTentBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM",
+      "name": "VerdanturfTown_BattleTentBattleRoom_Layout",
+      "width": 13,
+      "height": 9,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BattleTent",
+      "border_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_MIRAGE_TOWER_4F",
+      "name": "MirageTower_4F_Layout",
+      "width": 13,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MirageTower",
+      "border_filepath": "data/layouts/MirageTower_4F/border.bin",
+      "blockdata_filepath": "data/layouts/MirageTower_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_DESERT_UNDERPASS",
+      "name": "DesertUnderpass_Layout",
+      "width": 139,
+      "height": 23,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/DesertUnderpass/border.bin",
+      "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
+      "name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout",
+      "width": 21,
+      "height": 15,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2",
+      "name": "BattleFrontier_BattleTowerCorridor2_Layout",
+      "width": 17,
+      "height": 5,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER",
+      "name": "Route111_NoMirageTower_Layout",
+      "width": 40,
+      "height": 140,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/Route111_NoMirageTower/border.bin",
+      "blockdata_filepath": "data/layouts/Route111_NoMirageTower/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNION_ROOM",
+      "name": "UnionRoom_Layout",
+      "width": 15,
+      "height": 12,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_UnionRoom",
+      "border_filepath": "data/layouts/UnionRoom/border.bin",
+      "blockdata_filepath": "data/layouts/UnionRoom/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_NORTHEAST",
+      "name": "SafariZone_Northeast_Layout",
+      "width": 40,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/SafariZone_Northeast/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_Northeast/map.bin"
+    },
+    {
+      "id": "LAYOUT_SAFARI_ZONE_SOUTHEAST",
+      "name": "SafariZone_Southeast_Layout",
+      "width": 40,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Lilycove",
+      "border_filepath": "data/layouts/SafariZone_Southeast/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_Southeast/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL",
+      "name": "BattleFrontier_RankingHall_Layout",
+      "width": 53,
+      "height": 15,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontierRankingHall",
+      "border_filepath": "data/layouts/BattleFrontier_RankingHall/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_RankingHall/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE1",
+      "name": "BattleFrontier_Lounge1_Layout",
+      "width": 13,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_Lounge1/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_Lounge1/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+      "name": "BattleFrontier_BattlePointExchangeServiceCorner_Layout",
+      "width": 15,
+      "height": 11,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE",
+      "name": "BattleFrontier_ReceptionGate_Layout",
+      "width": 9,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_ReceptionGate/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_ReceptionGate/map.bin"
+    },
+    {
+      "id": "LAYOUT_ARTISAN_CAVE_B1F",
+      "name": "ArtisanCave_B1F_Layout",
+      "width": 46,
+      "height": 54,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ArtisanCave_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/ArtisanCave_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_ARTISAN_CAVE_1F",
+      "name": "ArtisanCave_1F_Layout",
+      "width": 21,
+      "height": 22,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ArtisanCave_1F/border.bin",
+      "blockdata_filepath": "data/layouts/ArtisanCave_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_FARAWAY_ISLAND_ENTRANCE",
+      "name": "FarawayIsland_Entrance_Layout",
+      "width": 34,
+      "height": 46,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Rustboro",
+      "border_filepath": "data/layouts/FarawayIsland_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/FarawayIsland_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_FARAWAY_ISLAND_INTERIOR",
+      "name": "FarawayIsland_Interior_Layout",
+      "width": 29,
+      "height": 26,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/FarawayIsland_Interior/border.bin",
+      "blockdata_filepath": "data/layouts/FarawayIsland_Interior/map.bin"
+    },
+    {
+      "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
+      "name": "BirthIsland_Exterior_Layout",
+      "width": 30,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Dewford",
+      "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_ISLAND_HARBOR",
+      "name": "IslandHarbor_Layout",
+      "width": 17,
+      "height": 13,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IslandHarbor",
+      "border_filepath": "data/layouts/IslandHarbor/border.bin",
+      "blockdata_filepath": "data/layouts/IslandHarbor/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER_MARINE_CAVE",
+      "name": "Underwater_MarineCave_Layout",
+      "width": 20,
+      "height": 10,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater_MarineCave/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater_MarineCave/map.bin"
+    },
+    {
+      "id": "LAYOUT_MARINE_CAVE_ENTRANCE",
+      "name": "MarineCave_Entrance_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/MarineCave_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/MarineCave_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_TERRA_CAVE_ENTRANCE",
+      "name": "TerraCave_Entrance_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/TerraCave_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/TerraCave_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_TERRA_CAVE_END",
+      "name": "TerraCave_End_Layout",
+      "width": 27,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/TerraCave_End/border.bin",
+      "blockdata_filepath": "data/layouts/TerraCave_End/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER6",
+      "name": "Underwater6_Layout",
+      "width": 40,
+      "height": 80,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater6/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater6/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER7",
+      "name": "Underwater7_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater7/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater7/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNDERWATER5",
+      "name": "Underwater5_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Underwater",
+      "border_filepath": "data/layouts/Underwater5/border.bin",
+      "blockdata_filepath": "data/layouts/Underwater5/map.bin"
+    },
+    {
+      "id": "LAYOUT_MARINE_CAVE_END",
+      "name": "MarineCave_End_Layout",
+      "width": 27,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/MarineCave_End/border.bin",
+      "blockdata_filepath": "data/layouts/MarineCave_End/map.bin"
+    },
+    {
+      "id": "LAYOUT_TRAINER_HILL_ENTRANCE",
+      "name": "TrainerHill_Entrance_Layout",
+      "width": 19,
+      "height": 17,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerHill",
+      "border_filepath": "data/layouts/TrainerHill_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerHill_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_TRAINER_HILL_1F",
+      "name": "TrainerHill_1F_Layout",
+      "width": 16,
+      "height": 21,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerHill",
+      "border_filepath": "data/layouts/TrainerHill_1F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerHill_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_TRAINER_HILL_2F",
+      "name": "TrainerHill_2F_Layout",
+      "width": 16,
+      "height": 21,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerHill",
+      "border_filepath": "data/layouts/TrainerHill_2F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerHill_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_TRAINER_HILL_3F",
+      "name": "TrainerHill_3F_Layout",
+      "width": 16,
+      "height": 21,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerHill",
+      "border_filepath": "data/layouts/TrainerHill_3F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerHill_3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_TRAINER_HILL_4F",
+      "name": "TrainerHill_4F_Layout",
+      "width": 16,
+      "height": 21,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerHill",
+      "border_filepath": "data/layouts/TrainerHill_4F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerHill_4F/map.bin"
+    },
+    {
+      "id": "LAYOUT_TRAINER_HILL_ROOF",
+      "name": "TrainerHill_Roof_Layout",
+      "width": 25,
+      "height": 16,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerHill",
+      "border_filepath": "data/layouts/TrainerHill_Roof/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerHill_Roof/map.bin"
+    },
+    {
+      "id": "LAYOUT_ALTERING_CAVE",
+      "name": "AlteringCave_Layout",
+      "width": 32,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/AlteringCave/border.bin",
+      "blockdata_filepath": "data/layouts/AlteringCave/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_EXTERIOR",
+      "name": "NavelRock_Exterior_Layout",
+      "width": 21,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Dewford",
+      "border_filepath": "data/layouts/NavelRock_Exterior/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_ENTRANCE",
+      "name": "NavelRock_Entrance_Layout",
+      "width": 21,
+      "height": 32,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
+      "border_filepath": "data/layouts/NavelRock_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Entrance/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_TOP",
+      "name": "NavelRock_Top_Layout",
+      "width": 25,
+      "height": 28,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
+      "border_filepath": "data/layouts/NavelRock_Top/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Top/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_BOTTOM",
+      "name": "NavelRock_Bottom_Layout",
+      "width": 22,
+      "height": 22,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
+      "border_filepath": "data/layouts/NavelRock_Bottom/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Bottom/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+      "name": "NavelRock_LadderRoom1_Layout",
+      "width": 9,
+      "height": 8,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
+      "border_filepath": "data/layouts/NavelRock_LadderRoom1/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_LadderRoom1/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+      "name": "NavelRock_LadderRoom2_Layout",
+      "width": 9,
+      "height": 8,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
+      "border_filepath": "data/layouts/NavelRock_LadderRoom2/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_LadderRoom2/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_B1F",
+      "name": "NavelRock_B1F_Layout",
+      "width": 23,
+      "height": 11,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
+      "border_filepath": "data/layouts/NavelRock_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_NAVEL_ROCK_FORK",
+      "name": "NavelRock_Fork_Layout",
+      "width": 27,
+      "height": 86,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
+      "border_filepath": "data/layouts/NavelRock_Fork/border.bin",
+      "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+      "name": "BattleFrontier_Lounge2_Layout",
+      "width": 9,
+      "height": 10,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_Lounge2/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_Lounge2/map.bin"
+    },
+    {
+      "id": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE",
+      "name": "BattleFrontier_ScottsHouse_Layout",
+      "width": 6,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattleFrontier",
+      "border_filepath": "data/layouts/BattleFrontier_ScottsHouse/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_ScottsHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_METEOR_FALLS_STEVENS_CAVE",
+      "name": "MeteorFalls_StevensCave_Layout",
+      "width": 30,
+      "height": 32,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MeteorFalls",
+      "border_filepath": "data/layouts/MeteorFalls_StevensCave/border.bin",
+      "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin"
+    },
+    {
+      "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE",
+      "name": "LittlerootTown_ProfessorBirchsLabWithTable_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
+      "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_1F_CLEAN",
+      "name": "SkyPillar_1F_Clean_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_1F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_1F_Clean/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_2F_CLEAN",
+      "name": "SkyPillar_2F_Clean_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_2F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_2F_Clean/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_3F_CLEAN",
+      "name": "SkyPillar_3F_Clean_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_3F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_3F_Clean/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_4F_CLEAN",
+      "name": "SkyPillar_4F_Clean_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_4F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_4F_Clean/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_5F_CLEAN",
+      "name": "SkyPillar_5F_Clean_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_5F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_5F_Clean/map.bin"
+    },
+    {
+      "id": "LAYOUT_SKY_PILLAR_TOP_CLEAN",
+      "name": "SkyPillar_Top_Clean_Layout",
+      "width": 27,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/SkyPillar_Top_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_Top_Clean/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
+      "name": "SootopolisCity_MysteryEventsHouse_1F_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MysteryEventsHouse",
+      "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
+      "name": "SootopolisCity_MysteryEventsHouse_B1F_Layout",
+      "width": 12,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MysteryEventsHouse",
+      "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
+    },
+    {
+      "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED",
+      "name": "SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MysteryEventsHouse",
+      "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/layouts_table.inc b/data/layouts_table.inc
deleted file mode 100644
index fb1385bdb..000000000
--- a/data/layouts_table.inc
+++ /dev/null
@@ -1,443 +0,0 @@
-	.align 2
-gMapLayouts::
-	.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 UnknownMap_08417FC4_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 Mart_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 FallarborTown_LeftoverRSContestLobby_Layout
-	.4byte FallarborTown_LeftoverRSContestHall_Layout
-	.4byte LilycoveCity_House2_Layout
-	.4byte UnknownMap_08428450_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_084294C4_Layout
-	.4byte UnknownMap_084294E8_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 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_ShortHall_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_UnusedRubySapphireMap1_Layout
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout
-	.4byte CaveOfOrigin_B1F_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_0843E6C0_Layout
-	.4byte UnknownMap_0843E6E4_Layout
-	.4byte UnknownMap_0843E708_Layout
-	.4byte UnknownMap_0843E72C_Layout
-	.4byte UnknownMap_0843E750_Layout
-	.4byte UnknownMap_0843E774_Layout
-	.4byte UnknownMap_0843E798_Layout
-	.4byte UnknownMap_0843E7BC_Layout
-	.4byte UnknownMap_0843E7E0_Layout
-	.4byte UnknownMap_0843E804_Layout
-	.4byte UnknownMap_0843E828_Layout
-	.4byte UnknownMap_0843E84C_Layout
-	.4byte UnknownMap_0843E870_Layout
-	.4byte UnknownMap_0843E894_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_North_Layout
-	.4byte SafariZone_Southwest_Layout
-	.4byte SafariZone_South_Layout
-	.4byte UnknownMap_08447028_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_SeasideCyclingRoadEntrance_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 BattleFrontier_BattleTowerLobby_Layout
-	.4byte BattleFrontier_OutsideWest_Layout
-	.4byte BattleElevator_Layout
-	.4byte BattleFrontier_BattleTowerCorridor_Layout
-	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
-	.4byte RustboroCity_DevonCorp_3F_Layout
-	.4byte EverGrandeCity_PokemonLeague_1F_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_LotadAndSeedotHouse_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_0845A394_Layout
-	.4byte RustboroCity_Flat1_1F_Layout
-	.4byte RustboroCity_Flat1_2F_Layout
-	.4byte EverGrandeCity_Hall4_Layout
-	.4byte AquaHideout_UnusedRubyMap1_Layout
-	.4byte AquaHideout_UnusedRubyMap2_Layout
-	.4byte AquaHideout_UnusedRubyMap3_Layout
-	.4byte UnknownMap_0845D470_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_0845ECB4_Layout
-	.4byte MossdeepCity_StevensHouse_Layout
-	.4byte ShoalCave_LowTideIceRoom_Layout
-	.4byte SafariZone_RestHouse_Layout
-	.4byte SkyPillar_5F_Layout
-	.4byte SkyPillar_Top_Layout
-	.4byte BattleFrontier_BattleDomeLobby_Layout
-	.4byte BattleFrontier_BattleDomeCorridor_Layout
-	.4byte BattleFrontier_BattleDomePreBattleRoom_Layout
-	.4byte BattleFrontier_BattleDomeBattleRoom_Layout
-	.4byte MagmaHideout_1F_Layout
-	.4byte MagmaHideout_2F_1R_Layout
-	.4byte MagmaHideout_2F_2R_Layout
-	.4byte MagmaHideout_3F_1R_Layout
-	.4byte MagmaHideout_3F_2R_Layout
-	.4byte MagmaHideout_4F_Layout
-	.4byte BattleFrontier_BattlePalaceLobby_Layout
-	.4byte BattleFrontier_BattlePalaceCorridor_Layout
-	.4byte BattleFrontier_BattlePalaceBattleRoom_Layout
-	.4byte BattleFrontier_OutsideEast_Layout
-	.4byte BattleFrontier_BattleFactoryLobby_Layout
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout
-	.4byte BattleFrontier_BattleFactoryBattleRoom_Layout
-	.4byte BattleFrontier_BattlePikeLobby_Layout
-	.4byte BattleFrontier_BattlePikeCorridor_Layout
-	.4byte BattleFrontier_BattlePikeThreePathRoom_Layout
-	.4byte BattleFrontier_BattlePikeRandomRoom1_Layout
-	.4byte BattleFrontier_BattlePikeRandomRoom2_Layout
-	.4byte BattleFrontier_BattleArenaLobby_Layout
-	.4byte BattleFrontier_BattleArenaCorridor_Layout
-	.4byte BattleFrontier_BattleArenaBattleRoom_Layout
-	.4byte UnknownMap_08469200_Layout
-	.4byte BattleFrontier_BattlePikeRandomRoom3_Layout
-	.4byte UnknownMap_084693AC_Layout
-	.4byte BattleFrontier_BattlePyramidLobby_Layout
-	.4byte BattleFrontier_BattlePyramidEmptySquare_Layout
-	.4byte BattlePyramidSquare01_Layout
-	.4byte BattlePyramidSquare02_Layout
-	.4byte BattlePyramidSquare03_Layout
-	.4byte BattlePyramidSquare04_Layout
-	.4byte BattlePyramidSquare05_Layout
-	.4byte BattlePyramidSquare06_Layout
-	.4byte BattlePyramidSquare07_Layout
-	.4byte BattlePyramidSquare08_Layout
-	.4byte BattlePyramidSquare09_Layout
-	.4byte BattlePyramidSquare10_Layout
-	.4byte BattlePyramidSquare11_Layout
-	.4byte BattlePyramidSquare12_Layout
-	.4byte BattlePyramidSquare13_Layout
-	.4byte BattlePyramidSquare14_Layout
-	.4byte BattlePyramidSquare15_Layout
-	.4byte BattlePyramidSquare16_Layout
-	.4byte BattleFrontier_BattlePyramidTop_Layout
-	.4byte MagmaHideout_3F_3R_Layout
-	.4byte MagmaHideout_2F_3R_Layout
-	.4byte MirageTower_1F_Layout
-	.4byte MirageTower_2F_Layout
-	.4byte MirageTower_3F_Layout
-	.4byte BattleTentLobby_Layout
-	.4byte BattleTentCorridor_Layout
-	.4byte BattleTentBattleRoom_Layout
-	.4byte VerdanturfTown_BattleTentBattleRoom_Layout
-	.4byte MirageTower_4F_Layout
-	.4byte DesertUnderpass_Layout
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
-	.4byte BattleFrontier_BattleTowerCorridor2_Layout
-	.4byte Route111_NoMirageTower_Layout
-	.4byte UnionRoom_Layout
-	.4byte SafariZone_Northeast_Layout
-	.4byte SafariZone_Southeast_Layout
-	.4byte BattleFrontier_RankingHall_Layout
-	.4byte BattleFrontier_Lounge1_Layout
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout
-	.4byte BattleFrontier_ReceptionGate_Layout
-	.4byte ArtisanCave_B1F_Layout
-	.4byte ArtisanCave_1F_Layout
-	.4byte FarawayIsland_Entrance_Layout
-	.4byte FarawayIsland_Interior_Layout
-	.4byte BirthIsland_Exterior_Layout
-	.4byte IslandHarbor_Layout
-	.4byte Underwater_MarineCave_Layout
-	.4byte MarineCave_Entrance_Layout
-	.4byte TerraCave_Entrance_Layout
-	.4byte TerraCave_End_Layout
-	.4byte Underwater6_Layout
-	.4byte Underwater7_Layout
-	.4byte Underwater5_Layout
-	.4byte MarineCave_End_Layout
-	.4byte TrainerHill_Entrance_Layout
-	.4byte TrainerHill_1F_Layout
-	.4byte TrainerHill_2F_Layout
-	.4byte TrainerHill_3F_Layout
-	.4byte TrainerHill_4F_Layout
-	.4byte TrainerHill_Roof_Layout
-	.4byte AlteringCave_Layout
-	.4byte NavelRock_Exterior_Layout
-	.4byte NavelRock_Entrance_Layout
-	.4byte NavelRock_Top_Layout
-	.4byte NavelRock_Bottom_Layout
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_B1F_Layout
-	.4byte NavelRock_Fork_Layout
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_ScottsHouse_Layout
-	.4byte MeteorFalls_StevensCave_Layout
-	.4byte UnknownMap_08480DAC_Layout
-	.4byte UnknownMap_08480F54_Layout
-	.4byte UnknownMap_084810FC_Layout
-	.4byte UnknownMap_084812A4_Layout
-	.4byte UnknownMap_0848144C_Layout
-	.4byte UnknownMap_084815F4_Layout
-	.4byte UnknownMap_08481B24_Layout
-	.4byte SootopolisCity_MysteryEventsHouse_1F_Layout
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_Layout
-	.4byte UnknownMap_08481DBC_Layout
diff --git a/data/map_events.s b/data/map_events.s
index 6b2062076..ceaa72837 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -3,531 +3,16 @@
 #include "constants/event_objects.h"
 #include "constants/flags.h"
 #include "constants/items.h"
+#include "constants/map_scripts.h"
 #include "constants/maps.h"
 #include "constants/secret_bases.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
+#include "constants/trainer_hill.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
 
-	.include "data/maps/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/Underwater5/events.inc"
-	.include "data/maps/Underwater6/events.inc"
-	.include "data/maps/Underwater7/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_BattleTentLobby/events.inc"
-	.include "data/maps/FallarborTown_BattleTentCorridor/events.inc"
-	.include "data/maps/FallarborTown_BattleTentBattleRoom/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_BattleTentLobby/events.inc"
-	.include "data/maps/VerdanturfTown_BattleTentCorridor/events.inc"
-	.include "data/maps/VerdanturfTown_BattleTentBattleRoom/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_BattleTentLobby/events.inc"
-	.include "data/maps/SlateportCity_BattleTentCorridor/events.inc"
-	.include "data/maps/SlateportCity_BattleTentBattleRoom/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_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_LotadAndSeedotHouse/events.inc"
-	.include "data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc"
-	.include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/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_Hall1/events.inc"
-	.include "data/maps/EverGrandeCity_Hall2/events.inc"
-	.include "data/maps/EverGrandeCity_Hall3/events.inc"
-	.include "data/maps/EverGrandeCity_Hall4/events.inc"
-	.include "data/maps/EverGrandeCity_Hall5/events.inc"
-	.include "data/maps/EverGrandeCity_PokemonLeague_1F/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/EverGrandeCity_PokemonLeague_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_UnusedRubySapphireMap1/events.inc"
-	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc"
-	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc"
-	.include "data/maps/CaveOfOrigin_B1F/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/AquaHideout_UnusedRubyMap1/events.inc"
-	.include "data/maps/AquaHideout_UnusedRubyMap2/events.inc"
-	.include "data/maps/AquaHideout_UnusedRubyMap3/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/MagmaHideout_1F/events.inc"
-	.include "data/maps/MagmaHideout_2F_1R/events.inc"
-	.include "data/maps/MagmaHideout_2F_2R/events.inc"
-	.include "data/maps/MagmaHideout_3F_1R/events.inc"
-	.include "data/maps/MagmaHideout_3F_2R/events.inc"
-	.include "data/maps/MagmaHideout_4F/events.inc"
-	.include "data/maps/MagmaHideout_3F_3R/events.inc"
-	.include "data/maps/MagmaHideout_2F_3R/events.inc"
-	.include "data/maps/MirageTower_1F/events.inc"
-	.include "data/maps/MirageTower_2F/events.inc"
-	.include "data/maps/MirageTower_3F/events.inc"
-	.include "data/maps/MirageTower_4F/events.inc"
-	.include "data/maps/DesertUnderpass/events.inc"
-	.include "data/maps/ArtisanCave_B1F/events.inc"
-	.include "data/maps/ArtisanCave_1F/events.inc"
-	.include "data/maps/Underwater_MarineCave/events.inc"
-	.include "data/maps/MarineCave_Entrance/events.inc"
-	.include "data/maps/MarineCave_End/events.inc"
-	.include "data/maps/TerraCave_Entrance/events.inc"
-	.include "data/maps/TerraCave_End/events.inc"
-	.include "data/maps/AlteringCave/events.inc"
-	.include "data/maps/MeteorFalls_StevensCave/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/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/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/InsideOfTruck/events.inc"
-	.include "data/maps/SSTidalCorridor/events.inc"
-	.include "data/maps/SSTidalLowerDeck/events.inc"
-	.include "data/maps/SSTidalRooms/events.inc"
-	.include "data/maps/BattlePyramidSquare01/events.inc"
-	.include "data/maps/BattlePyramidSquare02/events.inc"
-	.include "data/maps/BattlePyramidSquare03/events.inc"
-	.include "data/maps/BattlePyramidSquare04/events.inc"
-	.include "data/maps/BattlePyramidSquare05/events.inc"
-	.include "data/maps/BattlePyramidSquare06/events.inc"
-	.include "data/maps/BattlePyramidSquare07/events.inc"
-	.include "data/maps/BattlePyramidSquare08/events.inc"
-	.include "data/maps/BattlePyramidSquare09/events.inc"
-	.include "data/maps/BattlePyramidSquare10/events.inc"
-	.include "data/maps/BattlePyramidSquare11/events.inc"
-	.include "data/maps/BattlePyramidSquare12/events.inc"
-	.include "data/maps/BattlePyramidSquare13/events.inc"
-	.include "data/maps/BattlePyramidSquare14/events.inc"
-	.include "data/maps/BattlePyramidSquare15/events.inc"
-	.include "data/maps/BattlePyramidSquare16/events.inc"
-	.include "data/maps/UnionRoom/events.inc"
-	.include "data/maps/SafariZone_Northwest/events.inc"
-	.include "data/maps/SafariZone_North/events.inc"
-	.include "data/maps/SafariZone_Southwest/events.inc"
-	.include "data/maps/SafariZone_South/events.inc"
-	.include "data/maps/BattleFrontier_OutsideWest/events.inc"
-	.include "data/maps/BattleFrontier_BattleTowerLobby/events.inc"
-	.include "data/maps/BattleFrontier_BattleTowerElevator/events.inc"
-	.include "data/maps/BattleFrontier_BattleTowerCorridor/events.inc"
-	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/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/SafariZone_Northeast/events.inc"
-	.include "data/maps/SafariZone_Southeast/events.inc"
-	.include "data/maps/BattleFrontier_OutsideEast/events.inc"
-	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattleTowerCorridor2/events.inc"
-	.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc"
-	.include "data/maps/BattleFrontier_BattleDomeLobby/events.inc"
-	.include "data/maps/BattleFrontier_BattleDomeCorridor/events.inc"
-	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattlePalaceLobby/events.inc"
-	.include "data/maps/BattleFrontier_BattlePalaceCorridor/events.inc"
-	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattlePyramidLobby/events.inc"
-	.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc"
-	.include "data/maps/BattleFrontier_BattlePyramidTop/events.inc"
-	.include "data/maps/BattleFrontier_BattleArenaLobby/events.inc"
-	.include "data/maps/BattleFrontier_BattleArenaCorridor/events.inc"
-	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattleFactoryLobby/events.inc"
-	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattlePikeLobby/events.inc"
-	.include "data/maps/BattleFrontier_BattlePikeCorridor/events.inc"
-	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc"
-	.include "data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc"
-	.include "data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc"
-	.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc"
-	.include "data/maps/BattleFrontier_RankingHall/events.inc"
-	.include "data/maps/BattleFrontier_Lounge1/events.inc"
-	.include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc"
-	.include "data/maps/BattleFrontier_Lounge2/events.inc"
-	.include "data/maps/BattleFrontier_Lounge3/events.inc"
-	.include "data/maps/BattleFrontier_Lounge4/events.inc"
-	.include "data/maps/BattleFrontier_ScottsHouse/events.inc"
-	.include "data/maps/BattleFrontier_Lounge5/events.inc"
-	.include "data/maps/BattleFrontier_Lounge6/events.inc"
-	.include "data/maps/BattleFrontier_Lounge7/events.inc"
-	.include "data/maps/BattleFrontier_ReceptionGate/events.inc"
-	.include "data/maps/BattleFrontier_Lounge8/events.inc"
-	.include "data/maps/BattleFrontier_Lounge9/events.inc"
-	.include "data/maps/BattleFrontier_PokemonCenter_1F/events.inc"
-	.include "data/maps/BattleFrontier_PokemonCenter_2F/events.inc"
-	.include "data/maps/BattleFrontier_Mart/events.inc"
-	.include "data/maps/FarawayIsland_Entrance/events.inc"
-	.include "data/maps/FarawayIsland_Interior/events.inc"
-	.include "data/maps/BirthIsland_Exterior/events.inc"
-	.include "data/maps/BirthIsland_Harbor/events.inc"
-	.include "data/maps/TrainerHill_Entrance/events.inc"
-	.include "data/maps/TrainerHill_1F/events.inc"
-	.include "data/maps/TrainerHill_2F/events.inc"
-	.include "data/maps/TrainerHill_3F/events.inc"
-	.include "data/maps/TrainerHill_4F/events.inc"
-	.include "data/maps/TrainerHill_Roof/events.inc"
-	.include "data/maps/NavelRock_Exterior/events.inc"
-	.include "data/maps/NavelRock_Harbor/events.inc"
-	.include "data/maps/NavelRock_Entrance/events.inc"
-	.include "data/maps/NavelRock_B1F/events.inc"
-	.include "data/maps/NavelRock_Fork/events.inc"
-	.include "data/maps/NavelRock_Up1/events.inc"
-	.include "data/maps/NavelRock_Up2/events.inc"
-	.include "data/maps/NavelRock_Up3/events.inc"
-	.include "data/maps/NavelRock_Up4/events.inc"
-	.include "data/maps/NavelRock_Top/events.inc"
-	.include "data/maps/NavelRock_Down01/events.inc"
-	.include "data/maps/NavelRock_Down02/events.inc"
-	.include "data/maps/NavelRock_Down03/events.inc"
-	.include "data/maps/NavelRock_Down04/events.inc"
-	.include "data/maps/NavelRock_Down05/events.inc"
-	.include "data/maps/NavelRock_Down06/events.inc"
-	.include "data/maps/NavelRock_Down07/events.inc"
-	.include "data/maps/NavelRock_Down08/events.inc"
-	.include "data/maps/NavelRock_Down09/events.inc"
-	.include "data/maps/NavelRock_Down10/events.inc"
-	.include "data/maps/NavelRock_Down11/events.inc"
-	.include "data/maps/NavelRock_Bottom/events.inc"
-	.include "data/maps/TrainerHill_Elevator/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_SeasideCyclingRoadNorthEntrance/events.inc"
-	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/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"
+	.include "data/maps/events.inc"
 
diff --git a/data/maps.s b/data/maps.s
index 56d957139..beb28ddec 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,16 +1,17 @@
+#include "constants/layouts.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/weather.h"
 #include "constants/region_map_sections.h"
 #include "constants/songs.h"
-#include "constants/weather.h"
+#include "constants/trainer_hill.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
 
-	.include "data/layouts.inc"
-	.include "data/layouts_table.inc"
+	.include "data/layouts/layouts.inc"
+	.include "data/layouts/layouts_table.inc"
 	.include "data/maps/headers.inc"
 	.include "data/maps/groups.inc"
 	.include "data/maps/connections.inc"
diff --git a/data/maps/.gitignore b/data/maps/.gitignore
new file mode 100755
index 000000000..59405b176
--- /dev/null
+++ b/data/maps/.gitignore
@@ -0,0 +1,7 @@
+connections.inc
+events.inc
+groups.inc
+headers.inc
+**/connections.inc
+**/events.inc
+**/header.inc
diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc
deleted file mode 100644
index b59eb456a..000000000
--- a/data/maps/AbandonedShip_CaptainsOffice/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY
-
-AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
-	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
-	warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
-
-AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C
-	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
deleted file mode 100644
index 3102e0614..000000000
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_CaptainsOffice: @ 84845A4
-	.4byte AbandonedShip_CaptainsOffice_Layout
-	.4byte AbandonedShip_CaptainsOffice_MapEvents
-	.4byte AbandonedShip_CaptainsOffice_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 195
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json
new file mode 100644
index 000000000..c88afc806
--- /dev/null
+++ b/data/maps/AbandonedShip_CaptainsOffice/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
+  "name": "AbandonedShip_CaptainsOffice",
+  "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_CaptainsOffice_EventScript_29126E",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_DECK",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_DECK",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc
deleted file mode 100644
index 665350915..000000000
--- a/data/maps/AbandonedShip_Corridors_1F/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
-	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
-	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0
-
-AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
-	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:: @ 8536750
-	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
deleted file mode 100644
index b9f5e809c..000000000
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Corridors_1F: @ 84844C4
-	.4byte AbandonedShip_Corridors_1F_Layout
-	.4byte AbandonedShip_Corridors_1F_MapEvents
-	.4byte AbandonedShip_Corridors_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 187
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json
new file mode 100644
index 000000000..4ddf92226
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_1F/map.json
@@ -0,0 +1,132 @@
+{
+  "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+  "name": "AbandonedShip_Corridors_1F",
+  "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 17,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Corridors_1F_EventScript_2379A5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M",
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT",
+      "movement_range_x": 4,
+      "movement_range_y": 7,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "AbandonedShip_Corridors_1F_EventScript_2379AE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_DECK",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_DECK",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 0,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_DECK",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_DECK",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 11,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 14,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc
deleted file mode 100644
index 34bc41cf0..000000000
--- a/data/maps/AbandonedShip_Corridors_B1F/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
-	object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0
-
-AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
-	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: @ 8536878
-	bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8
-
-AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
-	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
deleted file mode 100644
index 98f23c223..000000000
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Corridors_B1F: @ 84844FC
-	.4byte AbandonedShip_Corridors_B1F_Layout
-	.4byte AbandonedShip_Corridors_B1F_MapEvents
-	.4byte AbandonedShip_Corridors_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 189
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json
new file mode 100644
index 000000000..9bccfc636
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_B1F/map.json
@@ -0,0 +1,113 @@
+{
+  "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+  "name": "AbandonedShip_Corridors_B1F",
+  "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "AbandonedShip_Corridors_B1F_EventScript_237E13",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_ROOM_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_Corridors_B1F_EventScript_237DC8"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index e89d72c23..e69666120 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
-	map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F
-	map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F
+	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98
 	.byte 0
 
 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc
deleted file mode 100644
index 289f917af..000000000
--- a/data/maps/AbandonedShip_Deck/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-AbandonedShip_Deck_MapWarps: @ 8536684
-	warp_def 13, 15, 3, 0, MAP_ROUTE108
-	warp_def 14, 15, 3, 0, MAP_ROUTE108
-	warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE
-
-AbandonedShip_Deck_MapEvents:: @ 85366AC
-	map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
deleted file mode 100644
index 394c93ec9..000000000
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Deck: @ 84844A8
-	.4byte AbandonedShip_Deck_Layout
-	.4byte AbandonedShip_Deck_MapEvents
-	.4byte AbandonedShip_Deck_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 186
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json
new file mode 100644
index 000000000..b12ff4057
--- /dev/null
+++ b/data/maps/AbandonedShip_Deck/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_ABANDONED_SHIP_DECK",
+  "name": "AbandonedShip_Deck",
+  "layout": "LAYOUT_ABANDONED_SHIP_DECK",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE108",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE108",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index 1f0c0e2f2..041c54593 100644
--- a/data/maps/AbandonedShip_Deck/scripts.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Deck_MapScripts:: @ 823799A
-	map_script 3, AbandonedShip_Deck_MapScript1_2379A0
+	map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0
 	.byte 0
 
 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
deleted file mode 100644
index 54453b729..000000000
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
-	warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-
-AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
-	bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
-	bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
-	bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
-	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
-
-AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
-	map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents
-
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
deleted file mode 100644
index dcf42db40..000000000
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_HiddenFloorCorridors: @ 84845DC
-	.4byte AbandonedShip_HiddenFloorCorridors_Layout
-	.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
-	.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 289
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
new file mode 100644
index 000000000..1b1466fe1
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
@@ -0,0 +1,96 @@
+{
+  "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+  "name": "AbandonedShip_HiddenFloorCorridors",
+  "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index f8b5bcc65..1c495c377 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -1,6 +1,6 @@
 AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
-	map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
-	map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
+	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
 	.byte 0
 
 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
deleted file mode 100644
index b2cf9b11b..000000000
--- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE
-
-AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
-	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: @ 8536BE8
-	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY
-	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY
-	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY
-	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY
-	bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-
-AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
-	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
deleted file mode 100644
index f279a52ab..000000000
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_HiddenFloorRooms: @ 84845F8
-	.4byte AbandonedShip_HiddenFloorRooms_Layout
-	.4byte AbandonedShip_HiddenFloorRooms_MapEvents
-	.4byte AbandonedShip_HiddenFloorRooms_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 310
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
new file mode 100644
index 000000000..f71ad8eb3
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
@@ -0,0 +1,218 @@
+{
+  "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+  "name": "AbandonedShip_HiddenFloorRooms",
+  "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 41,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_291288",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 31,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_291295",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 21,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 22,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 36,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 37,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 21,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 36,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 42,
+      "y": 10,
+      "elevation": 3,
+      "item": "ITEM_ROOM_1_KEY",
+      "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY"
+    },
+    {
+      "type": "hidden_item",
+      "x": 20,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_ROOM_2_KEY",
+      "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY"
+    },
+    {
+      "type": "hidden_item",
+      "x": 1,
+      "y": 12,
+      "elevation": 3,
+      "item": "ITEM_ROOM_4_KEY",
+      "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY"
+    },
+    {
+      "type": "hidden_item",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "item": "ITEM_ROOM_6_KEY",
+      "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 3,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 3,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 2,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 6,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index f8ecc9001..1c517735e 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49
-	map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F
 	.byte 0
 
 AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F
diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc
deleted file mode 100644
index bd882d6d8..000000000
--- a/data/maps/AbandonedShip_Room_B1F/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-AbandonedShip_Room_B1F_EventObjects: @ 853697C
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13
-
-AbandonedShip_Room_B1F_MapWarps: @ 8536994
-	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:: @ 85369A4
-	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
deleted file mode 100644
index 3ac0c5f38..000000000
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Room_B1F: @ 848456C
-	.4byte AbandonedShip_Room_B1F_Layout
-	.4byte AbandonedShip_Room_B1F_MapEvents
-	.4byte AbandonedShip_Room_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 193
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json
new file mode 100644
index 000000000..60dd5e1b3
--- /dev/null
+++ b/data/maps/AbandonedShip_Room_B1F/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_ABANDONED_SHIP_ROOM_B1F",
+  "name": "AbandonedShip_Room_B1F",
+  "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Room_B1F_EventScript_291254",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
deleted file mode 100644
index 6e4b9b280..000000000
--- a/data/maps/AbandonedShip_Rooms2_1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE
-	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
-	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
-
-AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
-	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:: @ 8536A48
-	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
deleted file mode 100644
index 71f856bc0..000000000
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms2_1F: @ 8484588
-	.4byte AbandonedShip_Rooms2_1F_Layout
-	.4byte AbandonedShip_Rooms2_1F_MapEvents
-	.4byte AbandonedShip_Rooms2_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 194
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json
new file mode 100644
index 000000000..49a4c2da0
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_1F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_ABANDONED_SHIP_ROOMS2_1F",
+  "name": "AbandonedShip_Rooms2_1F",
+  "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_23810B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_291261",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_238186",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_F",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_23816F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 5,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
deleted file mode 100644
index 3bb29619a..000000000
--- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL
-
-AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
-	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:: @ 8536944
-	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
deleted file mode 100644
index 943e57b77..000000000
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms2_B1F: @ 8484534
-	.4byte AbandonedShip_Rooms2_B1F_Layout
-	.4byte AbandonedShip_Rooms2_B1F_MapEvents
-	.4byte AbandonedShip_Rooms2_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 191
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json
new file mode 100644
index 000000000..3f56bf6cd
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json
@@ -0,0 +1,76 @@
+{
+  "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
+  "name": "AbandonedShip_Rooms2_B1F",
+  "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Rooms2_B1F_EventScript_238025",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Rooms2_B1F_EventScript_291247",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc
deleted file mode 100644
index f0322558b..000000000
--- a/data/maps/AbandonedShip_Rooms_1F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-AbandonedShip_Rooms_1F_EventObjects: @ 8536764
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL
-	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
-
-AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
-	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:: @ 85367F4
-	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
deleted file mode 100644
index b37456c28..000000000
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms_1F: @ 84844E0
-	.4byte AbandonedShip_Rooms_1F_Layout
-	.4byte AbandonedShip_Rooms_1F_MapEvents
-	.4byte AbandonedShip_Rooms_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 188
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json
new file mode 100644
index 000000000..e97c74fcf
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_1F/map.json
@@ -0,0 +1,116 @@
+{
+  "id": "MAP_ABANDONED_SHIP_ROOMS_1F",
+  "name": "AbandonedShip_Rooms_1F",
+  "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Rooms_1F_EventScript_237A93",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Rooms_1F_EventScript_29122D",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "AbandonedShip_Rooms_1F_EventScript_237AB3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "AbandonedShip_Rooms_1F_EventScript_237A9C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 13,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 14,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc
deleted file mode 100644
index 4af246e5c..000000000
--- a/data/maps/AbandonedShip_Rooms_B1F/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE
-
-AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
-	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:: @ 85368E0
-	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
deleted file mode 100644
index f5ec64f2b..000000000
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms_B1F: @ 8484518
-	.4byte AbandonedShip_Rooms_B1F_Layout
-	.4byte AbandonedShip_Rooms_B1F_MapEvents
-	.4byte AbandonedShip_Rooms_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 190
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json
new file mode 100644
index 000000000..65b5fb9cf
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_B1F/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+  "name": "AbandonedShip_Rooms_B1F",
+  "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 25,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AbandonedShip_Rooms_B1F_EventScript_29123A",
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 22,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
index 470ae8987..05223592e 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
-	map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD
 	.byte 0
 
 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD
diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc
deleted file mode 100644
index 5c9af3c10..000000000
--- a/data/maps/AbandonedShip_Underwater1/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-AbandonedShip_Underwater1_MapWarps: @ 8536958
-	warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2
-	warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2
-
-AbandonedShip_Underwater1_MapEvents:: @ 8536968
-	map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
deleted file mode 100644
index e5119887a..000000000
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Underwater1: @ 8484550
-	.4byte AbandonedShip_Underwater1_Layout
-	.4byte AbandonedShip_Underwater1_MapEvents
-	.4byte AbandonedShip_Underwater1_MapScripts
-	.4byte 0x0
-	.2byte MUS_DEEPDEEP
-	.2byte 192
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json
new file mode 100644
index 000000000..de9c77815
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater1/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_ABANDONED_SHIP_UNDERWATER1",
+  "name": "AbandonedShip_Underwater1",
+  "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
index 7e39b1939..b957bb6be 100644
--- a/data/maps/AbandonedShip_Underwater1/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Underwater1_MapScripts:: @ 8238096
-	map_script 5, AbandonedShip_Underwater1_MapScript1_23809C
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C
 	.byte 0
 
 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C
diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc
deleted file mode 100644
index f06c21b2a..000000000
--- a/data/maps/AbandonedShip_Underwater2/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-AbandonedShip_Underwater2_MapWarps: @ 8536AB0
-	warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1
-
-AbandonedShip_Underwater2_MapEvents:: @ 8536AB8
-	map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
deleted file mode 100644
index de7e871d0..000000000
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Underwater2: @ 84845C0
-	.4byte AbandonedShip_Underwater2_Layout
-	.4byte AbandonedShip_Underwater2_MapEvents
-	.4byte AbandonedShip_Underwater2_MapScripts
-	.4byte 0x0
-	.2byte MUS_DEEPDEEP
-	.2byte 196
-	.byte MAPSEC_ABANDONED_SHIP
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json
new file mode 100644
index 000000000..c1c9f24d3
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater2/map.json
@@ -0,0 +1,28 @@
+{
+  "id": "MAP_ABANDONED_SHIP_UNDERWATER2",
+  "name": "AbandonedShip_Underwater2",
+  "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_ABANDONED_SHIP",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER1",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
index 17f52c691..cc000b09c 100644
--- a/data/maps/AbandonedShip_Underwater2/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Underwater2_MapScripts:: @ 823895D
-	map_script 5, AbandonedShip_Underwater2_MapScript1_238963
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963
 	.byte 0
 
 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963
diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc
deleted file mode 100644
index 898038715..000000000
--- a/data/maps/AlteringCave/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-AlteringCave_MapWarps: @ 8537894
-	warp_def 18, 22, 0, 0, MAP_ROUTE103
-
-AlteringCave_MapEvents:: @ 853789C
-	map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc
deleted file mode 100644
index fe88dbca0..000000000
--- a/data/maps/AlteringCave/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AlteringCave: @ 8484A58
-	.4byte AlteringCave_Layout
-	.4byte AlteringCave_MapEvents
-	.4byte AlteringCave_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 420
-	.byte MAPSEC_ALTERING_CAVE_2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json
new file mode 100644
index 000000000..848eb95c1
--- /dev/null
+++ b/data/maps/AlteringCave/map.json
@@ -0,0 +1,28 @@
+{
+  "id": "MAP_ALTERING_CAVE",
+  "name": "AlteringCave",
+  "layout": "LAYOUT_ALTERING_CAVE",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_ALTERING_CAVE_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 22,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE103",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc
index a9faddc36..185466c80 100644
--- a/data/maps/AlteringCave/scripts.inc
+++ b/data/maps/AlteringCave/scripts.inc
@@ -1,5 +1,5 @@
 AlteringCave_MapScripts:: @ 823B177
-	map_script 3, AlteringCave_MapScript1_23B17D
+	map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D
 	.byte 0
 
 AlteringCave_MapScript1_23B17D: @ 823B17D
diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc
deleted file mode 100644
index 3e784dea2..000000000
--- a/data/maps/AncientTomb/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-AncientTomb_EventObjects: @ 8536CDC
-	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL
-
-AncientTomb_MapWarps: @ 8536CF4
-	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: @ 8536D0C
-	bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033
-	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
-	bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
-
-AncientTomb_MapEvents:: @ 8536D30
-	map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
-
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
deleted file mode 100644
index 5bfe54614..000000000
--- a/data/maps/AncientTomb/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AncientTomb: @ 8484630
-	.4byte AncientTomb_Layout
-	.4byte AncientTomb_MapEvents
-	.4byte AncientTomb_MapScripts
-	.4byte 0x0
-	.2byte MUS_MABOROSI
-	.2byte 281
-	.byte MAPSEC_ANCIENT_TOMB
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json
new file mode 100644
index 000000000..9de100bff
--- /dev/null
+++ b/data/maps/AncientTomb/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_ANCIENT_TOMB",
+  "name": "AncientTomb",
+  "layout": "LAYOUT_ANCIENT_TOMB",
+  "music": "MUS_MABOROSI",
+  "region_map_section": "MAPSEC_ANCIENT_TOMB",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REGISTEEL",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AncientTomb_EventScript_23905A",
+      "flag": "FLAG_HIDE_REGISTEEL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE120",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_ANCIENT_TOMB",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ANCIENT_TOMB",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AncientTomb_EventScript_239033"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AncientTomb_EventScript_239050"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "AncientTomb_EventScript_239050"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 45bb9e007..8d1c029c3 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -1,7 +1,7 @@
 AncientTomb_MapScripts:: @ 8238FB3
-	map_script 5, AncientTomb_MapScript1_238FC3
-	map_script 1, AncientTomb_MapScript1_238FF2
-	map_script 3, AncientTomb_MapScript1_238FE1
+	map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
+	map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
+	map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1
 	.byte 0
 
 AncientTomb_MapScript1_238FC3: @ 8238FC3
@@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
 AncientTomb_EventScript_238FCD:: @ 8238FCD
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne AncientTomb_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
@@ -25,7 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE
 	return
 
 AncientTomb_MapScript1_238FF2: @ 8238FF2
-	call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC
+	call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_238FFC
 	end
 
 AncientTomb_EventScript_238FFC:: @ 8238FFC
@@ -39,7 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC
 
 AncientTomb_EventScript_239033:: @ 8239033
 	lockall
-	goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_239046
+	goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_239046
 	braillemessage AncientTomb_Braille_2A6D06
 	waitbuttonpress
 	hidebox2
diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc
deleted file mode 100644
index 6a4f0972f..000000000
--- a/data/maps/AquaHideout_1F/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-AquaHideout_1F_EventObjects: @ 8535304
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-
-AquaHideout_1F_MapWarps: @ 853534C
-	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:: @ 8535364
-	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
deleted file mode 100644
index dd4e12043..000000000
--- a/data/maps/AquaHideout_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_1F: @ 8484144
-	.4byte AquaHideout_1F_Layout
-	.4byte AquaHideout_1F_MapEvents
-	.4byte AquaHideout_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 143
-	.byte MAPSEC_AQUA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_AQUA
-
diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json
new file mode 100644
index 000000000..5f585f32f
--- /dev/null
+++ b/data/maps/AquaHideout_1F/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_AQUA_HIDEOUT_1F",
+  "name": "AquaHideout_1F",
+  "layout": "LAYOUT_AQUA_HIDEOUT_1F",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_AQUA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_AQUA",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 13,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_1F_EventScript_233494",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_1F_EventScript_2334C6",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 20,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
+      "movement_range_x": 13,
+      "movement_range_y": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "AquaHideout_1F_EventScript_2334F8",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 27,
+      "elevation": 1,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 14,
+      "y": 27,
+      "elevation": 1,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 22,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc
deleted file mode 100644
index 6dd83aebf..000000000
--- a/data/maps/AquaHideout_B1F/events.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-AquaHideout_B1F_EventObjects: @ 8535378
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-
-AquaHideout_B1F_MapWarps: @ 8535450
-	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:: @ 8535518
-	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
deleted file mode 100644
index bc65150d6..000000000
--- a/data/maps/AquaHideout_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_B1F: @ 8484160
-	.4byte AquaHideout_B1F_Layout
-	.4byte AquaHideout_B1F_MapEvents
-	.4byte AquaHideout_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 144
-	.byte MAPSEC_AQUA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_AQUA
-
diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json
new file mode 100644
index 000000000..5b6beee11
--- /dev/null
+++ b/data/maps/AquaHideout_B1F/map.json
@@ -0,0 +1,314 @@
+{
+  "id": "MAP_AQUA_HIDEOUT_B1F",
+  "name": "AquaHideout_B1F",
+  "layout": "LAYOUT_AQUA_HIDEOUT_B1F",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_AQUA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_AQUA",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 28,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "AquaHideout_B1F_EventScript_233A85",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "AquaHideout_B1F_EventScript_233AB0",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 29,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_B1F_EventScript_291372",
+      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 20,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 4,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "AquaHideout_B1F_EventScript_233AD5",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 15,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_B1F_EventScript_291358",
+      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_B1F_EventScript_2339EB",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 15,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_B1F_EventScript_291365",
+      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_B1F_EventScript_233A38",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 28,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "AquaHideout_B1F_EventScript_233AEC",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 29,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 18,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 31,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 27,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 20,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 27,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 3,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 3,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 32,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 23,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 22
+    },
+    {
+      "x": 45,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 42,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 18
+    },
+    {
+      "x": 45,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 48,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 16
+    },
+    {
+      "x": 42,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 15
+    },
+    {
+      "x": 45,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 20
+    },
+    {
+      "x": 48,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 13
+    },
+    {
+      "x": 42,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 24
+    },
+    {
+      "x": 45,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 17
+    },
+    {
+      "x": 48,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 42,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 45,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 17
+    },
+    {
+      "x": 48,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 19
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 1763bcd5d..2995f48dc 100644
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -1,6 +1,6 @@
 AquaHideout_B1F_MapScripts:: @ 82339A7
-	map_script 5, AquaHideout_B1F_MapScript1_2339B2
-	map_script 3, AquaHideout_B1F_MapScript1_2339D0
+	map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2
+	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0
 	.byte 0
 
 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
@@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne AquaHideout_B1F_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc
deleted file mode 100644
index 552a95ad4..000000000
--- a/data/maps/AquaHideout_B2F/events.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-AquaHideout_B2F_EventObjects: @ 853552C
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL
-	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-
-AquaHideout_B2F_MapWarps: @ 85355BC
-	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: @ 853560C
-	coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
-	coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
-
-AquaHideout_B2F_MapEvents:: @ 853562C
-	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
deleted file mode 100644
index d4bf34328..000000000
--- a/data/maps/AquaHideout_B2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_B2F: @ 848417C
-	.4byte AquaHideout_B2F_Layout
-	.4byte AquaHideout_B2F_MapEvents
-	.4byte AquaHideout_B2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 145
-	.byte MAPSEC_AQUA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_AQUA
-
diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json
new file mode 100644
index 000000000..64c6eddff
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/map.json
@@ -0,0 +1,189 @@
+{
+  "id": "MAP_AQUA_HIDEOUT_B2F",
+  "name": "AquaHideout_B2F",
+  "layout": "LAYOUT_AQUA_HIDEOUT_B2F",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_AQUA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_AQUA",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 23,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_B2F_EventScript_233E09",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 23,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT",
+      "movement_range_x": 4,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "AquaHideout_B2F_EventScript_233E8A",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "AquaHideout_B2F_EventScript_29137F",
+      "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW",
+      "x": 19,
+      "y": 20,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "AquaHideout_B2F_EventScript_233EAF",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "AquaHideout_B2F_EventScript_233EC6",
+      "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 31,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 18,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 12,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 31,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B2F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 32,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_AQUA_HIDEOUT_B1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 28,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "AquaHideout_B2F_EventScript_233DE5"
+    },
+    {
+      "type": "trigger",
+      "x": 28,
+      "y": 16,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "AquaHideout_B2F_EventScript_233DE5"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
index ba20cb681..cdfe3f58e 100644
--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -1,5 +1,5 @@
 AquaHideout_B2F_MapScripts:: @ 8233DCF
-	map_script 3, AquaHideout_B2F_MapScript1_233DD5
+	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5
 	.byte 0
 
 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
@@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
 	lockall
 	setvar VAR_0x8008, 1
 	playse SE_PIN
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598
+	applymovement VAR_0x8008, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
 	releaseall
@@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09
 AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 4
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
 	applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
 	waitmovement 0
 	removeobject VAR_0x8009
 	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
 	setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc
deleted file mode 100644
index 45663b68f..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
deleted file mode 100644
index 90e59a51e..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_UnusedRubyMap1: @ 84846D8
-	.4byte AquaHideout_UnusedRubyMap1_Layout
-	.4byte AquaHideout_UnusedRubyMap1_MapEvents
-	.4byte AquaHideout_UnusedRubyMap1_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 316
-	.byte MAPSEC_AQUA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_MAGMA
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json
new file mode 100644
index 000000000..22b645413
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1",
+  "name": "AquaHideout_UnusedRubyMap1",
+  "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_AQUA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_MAGMA",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc
deleted file mode 100644
index 6f53de284..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
deleted file mode 100644
index 776465f16..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_UnusedRubyMap2: @ 84846F4
-	.4byte AquaHideout_UnusedRubyMap2_Layout
-	.4byte AquaHideout_UnusedRubyMap2_MapEvents
-	.4byte AquaHideout_UnusedRubyMap2_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 317
-	.byte MAPSEC_AQUA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_MAGMA
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json
new file mode 100644
index 000000000..5bee65158
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
+  "name": "AquaHideout_UnusedRubyMap2",
+  "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_AQUA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_MAGMA",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc
deleted file mode 100644
index 8a23a3786..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
deleted file mode 100644
index ab97ae84d..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_UnusedRubyMap3: @ 8484710
-	.4byte AquaHideout_UnusedRubyMap3_Layout
-	.4byte AquaHideout_UnusedRubyMap3_MapEvents
-	.4byte AquaHideout_UnusedRubyMap3_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 318
-	.byte MAPSEC_AQUA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_MAGMA
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json
new file mode 100644
index 000000000..03cafd7dc
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3",
+  "name": "AquaHideout_UnusedRubyMap3",
+  "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_AQUA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_MAGMA",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc
deleted file mode 100644
index 30f920220..000000000
--- a/data/maps/ArtisanCave_1F/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-ArtisanCave_1F_EventObjects: @ 8537774
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS
-
-ArtisanCave_1F_MapWarps: @ 853778C
-	warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F
-
-ArtisanCave_1F_MapEvents:: @ 853779C
-	map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc
deleted file mode 100644
index c53a2851b..000000000
--- a/data/maps/ArtisanCave_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ArtisanCave_1F: @ 84849B0
-	.4byte ArtisanCave_1F_Layout
-	.4byte ArtisanCave_1F_MapEvents
-	.4byte ArtisanCave_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 401
-	.byte MAPSEC_ARTISAN_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json
new file mode 100644
index 000000000..2092ca7ea
--- /dev/null
+++ b/data/maps/ArtisanCave_1F/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_ARTISAN_CAVE_1F",
+  "name": "ArtisanCave_1F",
+  "layout": "LAYOUT_ARTISAN_CAVE_1F",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_ARTISAN_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ArtisanCave_1F_EventScript_2914D1",
+      "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 13
+    },
+    {
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ARTISAN_CAVE_B1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc
deleted file mode 100644
index 9df844aa3..000000000
--- a/data/maps/ArtisanCave_B1F/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-ArtisanCave_B1F_EventObjects: @ 8537708
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP
-
-ArtisanCave_B1F_MapWarps: @ 8537720
-	warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F
-
-ArtisanCave_B1F_MapBGEvents: @ 8537730
-	bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC
-	bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM
-	bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN
-	bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON
-
-ArtisanCave_B1F_MapEvents:: @ 8537760
-	map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
-
diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc
deleted file mode 100644
index f76fe6938..000000000
--- a/data/maps/ArtisanCave_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ArtisanCave_B1F: @ 8484994
-	.4byte ArtisanCave_B1F_Layout
-	.4byte ArtisanCave_B1F_MapEvents
-	.4byte ArtisanCave_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 400
-	.byte MAPSEC_ARTISAN_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json
new file mode 100644
index 000000000..32174cd44
--- /dev/null
+++ b/data/maps/ArtisanCave_B1F/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_ARTISAN_CAVE_B1F",
+  "name": "ArtisanCave_B1F",
+  "layout": "LAYOUT_ARTISAN_CAVE_B1F",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_ARTISAN_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 32,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ArtisanCave_B1F_EventScript_2914C4",
+      "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 48,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 38,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ARTISAN_CAVE_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 32,
+      "y": 29,
+      "elevation": 0,
+      "item": "ITEM_ZINC",
+      "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC"
+    },
+    {
+      "type": "hidden_item",
+      "x": 27,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_CALCIUM",
+      "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM"
+    },
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 5,
+      "elevation": 0,
+      "item": "ITEM_PROTEIN",
+      "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN"
+    },
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 43,
+      "elevation": 0,
+      "item": "ITEM_IRON",
+      "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc
index e46737583..433991bea 100644
--- a/data/maps/ArtisanCave_B1F/scripts.inc
+++ b/data/maps/ArtisanCave_B1F/scripts.inc
@@ -1,5 +1,5 @@
 ArtisanCave_B1F_MapScripts:: @ 823AFAD
-	map_script 3, ArtisanCave_B1F_MapScript1_23AFB3
+	map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3
 	.byte 0
 
 ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
deleted file mode 100644
index 4731db975..000000000
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
-	object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
-	map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
deleted file mode 100644
index 12962e7de..000000000
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleArenaBattleRoom: @ 8485484
-	.4byte BattleFrontier_BattleArenaBattleRoom_Layout
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_ARENA
-	.2byte 356
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json
new file mode 100644
index 000000000..6299e7b11
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json
@@ -0,0 +1,138 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM",
+  "name": "BattleFrontier_BattleArenaBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM",
+  "music": "MUS_B_ARENA",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index cec596b2d..f3a0ecfb4 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
-	map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
-	map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
-	map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
-	map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
 	.byte 0
 
 BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
deleted file mode 100644
index bfe28c339..000000000
--- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
-	map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
deleted file mode 100644
index d4935ea9e..000000000
--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleArenaCorridor: @ 8485468
-	.4byte BattleFrontier_BattleArenaCorridor_Layout
-	.4byte BattleFrontier_BattleArenaCorridor_MapEvents
-	.4byte BattleFrontier_BattleArenaCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_ARENA
-	.2byte 355
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json
new file mode 100644
index 000000000..02f3cd019
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR",
+  "name": "BattleFrontier_BattleArenaCorridor",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR",
+  "music": "MUS_B_ARENA",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 9,
+      "y": 12,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
index f83f6f339..cc362f5f0 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9
-	map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
 	.byte 0
 
 BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
deleted file mode 100644
index e20bec9c3..000000000
--- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
-	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
-	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0
-
-BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
-	warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
-	bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092
-	bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA
-
-BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
-	map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
deleted file mode 100644
index 3523eaf63..000000000
--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleArenaLobby: @ 848544C
-	.4byte BattleFrontier_BattleArenaLobby_Layout
-	.4byte BattleFrontier_BattleArenaLobby_MapEvents
-	.4byte BattleFrontier_BattleArenaLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_ARENA
-	.2byte 354
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json
new file mode 100644
index 000000000..49712c5dd
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json
@@ -0,0 +1,111 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
+  "name": "BattleFrontier_BattleArenaLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
+  "music": "MUS_B_ARENA",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleArenaLobby_EventScript_255DF4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 2,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleArenaLobby_EventScript_2560C1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleArenaLobby_EventScript_2560AF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 14,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleArenaLobby_EventScript_2560B8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 14,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleArenaLobby_EventScript_2560A6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleArenaLobby_EventScript_256092"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index 2c53b7ed6..5df47aed1 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36
-	map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55
-	map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41
 	.byte 0
 
 BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
@@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleArenaLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
deleted file mode 100644
index 910160645..000000000
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
-	object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
-	map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
deleted file mode 100644
index 7d2119ebe..000000000
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomeBattleRoom: @ 8485388
-	.4byte BattleFrontier_BattleDomeBattleRoom_Layout
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_DOME
-	.2byte 335
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json
new file mode 100644
index 000000000..e3a6c915b
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json
@@ -0,0 +1,216 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM",
+  "name": "BattleFrontier_BattleDomeBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM",
+  "music": "MUS_B_DOME",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_M",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 9,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 11,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 16,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 4,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 0,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 12,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 13,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 4,
+      "y": 9,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 14,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index 7dbeee042..e50ad9f0a 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
-	map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
-	map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
-	map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
-	map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
 	.byte 0
 
 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
@@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
 	random 2
 	copyvar VAR_TEMP_D, VAR_RESULT
 	compare VAR_TEMP_D, 0
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setobjectxyperm 6, 2, 0
 	setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
 	compare VAR_TEMP_D, 0
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
 	return
 
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
deleted file mode 100644
index 6bce917a0..000000000
--- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
-	warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174
-	map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
deleted file mode 100644
index 25883e9ed..000000000
--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomeCorridor: @ 8485350
-	.4byte BattleFrontier_BattleDomeCorridor_Layout
-	.4byte BattleFrontier_BattleDomeCorridor_MapEvents
-	.4byte BattleFrontier_BattleDomeCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_DOME1
-	.2byte 333
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json
new file mode 100644
index 000000000..6e7f2c3f5
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
+  "name": "BattleFrontier_BattleDomeCorridor",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
+  "music": "MUS_B_DOME1",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 23,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
index ac43ee9a4..c777f7a7a 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
-	map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
 	.byte 0
 
 BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
deleted file mode 100644
index cce01feda..000000000
--- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
-	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
-	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
-	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0
-
-BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
-	warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
-	bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52
-	bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84
-	bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B
-	bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34
-
-BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
-	map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
deleted file mode 100644
index 451192a45..000000000
--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomeLobby: @ 8485334
-	.4byte BattleFrontier_BattleDomeLobby_Layout
-	.4byte BattleFrontier_BattleDomeLobby_MapEvents
-	.4byte BattleFrontier_BattleDomeLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_DOME1
-	.2byte 332
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json
new file mode 100644
index 000000000..89eeb60e4
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json
@@ -0,0 +1,147 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
+  "name": "BattleFrontier_BattleDomeLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
+  "music": "MUS_B_DOME1",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249A35",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 1,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249E10",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 14,
+      "y": 14,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 18,
+      "y": 14,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249E07",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 8,
+      "y": 14,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249DED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 17,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249A47",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249D52"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249D84"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249D6B"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index 35c32c3fa..68ecf802b 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
-	map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
-	map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F
-	map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
 	.byte 0
 
 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
@@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleDomeLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
deleted file mode 100644
index 559199b29..000000000
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
-	warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0
-	map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
deleted file mode 100644
index 59b5b15e4..000000000
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleDomePreBattleRoom: @ 848536C
-	.4byte BattleFrontier_BattleDomePreBattleRoom_Layout
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_DOME
-	.2byte 334
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json
new file mode 100644
index 000000000..293a9cc22
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM",
+  "name": "BattleFrontier_BattleDomePreBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM",
+  "music": "MUS_B_DOME",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index 6cf1c7817..3901201bb 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
-	map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
-	map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
 	.byte 0
 
 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
deleted file mode 100644
index bdaf4c51b..000000000
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
-	map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
deleted file mode 100644
index 960fef2eb..000000000
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
-	.4byte BattleFrontier_BattleFactoryBattleRoom_Layout
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_FACTORY
-	.2byte 348
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json
new file mode 100644
index 000000000..5f45fa7ac
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json
@@ -0,0 +1,125 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM",
+  "name": "BattleFrontier_BattleFactoryBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM",
+  "music": "MUS_B_FACTORY",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 0,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 7,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 0,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 0,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 12,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 12,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 12,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index 8c22a9bc9..9c76544f6 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
-	map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
-	map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
-	map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
 	.byte 0
 
 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
@@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
 	end
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
-	applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
-	applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
-	applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 3, Common_Movement_WalkInPlaceRight
+	applymovement 4, Common_Movement_WalkInPlaceRight
+	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 6, Common_Movement_WalkInPlaceLeft
+	applymovement 7, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
deleted file mode 100644
index 063f49813..000000000
--- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
-	object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
-	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0
-
-BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
-	warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
-	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
-	bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
-	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839
-
-BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
-	map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
deleted file mode 100644
index 92329c6ef..000000000
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleFactoryLobby: @ 84854A0
-	.4byte BattleFrontier_BattleFactoryLobby_Layout
-	.4byte BattleFrontier_BattleFactoryLobby_MapEvents
-	.4byte BattleFrontier_BattleFactoryLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_FACTORY
-	.2byte 346
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json
new file mode 100644
index 000000000..8ed837413
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json
@@ -0,0 +1,139 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+  "name": "BattleFrontier_BattleFactoryLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+  "music": "MUS_B_FACTORY",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 3,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 14,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_25881C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 13,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 14,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 10,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587E1"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587FA"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
index 39d729846..a9e57dde6 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
-	map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407
-	map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
 	.byte 0
 
 BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
@@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	special CallFrontierUtilFunc
 	closemessage
 	delay 2
-	call BattleFrontier_BattleFactoryLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
deleted file mode 100644
index d341250de..000000000
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
-	map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
deleted file mode 100644
index 4cae9ed0c..000000000
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_FACTORY
-	.2byte 347
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json
new file mode 100644
index 000000000..fd20b7180
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM",
+  "name": "BattleFrontier_BattleFactoryPreBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM",
+  "music": "MUS_B_FACTORY",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 8,
+      "y": 12,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index 21681b70a..0049b3f58 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
-	map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
-	map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
 	.byte 0
 
 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
deleted file mode 100644
index 8363f2bb5..000000000
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
-	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
-	warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
-	warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
-
-BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584
-	map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
deleted file mode 100644
index 2715ade5c..000000000
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
-	.4byte BattleFrontier_BattlePalaceBattleRoom_Layout
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_PALACE
-	.2byte 344
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json
new file mode 100644
index 000000000..cfa4cf97f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
+  "name": "BattleFrontier_BattlePalaceBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
+  "music": "MUS_B_PALACE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DUSCLOPS",
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZURILL",
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index 529bcd0c3..bdd4a9ff4 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
-	map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
-	map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
-	map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
 	.byte 0
 
 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
@@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	special CallFrontierUtilFunc
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 3, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	special CallFrontierUtilFunc
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 3, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
deleted file mode 100644
index 66e844665..000000000
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0
-
-BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
-	warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
-	warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
-	warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-
-BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8
-	map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
deleted file mode 100644
index f2866b9b0..000000000
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePalaceCorridor: @ 84853C0
-	.4byte BattleFrontier_BattlePalaceCorridor_Layout
-	.4byte BattleFrontier_BattlePalaceCorridor_MapEvents
-	.4byte BattleFrontier_BattlePalaceCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_PALACE
-	.2byte 343
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json
new file mode 100644
index 000000000..9d635efc7
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json
@@ -0,0 +1,141 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+  "name": "BattleFrontier_BattlePalaceCorridor",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+  "music": "MUS_B_PALACE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZURILL",
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KIRLIA",
+      "x": 12,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PIKACHU",
+      "x": 15,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZUMARILL",
+      "x": 13,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 3,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
index 071f61a09..d5219636c 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
-	map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
 	.byte 0
 
 BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
deleted file mode 100644
index 632bfdf10..000000000
--- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
-	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
-	object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
-
-BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
-	warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
-
-BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
-	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
-	bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
-	bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
-
-BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
-	map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
deleted file mode 100644
index 19d06e0be..000000000
--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePalaceLobby: @ 84853A4
-	.4byte BattleFrontier_BattlePalaceLobby_Layout
-	.4byte BattleFrontier_BattlePalaceLobby_MapEvents
-	.4byte BattleFrontier_BattlePalaceLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_PALACE
-	.2byte 342
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json
new file mode 100644
index 000000000..c1d79ee50
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json
@@ -0,0 +1,146 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+  "name": "BattleFrontier_BattlePalaceLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+  "music": "MUS_B_PALACE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 5,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D944",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 11,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC82",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 24,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC9D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 18,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 2,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC94",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 19,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D956",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC50"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC69"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 56edda8ad..40205e9b5 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
-	map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
-	map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
 	.byte 0
 
 BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
@@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattlePalaceLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
deleted file mode 100644
index b34916f49..000000000
--- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
-	map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
deleted file mode 100644
index 07d730579..000000000
--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeCorridor: @ 8485510
-	.4byte BattleFrontier_BattlePikeCorridor_Layout
-	.4byte BattleFrontier_BattlePikeCorridor_MapEvents
-	.4byte BattleFrontier_BattlePikeCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TUBE
-	.2byte 350
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json
new file mode 100644
index 000000000..98b061e9f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
+  "name": "BattleFrontier_BattlePikeCorridor",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
+  "music": "MUS_B_TUBE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
index 1155cd67b..c7421c2c8 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
-	map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
-	map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
 	.byte 0
 
 BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
deleted file mode 100644
index 495d52257..000000000
--- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
-	object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0
-
-BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
-	warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
-	bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80
-	bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
-
-BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
-	map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
deleted file mode 100644
index e591be668..000000000
--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeLobby: @ 84854F4
-	.4byte BattleFrontier_BattlePikeLobby_Layout
-	.4byte BattleFrontier_BattlePikeLobby_MapEvents
-	.4byte BattleFrontier_BattlePikeLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TUBE
-	.2byte 349
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json
new file mode 100644
index 000000000..5854c6bf7
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
+  "name": "BattleFrontier_BattlePikeLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
+  "music": "MUS_B_TUBE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BA80"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index 70d7f3c6c..51d6023c8 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
-	map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
-	map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
 	.byte 0
 
 BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1
@@ -195,7 +195,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattlePikeLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	setvar VAR_0x8004, 26
 	special CallBattlePikeFunction
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
deleted file mode 100644
index 81dee29d1..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
-	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
-
-BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
-	coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
-	coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
-	coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
-	coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
-	coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
-	coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
-	coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
-
-BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
-	map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
deleted file mode 100644
index d49bb07d5..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom1: @ 8485548
-	.4byte BattleFrontier_BattlePikeRandomRoom1_Layout
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TUBE
-	.2byte 352
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json
new file mode 100644
index 000000000..630a0e335
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json
@@ -0,0 +1,111 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1",
+  "name": "BattleFrontier_BattlePikeRandomRoom1",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1",
+  "music": "MUS_B_TUBE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
index 1c810900c..87f83371c 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152
-	map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E
-	map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
-	map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167
-	map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
 	.byte 0
 
 BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
deleted file mode 100644
index 41a58ad3b..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
-	map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
deleted file mode 100644
index 506a31496..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom2: @ 8485564
-	.4byte BattleFrontier_BattlePikeRandomRoom2_Layout
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TUBE
-	.2byte 353
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json
new file mode 100644
index 000000000..a07464a15
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2",
+  "name": "BattleFrontier_BattlePikeRandomRoom2",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2",
+  "music": "MUS_B_TUBE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
index f46760e17..5d438d8bd 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392
-	map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D
-	map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE
 	.byte 0
 
 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
deleted file mode 100644
index 61cb8ede4..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
-	coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
-	coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
-	coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
-	coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
-	coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
-	coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
-	coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
-
-BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4
-	map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
deleted file mode 100644
index 3f5607922..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom3: @ 8485580
-	.4byte BattleFrontier_BattlePikeRandomRoom3_Layout
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TUBE
-	.2byte 358
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json
new file mode 100644
index 000000000..6e0e74960
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json
@@ -0,0 +1,84 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
+  "name": "BattleFrontier_BattlePikeRandomRoom3",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
+  "music": "MUS_B_TUBE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
index 4beb26724..9f2dfec16 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A
-	map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A
-	map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A
-	map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466
 	.byte 0
 
 BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
deleted file mode 100644
index 2fc9e9d6c..000000000
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
-	object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
-
-BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
-	coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
-	coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
-	coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
-	coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
-	coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
-	coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
-	coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
-	coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
-	coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
-
-BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
-	map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
deleted file mode 100644
index 9743a7c36..000000000
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePikeThreePathRoom: @ 848552C
-	.4byte BattleFrontier_BattlePikeThreePathRoom_Layout
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TUBE
-	.2byte 351
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
new file mode 100644
index 000000000..ac9230c53
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
@@ -0,0 +1,129 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
+  "name": "BattleFrontier_BattlePikeThreePathRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
+  "music": "MUS_B_TUBE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "var": "VAR_TEMP_3",
+      "var_value": "1",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index cac594516..54f11f071 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
-	map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E
-	map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853
-	map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D
 	.byte 0
 
 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
deleted file mode 100644
index 225961050..000000000
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
-	object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
-	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
-	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0
-	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0
-	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
-	object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0
-
-BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
-	warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108
-	map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
deleted file mode 100644
index 831a39d2a..000000000
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 398
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json
new file mode 100644
index 000000000..4c7bcad2a
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json
@@ -0,0 +1,160 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+  "name": "BattleFrontier_BattlePointExchangeServiceCorner",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 0,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 0,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 1,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 5,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 9,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 12,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 8,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
deleted file mode 100644
index f9604d8d1..000000000
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
-	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
-	map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
deleted file mode 100644
index ef5c8409f..000000000
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePyramidEmptySquare: @ 8485414
-	.4byte BattleFrontier_BattlePyramidEmptySquare_Layout
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 361
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
new file mode 100644
index 000000000..3f4739b26
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
@@ -0,0 +1,229 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
+  "name": "BattleFrontier_BattlePyramidEmptySquare",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 0,
+      "y": 0,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 2,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 3,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 4,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 5,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 6,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 7,
+      "y": 0,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 558f6e416..723c666d8 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33
-	map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2
-	map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43
-	map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA
 	.byte 0
 
 BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43
@@ -152,8 +152,8 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
-	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+BattlePyramid_TrainerBattle:: @ 8252C4F
+	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	setvar VAR_0x8004, 10
 	special CallBattlePyramidFunction
 	waitmessage
@@ -162,22 +162,22 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
+BattlePyramid_FindItemBall:: @ 8252C6A
 	setvar VAR_0x8004, 7
 	special CallBattlePyramidFunction
 	callstd STD_FIND_ITEM
 	compare VAR_0x8007, 0
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
+	goto_if_eq BattlePyramid_FindItemBall_End
 	setvar VAR_0x8004, 8
 	special CallBattlePyramidFunction
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87
+BattlePyramid_FindItemBall_End:: @ 8252C87
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
 	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D
+BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D
 	.string "This is a sample message.$"
 
 gText_BattlePyramidConfirmRest:: @ 8252CA7
@@ -189,595 +189,595 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB
 	.string "Are you sure you want to quit your\n"
 	.string "PYRAMID quest?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D
+BattlePyramid_ExitHintUp_Text1:: @ 8252D2D
 	.string "This floor's exit is in\n"
 	.string "that direction: {UP_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57
+BattlePyramid_ExitHintLeft_Text1:: @ 8252D57
 	.string "This floor's exit is in\n"
 	.string "that direction: {LEFT_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81
+BattlePyramid_ExitHintRight_Text1:: @ 8252D81
 	.string "This floor's exit is in\n"
 	.string "that direction: {RIGHT_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB
+BattlePyramid_ExitHintDown_Text1:: @ 8252DAB
 	.string "This floor's exit is in\n"
 	.string "that direction: {DOWN_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5
+BattlePyramid_ExitHintUp_Text2:: @ 8252DD5
 	.string "The exit on this floor is in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03
+BattlePyramid_ExitHintLeft_Text2:: @ 8252E03
 	.string "The exit on this floor is in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31
+BattlePyramid_ExitHintRight_Text2:: @ 8252E31
 	.string "The exit on this floor is in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F
+BattlePyramid_ExitHintDown_Text2:: @ 8252E5F
 	.string "The exit on this floor is in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D
+BattlePyramid_ExitHintUp_Text3:: @ 8252E8D
 	.string "The exit is over\n"
 	.string "that {UP_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA
+BattlePyramid_ExitHintLeft_Text3:: @ 8252EAA
 	.string "The exit is over\n"
 	.string "that {LEFT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7
+BattlePyramid_ExitHintRight_Text3:: @ 8252EC7
 	.string "The exit is over\n"
 	.string "that {RIGHT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4
+BattlePyramid_ExitHintDown_Text3:: @ 8252EE4
 	.string "The exit is over\n"
 	.string "that {DOWN_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01
+BattlePyramid_ExitHintUp_Text4:: @ 8252F01
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {UP_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A
+BattlePyramid_ExitHintLeft_Text4:: @ 8252F3A
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {LEFT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73
+BattlePyramid_ExitHintRight_Text4:: @ 8252F73
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {RIGHT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC
+BattlePyramid_ExitHintDown_Text4:: @ 8252FAC
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {DOWN_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5
+BattlePyramid_ExitHintUp_Text5:: @ 8252FE5
 	.string "The exit?\n"
 	.string "It's that {UP_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000
+BattlePyramid_ExitHintLeft_Text5:: @ 8253000
 	.string "The exit?\n"
 	.string "It's that {LEFT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B
+BattlePyramid_ExitHintRight_Text5:: @ 825301B
 	.string "The exit?\n"
 	.string "It's that {RIGHT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036
+BattlePyramid_ExitHintDown_Text5:: @ 8253036
 	.string "The exit?\n"
 	.string "It's that {DOWN_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051
+BattlePyramid_ExitHintUp_Text6:: @ 8253051
 	.string "The exit happens to be in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C
+BattlePyramid_ExitHintLeft_Text6:: @ 825307C
 	.string "The exit happens to be in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7
+BattlePyramid_ExitHintRight_Text6:: @ 82530A7
 	.string "The exit happens to be in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2
+BattlePyramid_ExitHintDown_Text6:: @ 82530D2
 	.string "The exit happens to be in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD
+BattlePyramid_EightItemsRemaining_Text1:: @ 82530FD
 	.string "Are you looking for items?\p"
 	.string "There are eight items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140
+BattlePyramid_SevenItemsRemaining_Text1:: @ 8253140
 	.string "Are you looking for items?\p"
 	.string "There are seven items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183
+BattlePyramid_SixItemsRemaining_Text1:: @ 8253183
 	.string "Are you looking for items?\p"
 	.string "There are six items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4
+BattlePyramid_FiveItemsRemaining_Text1:: @ 82531C4
 	.string "Are you looking for items?\p"
 	.string "There are five items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206
+BattlePyramid_FourItemsRemaining_Text1:: @ 8253206
 	.string "Are you looking for items?\p"
 	.string "There are four items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248
+BattlePyramid_ThreeItemsRemaining_Text1:: @ 8253248
 	.string "Are you looking for items?\p"
 	.string "There are three items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B
+BattlePyramid_TwoItemsRemaining_Text1:: @ 825328B
 	.string "Are you looking for items?\p"
 	.string "There are two items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC
+BattlePyramid_OneItemRemaining_Text1:: @ 82532CC
 	.string "Are you looking for items?\p"
 	.string "There is one item left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B
+BattlePyramid_ZeroItemsRemaining_Text1:: @ 825330B
 	.string "Are you looking for items?\p"
 	.string "There isn't anything left to\n"
 	.string "be found!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D
+BattlePyramid_EightItemsRemaining_Text2:: @ 825334D
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are eight items\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6
+BattlePyramid_SevenItemsRemaining_Text2:: @ 82533A6
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are seven items left\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404
+BattlePyramid_SixItemsRemaining_Text2:: @ 8253404
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are six items left\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460
+BattlePyramid_FiveItemsRemaining_Text2:: @ 8253460
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are five items left\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD
+BattlePyramid_FourItemsRemaining_Text2:: @ 82534BD
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are four items left\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A
+BattlePyramid_ThreeItemsRemaining_Text2:: @ 825351A
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are three items left\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578
+BattlePyramid_TwoItemsRemaining_Text2:: @ 8253578
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are two items left\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4
+BattlePyramid_OneItemRemaining_Text2:: @ 82535D4
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There is just one item\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E
+BattlePyramid_ZeroItemsRemaining_Text2:: @ 825362E
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There isn't anything left\n"
 	.string "lying around here.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B
+BattlePyramid_EightItemsRemaining_Text3:: @ 825368B
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are eight items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8
+BattlePyramid_SevenItemsRemaining_Text3:: @ 82536F8
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are seven items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765
+BattlePyramid_SixItemsRemaining_Text3:: @ 8253765
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are six items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0
+BattlePyramid_FiveItemsRemaining_Text3:: @ 82537D0
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are five items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C
+BattlePyramid_FourItemsRemaining_Text3:: @ 825383C
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are four items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8
+BattlePyramid_ThreeItemsRemaining_Text3:: @ 82538A8
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are three items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915
+BattlePyramid_TwoItemsRemaining_Text3:: @ 8253915
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are two items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980
+BattlePyramid_OneItemRemaining_Text3:: @ 8253980
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there's but one item left\n"
 	.string "waiting to be found on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC
+BattlePyramid_ZeroItemsRemaining_Text3:: @ 82539EC
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are no more items\n"
 	.string "waiting to be found on this floor.\l"
 	.string "You take care now!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69
+BattlePyramid_EightItemsRemaining_Text4:: @ 8253A69
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be eight more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4
+BattlePyramid_SevenItemsRemaining_Text4:: @ 8253AC4
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be seven more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F
+BattlePyramid_SixItemsRemaining_Text4:: @ 8253B1F
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be six more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78
+BattlePyramid_FiveItemsRemaining_Text4:: @ 8253B78
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be five more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2
+BattlePyramid_FourItemsRemaining_Text4:: @ 8253BD2
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be four more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C
+BattlePyramid_ThreeItemsRemaining_Text4:: @ 8253C2C
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be three more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87
+BattlePyramid_TwoItemsRemaining_Text4:: @ 8253C87
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be two more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0
+BattlePyramid_OneItemRemaining_Text4:: @ 8253CE0
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appears to be only one more\n"
 	.string "item on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E
+BattlePyramid_ZeroItemsRemaining_Text4:: @ 8253D3E
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be no more\n"
 	.string "items on the ground.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96
+BattlePyramid_EightItemsRemaining_Text5:: @ 8253D96
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are eight items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2
+BattlePyramid_SevenItemsRemaining_Text5:: @ 8253DD2
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are seven items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E
+BattlePyramid_SixItemsRemaining_Text5:: @ 8253E0E
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are six items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48
+BattlePyramid_FiveItemsRemaining_Text5:: @ 8253E48
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are five items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83
+BattlePyramid_FourItemsRemaining_Text5:: @ 8253E83
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are four items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE
+BattlePyramid_ThreeItemsRemaining_Text5:: @ 8253EBE
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are three items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA
+BattlePyramid_TwoItemsRemaining_Text5:: @ 8253EFA
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are two items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34
+BattlePyramid_OneItemRemaining_Text5:: @ 8253F34
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there is one item…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C
+BattlePyramid_ZeroItemsRemaining_Text5:: @ 8253F6C
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are no items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5
+BattlePyramid_EightItemsRemaining_Text6:: @ 8253FA5
 	.string "Have you collected any items?\p"
 	.string "I believe there are eight more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7
+BattlePyramid_SevenItemsRemaining_Text6:: @ 8253FF7
 	.string "Have you collected any items?\p"
 	.string "I believe there are seven more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049
+BattlePyramid_SixItemsRemaining_Text6:: @ 8254049
 	.string "Have you collected any items?\p"
 	.string "I believe there are six more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099
+BattlePyramid_FiveItemsRemaining_Text6:: @ 8254099
 	.string "Have you collected any items?\p"
 	.string "I believe there are five more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA
+BattlePyramid_FourItemsRemaining_Text6:: @ 82540EA
 	.string "Have you collected any items?\p"
 	.string "I believe there are four more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B
+BattlePyramid_ThreeItemsRemaining_Text6:: @ 825413B
 	.string "Have you collected any items?\p"
 	.string "I believe there are three more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D
+BattlePyramid_TwoItemsRemaining_Text6:: @ 825418D
 	.string "Have you collected any items?\p"
 	.string "I believe there are two more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD
+BattlePyramid_OneItemRemaining_Text6:: @ 82541DD
 	.string "Have you collected any items?\p"
 	.string "I believe there is one more\n"
 	.string "item on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B
+BattlePyramid_ZeroItemsRemaining_Text6:: @ 825422B
 	.string "Have you collected any items?\p"
 	.string "I believe there are no more\n"
 	.string "items on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A
+BattlePyramid_SevenTrainersRemaining_Text1:: @ 825427A
 	.string "You were really awesome!\p"
 	.string "But there are still seven tough\n"
 	.string "TRAINERS other than me!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB
+BattlePyramid_SixTrainersRemaining_Text1:: @ 82542CB
 	.string "You were really awesome!\p"
 	.string "But there are still six tough\n"
 	.string "TRAINERS other than me!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A
+BattlePyramid_FiveTrainersRemaining_Text1:: @ 825431A
 	.string "You were really awesome!\p"
 	.string "But there are still five tough\n"
 	.string "TRAINERS other than me!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A
+BattlePyramid_FourTrainersRemaining_Text1:: @ 825436A
 	.string "You were really awesome!\p"
 	.string "But there are still four tough\n"
 	.string "TRAINERS other than me!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA
+BattlePyramid_ThreeTrainersRemaining_Text1:: @ 82543BA
 	.string "You were really awesome!\p"
 	.string "But there are still three tough\n"
 	.string "TRAINERS other than me!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B
+BattlePyramid_TwoTrainersRemaining_Text1:: @ 825440B
 	.string "You were really awesome!\p"
 	.string "But there are still two tough\n"
 	.string "TRAINERS other than me!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A
+BattlePyramid_OneTrainersRemaining_Text1:: @ 825445A
 	.string "You were really awesome!\p"
 	.string "But there's still one tough\n"
 	.string "TRAINER other than me!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6
+BattlePyramid_ZeroTrainersRemaining_Text1:: @ 82544A6
 	.string "You were really awesome!\p"
 	.string "There's no one left that\n"
 	.string "can beat you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6
+BattlePyramid_SevenTrainersRemaining_Text2:: @ 82544E6
 	.string "This is so upsetting!\p"
 	.string "But there are seven TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538
+BattlePyramid_SixTrainersRemaining_Text2:: @ 8254538
 	.string "This is so upsetting!\p"
 	.string "But there are six TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588
+BattlePyramid_FiveTrainersRemaining_Text2:: @ 8254588
 	.string "This is so upsetting!\p"
 	.string "But there are five TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9
+BattlePyramid_FourTrainersRemaining_Text2:: @ 82545D9
 	.string "This is so upsetting!\p"
 	.string "But there are four TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A
+BattlePyramid_ThreeTrainersRemaining_Text2:: @ 825462A
 	.string "This is so upsetting!\p"
 	.string "But there are three TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C
+BattlePyramid_TwoTrainersRemaining_Text2:: @ 825467C
 	.string "This is so upsetting!\p"
 	.string "But there are two TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC
+BattlePyramid_OneTrainersRemaining_Text2:: @ 82546CC
 	.string "This is so upsetting!\p"
 	.string "But there's one TRAINER left!\n"
 	.string "I'm sure you will be humbled!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E
+BattlePyramid_ZeroTrainersRemaining_Text2:: @ 825471E
 	.string "This is so upsetting!\p"
 	.string "But there are no more TRAINERS\n"
 	.string "who can engage you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767
+BattlePyramid_SevenTrainersRemaining_Text3:: @ 8254767
 	.string "That's pretty impressive!\p"
 	.string "But there are seven more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9
+BattlePyramid_SixTrainersRemaining_Text3:: @ 82547C9
 	.string "That's pretty impressive!\p"
 	.string "But there are six more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829
+BattlePyramid_FiveTrainersRemaining_Text3:: @ 8254829
 	.string "That's pretty impressive!\p"
 	.string "But there are five more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A
+BattlePyramid_FourTrainersRemaining_Text3:: @ 825488A
 	.string "That's pretty impressive!\p"
 	.string "But there are four more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB
+BattlePyramid_ThreeTrainersRemaining_Text3:: @ 82548EB
 	.string "That's pretty impressive!\p"
 	.string "But there are three more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D
+BattlePyramid_TwoTrainersRemaining_Text3:: @ 825494D
 	.string "That's pretty impressive!\p"
 	.string "But there are two more TRAINERS\n"
 	.string "on this floor. Can you beat them both?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE
+BattlePyramid_OneTrainersRemaining_Text3:: @ 82549AE
 	.string "That's pretty impressive!\p"
 	.string "But there's still one more TRAINER\n"
 	.string "on this floor. Can you prevail?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B
+BattlePyramid_ZeroTrainersRemaining_Text3:: @ 8254A0B
 	.string "That's pretty impressive!\p"
 	.string "You've gone through all the TRAINERS\n"
 	.string "on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59
+BattlePyramid_SevenTrainersRemaining_Text4:: @ 8254A59
 	.string "Maybe you could sweep through\n"
 	.string "the seven TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E
+BattlePyramid_SixTrainersRemaining_Text4:: @ 8254A9E
 	.string "Maybe you could sweep through\n"
 	.string "the six TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1
+BattlePyramid_FiveTrainersRemaining_Text4:: @ 8254AE1
 	.string "Maybe you could sweep through\n"
 	.string "the five TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25
+BattlePyramid_FourTrainersRemaining_Text4:: @ 8254B25
 	.string "Maybe you could sweep through\n"
 	.string "the four TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69
+BattlePyramid_ThreeTrainersRemaining_Text4:: @ 8254B69
 	.string "Maybe you could sweep through\n"
 	.string "the three TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE
+BattlePyramid_TwoTrainersRemaining_Text4:: @ 8254BAE
 	.string "Maybe you could sweep through\n"
 	.string "the two TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1
+BattlePyramid_OneTrainersRemaining_Text4:: @ 8254BF1
 	.string "Maybe you could complete your sweep\n"
 	.string "with the one TRAINER left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E
+BattlePyramid_ZeroTrainersRemaining_Text4:: @ 8254C3E
 	.string "There isn't a single person left who\n"
 	.string "can defeat you now…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77
+BattlePyramid_SevenTrainersRemaining_Text5:: @ 8254C77
 	.string "You may have what it takes to beat\n"
 	.string "the seven expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0
+BattlePyramid_SixTrainersRemaining_Text5:: @ 8254CC0
 	.string "You may have what it takes to beat\n"
 	.string "the six expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07
+BattlePyramid_FiveTrainersRemaining_Text5:: @ 8254D07
 	.string "You may have what it takes to beat\n"
 	.string "the five expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F
+BattlePyramid_FourTrainersRemaining_Text5:: @ 8254D4F
 	.string "You may have what it takes to beat\n"
 	.string "the four expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97
+BattlePyramid_ThreeTrainersRemaining_Text5:: @ 8254D97
 	.string "You may have what it takes to beat\n"
 	.string "the three expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0
+BattlePyramid_TwoTrainersRemaining_Text5:: @ 8254DE0
 	.string "You may have what it takes to beat\n"
 	.string "the two expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27
+BattlePyramid_OneTrainersRemaining_Text5:: @ 8254E27
 	.string "You may have what it takes to beat\n"
 	.string "the one expert TRAINER who remains.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E
+BattlePyramid_ZeroTrainersRemaining_Text5:: @ 8254E6E
 	.string "Your skills are beyond reproach.\p"
 	.string "There are no more TRAINERS here\n"
 	.string "who have any chance of beating you.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3
+BattlePyramid_SevenTrainersRemaining_Text6:: @ 8254ED3
 	.string "Can you keep winning against\n"
 	.string "the seven remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E
+BattlePyramid_SixTrainersRemaining_Text6:: @ 8254F0E
 	.string "Can you keep winning against\n"
 	.string "the six remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47
+BattlePyramid_FiveTrainersRemaining_Text6:: @ 8254F47
 	.string "Can you keep winning against\n"
 	.string "the five remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81
+BattlePyramid_FourTrainersRemaining_Text6:: @ 8254F81
 	.string "Can you keep winning against\n"
 	.string "the four remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB
+BattlePyramid_ThreeTrainersRemaining_Text6:: @ 8254FBB
 	.string "Can you keep winning against\n"
 	.string "the three remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6
+BattlePyramid_TwoTrainersRemaining_Text6:: @ 8254FF6
 	.string "Can you keep winning against\n"
 	.string "the two remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F
+BattlePyramid_OneTrainersRemaining_Text6:: @ 825502F
 	.string "Can you keep winning against\n"
 	.string "the last remaining TRAINER?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068
+BattlePyramid_ZeroTrainersRemaining_Text6:: @ 8255068
 	.string "There aren't any TRAINERS left that\n"
 	.string "can take you on now…$"
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
deleted file mode 100644
index b70958fec..000000000
--- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
-	object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
-	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0
-
-BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
-	warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
-	bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42
-	bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95
-
-BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
-	map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
deleted file mode 100644
index 91d454fbe..000000000
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePyramidLobby: @ 84853F8
-	.4byte BattleFrontier_BattlePyramidLobby_Layout
-	.4byte BattleFrontier_BattlePyramidLobby_MapEvents
-	.4byte BattleFrontier_BattlePyramidLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_PYRAMID
-	.2byte 360
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
new file mode 100644
index 000000000..4f99b9488
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
@@ -0,0 +1,98 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
+  "name": "BattleFrontier_BattlePyramidLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
+  "music": "MUS_PYRAMID",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 7,
+      "y": 12,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 14,
+      "y": 13,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 2,
+      "y": 15,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 12,
+      "y": 16,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 17,
+      "elevation": 4,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 686a1bfb2..667c4847e 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716
-	map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735
-	map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB
 	.byte 0
 
 BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
@@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattlePyramidLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
@@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
 
 BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
 	lockall
-	applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidLobby_EventScript_250AF0
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc
deleted file mode 100644
index fbf4941ca..000000000
--- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
-	object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
-	coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
-
-BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
-	map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
deleted file mode 100644
index d58e1fe81..000000000
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePyramidTop: @ 8485430
-	.4byte BattleFrontier_BattlePyramidTop_Layout
-	.4byte BattleFrontier_BattlePyramidTop_MapEvents
-	.4byte BattleFrontier_BattlePyramidTop_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 378
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json
new file mode 100644
index 000000000..d73dc1692
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json
@@ -0,0 +1,57 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
+  "name": "BattleFrontier_BattlePyramidTop",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 17,
+      "y": 11,
+      "elevation": 6,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BRANDON",
+      "x": 17,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 9,
+      "elevation": 4,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_255256"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index d04fe23f2..39bb39f49 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
-	map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
-	map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E
-	map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
-	map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
 	.byte 0
 
 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
deleted file mode 100644
index 148e590af..000000000
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
-	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-
-BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
-	warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
-	warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
-
-BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828
-	map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
deleted file mode 100644
index 5aa95a63e..000000000
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom: @ 848521C
-	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_SATTOWER
-	.2byte 268
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
new file mode 100644
index 000000000..c8efe3399
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
+  "name": "BattleFrontier_BattleTowerBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index b89d2e061..6e3f0c8fa 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
-	map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62
-	map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B
 	.byte 0
 
 BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B
@@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
 	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6
 	waitmovement 0
 	playse SE_PIN
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6
 	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
deleted file mode 100644
index f83bee69d..000000000
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
-	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-
-BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
-	map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
deleted file mode 100644
index 34a8fae84..000000000
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom2: @ 8485318
-	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
-	.4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
-	.4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
-	.4byte 0x0
-	.2byte MUS_SATTOWER
-	.2byte 268
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json
new file mode 100644
index 000000000..698edcc65
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json
@@ -0,0 +1,99 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2",
+  "name": "BattleFrontier_BattleTowerBattleRoom2",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_E",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index 2699fe9d6..8ebb7ed25 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
-	map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
-	map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
-	map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
 	.byte 0
 
 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
deleted file mode 100644
index ae3ca2575..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
-
-BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
-	map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
deleted file mode 100644
index 8d920a8c8..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerCorridor: @ 8485200
-	.4byte BattleFrontier_BattleTowerCorridor_Layout
-	.4byte BattleFrontier_BattleTowerCorridor_MapEvents
-	.4byte BattleFrontier_BattleTowerCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_SATTOWER
-	.2byte 267
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json
new file mode 100644
index 000000000..5081edd82
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
+  "name": "BattleFrontier_BattleTowerCorridor",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
index 55e21dedb..cf0a50e98 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
-	map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
-	map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
+	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
 	.byte 0
 
 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
deleted file mode 100644
index f96f14916..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
-	map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
deleted file mode 100644
index 66255315f..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerCorridor2: @ 84852FC
-	.4byte BattleFrontier_BattleTowerCorridor2_Layout
-	.4byte BattleFrontier_BattleTowerCorridor2_MapEvents
-	.4byte BattleFrontier_BattleTowerCorridor2_MapScripts
-	.4byte 0x0
-	.2byte MUS_SATTOWER
-	.2byte 391
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json
new file mode 100644
index 000000000..de898bef4
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json
@@ -0,0 +1,73 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2",
+  "name": "BattleFrontier_BattleTowerCorridor2",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 14,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_E",
+      "x": 14,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
index 73b14fc2e..efab7be70 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
-	map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
-	map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
-	map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
 	.byte 0
 
 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
@@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
 	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
 	waitmovement 0
 	delay 40
-	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
-	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceUp
+	applymovement 2, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	opendoor 7, 1
 	waitdooranim
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc
deleted file mode 100644
index 671d6d434..000000000
--- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-
-BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790
-	map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
deleted file mode 100644
index f8d9ff853..000000000
--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerElevator: @ 84851E4
-	.4byte BattleElevator_Layout
-	.4byte BattleFrontier_BattleTowerElevator_MapEvents
-	.4byte BattleFrontier_BattleTowerElevator_MapScripts
-	.4byte 0x0
-	.2byte MUS_SATTOWER
-	.2byte 266
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json
new file mode 100644
index 000000000..f4cbd3590
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR",
+  "name": "BattleFrontier_BattleTowerElevator",
+  "layout": "LAYOUT_BATTLE_ELEVATOR",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
index 3dbd5eca3..0d07f5be2 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
-	map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
-	map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96
 	.byte 0
 
 BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
deleted file mode 100644
index 6a78eaee6..000000000
--- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
-	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER
-	object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
-	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
-	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
-	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
-
-BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710
-	warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM
-
-BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728
-	bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7
-	bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0
-	bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9
-	bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012
-	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE
-
-BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764
-	map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
deleted file mode 100644
index 989bffe9b..000000000
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerLobby: @ 84851C8
-	.4byte BattleFrontier_BattleTowerLobby_Layout
-	.4byte BattleFrontier_BattleTowerLobby_MapEvents
-	.4byte BattleFrontier_BattleTowerLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_SATTOWER
-	.2byte 264
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json
new file mode 100644
index 000000000..339b20b56
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json
@@ -0,0 +1,201 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+  "name": "BattleFrontier_BattleTowerLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 23,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 17,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 15,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_Apprentice",
+      "flag": "FLAG_HIDE_APPRENTICE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 18,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFC7"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFE0"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFF9"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23F012"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index e1bec2c21..6d53a33e1 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
-	map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690
-	map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694
-	map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
-	map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
 	.byte 0
 
 BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
@@ -231,7 +231,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930
-	setvar VAR_0x40BC, 1
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
@@ -300,12 +300,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
 	incrementgamestat 30
-	setvar VAR_0x40BC, 1
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
 	end
 
@@ -380,12 +380,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
 	end
 
@@ -461,12 +461,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
 	end
 
@@ -544,7 +544,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	setvar VAR_0x8004, 6
 	setvar VAR_0x8005, 0
 	special sub_8161F74
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
@@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
 
 BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 1
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
 
 BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
 
 BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 3
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -995,7 +995,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6
 
 BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
 	setvar VAR_0x8004, 6
@@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
 
 BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
 	setvar VAR_0x8004, 6
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
deleted file mode 100644
index 9f3977075..000000000
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
-
-BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
-	map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
deleted file mode 100644
index 23a792934..000000000
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_SATTOWER
-	.2byte 390
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
new file mode 100644
index 000000000..f3b080732
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
@@ -0,0 +1,138 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
+  "name": "BattleFrontier_BattleTowerMultiBattleRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 2,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 17,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index 7dbfbbc13..0bc74b1bd 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
-	map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7
-	map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0
-	map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14
-	map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23
 	.byte 0
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
@@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
 	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
 	waitmovement 0
 	moveobjectoffscreen 1
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT
 	special HealPlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	opendoor 10, 1
 	waitdooranim
diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc
deleted file mode 100644
index 78ef44109..000000000
--- a/data/maps/BattleFrontier_Lounge1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge1_EventObjects: @ 853CFB4
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0
-
-BattleFrontier_Lounge1_MapWarps: @ 853CFFC
-	warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge1_MapEvents:: @ 853D004
-	map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc
deleted file mode 100644
index 58caac903..000000000
--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge1: @ 84855B8
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_Lounge1_MapEvents
-	.4byte BattleFrontier_Lounge1_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 429
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json
new file mode 100644
index 000000000..8d4870f4f
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge1/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE1",
+  "name": "BattleFrontier_Lounge1",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 0,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge1_EventScript_25E775",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 7,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge1_EventScript_25E94D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge1_EventScript_25E956",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc
deleted file mode 100644
index cc32ddf42..000000000
--- a/data/maps/BattleFrontier_Lounge2/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_Lounge2_EventObjects: @ 853D11C
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0
-	object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0
-	object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0
-	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0
-
-BattleFrontier_Lounge2_MapWarps: @ 853D194
-	warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Lounge2_MapEvents:: @ 853D1A4
-	map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc
deleted file mode 100644
index effcc53bd..000000000
--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge2: @ 84855F0
-	.4byte BattleFrontier_Lounge1_Layout
-	.4byte BattleFrontier_Lounge2_MapEvents
-	.4byte BattleFrontier_Lounge2_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 397
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json
new file mode 100644
index 000000000..e2ace0b93
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge2/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE2",
+  "name": "BattleFrontier_Lounge2",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge2_EventScript_260643",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge2_EventScript_26073C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 10,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge2_EventScript_260747",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F",
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge2_EventScript_26075D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 10,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge2_EventScript_260752",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc
deleted file mode 100644
index bce1dfa35..000000000
--- a/data/maps/BattleFrontier_Lounge3/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Lounge3_EventObjects: @ 853D1B8
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0
-	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0
-
-BattleFrontier_Lounge3_MapWarps: @ 853D230
-	warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge3_MapEvents:: @ 853D238
-	map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc
deleted file mode 100644
index d6867551e..000000000
--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge3: @ 848560C
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_Lounge3_MapEvents
-	.4byte BattleFrontier_Lounge3_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 429
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json
new file mode 100644
index 000000000..5ff702a86
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge3/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE3",
+  "name": "BattleFrontier_Lounge3",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge3_EventScript_261D83",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge3_EventScript_261FE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge3_EventScript_261FC1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 5,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge3_EventScript_261FD1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 0,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge3_EventScript_261FB8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index 6a817d50a..7977e75b4 100644
--- a/data/maps/BattleFrontier_Lounge3/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
@@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1
 
 BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1
 	closemessage
-	applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc
deleted file mode 100644
index 8b86bebc7..000000000
--- a/data/maps/BattleFrontier_Lounge4/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge4_EventObjects: @ 853D24C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0
-	object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0
-
-BattleFrontier_Lounge4_MapWarps: @ 853D294
-	warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Lounge4_MapEvents:: @ 853D29C
-	map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc
deleted file mode 100644
index 912cc41ff..000000000
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge4: @ 8485628
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_Lounge4_MapEvents
-	.4byte BattleFrontier_Lounge4_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 429
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json
new file mode 100644
index 000000000..b67d3bb07
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge4/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE4",
+  "name": "BattleFrontier_Lounge4",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge4_EventScript_26358D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_COOK",
+      "x": 6,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge4_EventScript_263596",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 0,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge4_EventScript_26359F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc
deleted file mode 100644
index 216a72473..000000000
--- a/data/maps/BattleFrontier_Lounge5/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Lounge5_EventObjects: @ 853D2EC
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0
-
-BattleFrontier_Lounge5_MapWarps: @ 853D34C
-	warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge5_MapEvents:: @ 853D35C
-	map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc
deleted file mode 100644
index a6febc0c8..000000000
--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge5: @ 8485660
-	.4byte BattleFrontier_Lounge1_Layout
-	.4byte BattleFrontier_Lounge5_MapEvents
-	.4byte BattleFrontier_Lounge5_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 397
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json
new file mode 100644
index 000000000..698569d9b
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge5/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE5",
+  "name": "BattleFrontier_Lounge5",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 12,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge5_EventScript_2645C6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge5_EventScript_264617",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge5_EventScript_264620",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 11,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge5_EventScript_264629",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc
deleted file mode 100644
index 24d7958ec..000000000
--- a/data/maps/BattleFrontier_Lounge6/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-BattleFrontier_Lounge6_EventObjects: @ 853D370
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0
-
-BattleFrontier_Lounge6_MapWarps: @ 853D388
-	warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge6_MapEvents:: @ 853D390
-	map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc
deleted file mode 100644
index 151890a14..000000000
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge6: @ 848567C
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_Lounge6_MapEvents
-	.4byte BattleFrontier_Lounge6_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 429
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json
new file mode 100644
index 000000000..1ecbec9f8
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge6/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE6",
+  "name": "BattleFrontier_Lounge6",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge6_EventScript_264FED",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc
deleted file mode 100644
index de4aef12a..000000000
--- a/data/maps/BattleFrontier_Lounge7/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_Lounge7_EventObjects: @ 853D3A4
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0
-	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0
-
-BattleFrontier_Lounge7_MapWarps: @ 853D404
-	warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Lounge7_MapEvents:: @ 853D40C
-	map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc
deleted file mode 100644
index 061d2102c..000000000
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge7: @ 8485698
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_Lounge7_MapEvents
-	.4byte BattleFrontier_Lounge7_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 429
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json
new file mode 100644
index 000000000..da866ea72
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge7/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE7",
+  "name": "BattleFrontier_Lounge7",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 0,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge7_EventScript_2656DB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 2,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge7_EventScript_265255",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge7_EventScript_265445",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 8,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge7_EventScript_2656E4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc
deleted file mode 100644
index c8edc68aa..000000000
--- a/data/maps/BattleFrontier_Lounge8/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge8_EventObjects: @ 853D4BC
-	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0
-
-BattleFrontier_Lounge8_MapWarps: @ 853D504
-	warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge8_MapEvents:: @ 853D50C
-	map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc
deleted file mode 100644
index e1b319e1d..000000000
--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge8: @ 84856D0
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_Lounge8_MapEvents
-	.4byte BattleFrontier_Lounge8_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 429
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json
new file mode 100644
index 000000000..ff2bd2361
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge8/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE8",
+  "name": "BattleFrontier_Lounge8",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge8_EventScript_2676DC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 8,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge8_EventScript_2676CA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Lounge8_EventScript_2676D3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc
deleted file mode 100644
index 6598e0229..000000000
--- a/data/maps/BattleFrontier_Lounge9/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_Lounge9_EventObjects: @ 853D520
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_Lounge9_MapWarps: @ 853D538
-	warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge9_MapEvents:: @ 853D548
-	map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc
deleted file mode 100644
index 916feb569..000000000
--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Lounge9: @ 84856EC
-	.4byte BattleFrontier_Lounge2_Layout
-	.4byte BattleFrontier_Lounge9_MapEvents
-	.4byte BattleFrontier_Lounge9_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 429
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json
new file mode 100644
index 000000000..9f0a56ba0
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge9/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_LOUNGE9",
+  "name": "BattleFrontier_Lounge9",
+  "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 6,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 2,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc
deleted file mode 100644
index 9e57319f0..000000000
--- a/data/maps/BattleFrontier_Mart/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Mart_EventObjects: @ 853D68C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0
-
-BattleFrontier_Mart_MapWarps: @ 853D6EC
-	warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Mart_MapEvents:: @ 853D6FC
-	map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc
deleted file mode 100644
index 7dcfb9d33..000000000
--- a/data/maps/BattleFrontier_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_Mart: @ 8485740
-	.4byte Mart_Layout
-	.4byte BattleFrontier_Mart_MapEvents
-	.4byte BattleFrontier_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json
new file mode 100644
index 000000000..46f6de9af
--- /dev/null
+++ b/data/maps/BattleFrontier_Mart/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_MART",
+  "name": "BattleFrontier_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Mart_EventScript_267ACC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Mart_EventScript_267B0B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Mart_EventScript_267B02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_Mart_EventScript_267B20",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc
index 725fce863..d84b2cb0a 100644
--- a/data/maps/BattleFrontier_Mart/scripts.inc
+++ b/data/maps/BattleFrontier_Mart/scripts.inc
@@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02
 
 BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B
 	lock
-	applymovement 2, BattleFrontier_Mart_Movement_2725B0
+	applymovement 2, Common_Movement_FaceDown
 	waitmovement 0
 	msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc
deleted file mode 100644
index 5a2d13f7f..000000000
--- a/data/maps/BattleFrontier_OutsideEast/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4
-	connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_OutsideEast_MapConnections: @ 8486EF0
-	.4byte 0x1
-	.4byte BattleFrontier_OutsideEast_MapConnectionsList
-
diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc
deleted file mode 100644
index a16bca779..000000000
--- a/data/maps/BattleFrontier_OutsideEast/events.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-BattleFrontier_OutsideEast_EventObjects: @ 853BB10
-	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0
-	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0
-	object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0
-	object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0
-	object_event 7, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0
-	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0
-	object_event 9, EVENT_OBJ_GFX_RICH_BOY, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0
-	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0
-	object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0
-	object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0
-	object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0
-	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
-	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0
-	object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0
-	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_3, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0
-	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0
-	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0
-	object_event 24, EVENT_OBJ_GFX_OLD_WOMAN, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0
-	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0
-	object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0
-
-BattleFrontier_OutsideEast_MapWarps: @ 853BD80
-	warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
-	warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY
-	warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
-	warp_def 58, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY
-	warp_def 35, 12, 3, 0, MAP_BATTLE_FRONTIER_RANKING_HALL
-	warp_def 4, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE1
-	warp_def 10, 28, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER
-	warp_def 22, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE5
-	warp_def 5, 8, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE6
-	warp_def 65, 31, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE3
-	warp_def 14, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE8
-	warp_def 21, 45, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE9
-	warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F
-	warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F
-
-BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0
-	bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43
-	bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C
-	bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55
-	bg_event 62, 15, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C5E
-	bg_event 7, 29, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DD7
-	bg_event 32, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DCE
-	bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73
-	bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73
-
-BattleFrontier_OutsideEast_MapEvents:: @ 853BE50
-	map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc
deleted file mode 100644
index b67df4029..000000000
--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_OutsideEast: @ 84852C4
-	.4byte BattleFrontier_OutsideEast_Layout
-	.4byte BattleFrontier_OutsideEast_MapEvents
-	.4byte BattleFrontier_OutsideEast_MapScripts
-	.4byte BattleFrontier_OutsideEast_MapConnections
-	.2byte MUS_B_FRONTIER
-	.2byte 345
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json
new file mode 100644
index 000000000..341b20321
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideEast/map.json
@@ -0,0 +1,529 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+  "name": "BattleFrontier_OutsideEast",
+  "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST",
+  "music": "MUS_B_FRONTIER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 20,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C67",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 42,
+      "y": 15,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C70",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 53,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 2,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C79",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 54,
+      "y": 16,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C82",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 37,
+      "y": 32,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_COOK",
+      "x": 41,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C94",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 8,
+      "y": 46,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242CBB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M",
+      "x": 34,
+      "y": 41,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242CE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 45,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242CB2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F",
+      "x": 59,
+      "y": 35,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 6,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242CC4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 18,
+      "y": 40,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242CCD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 17,
+      "y": 40,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242CD6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 40,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C9F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SUDOWOODO",
+      "x": 54,
+      "y": 62,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242CEA",
+      "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 42,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242D79",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 51,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242D82",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 62,
+      "y": 18,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT",
+      "movement_range_x": 2,
+      "movement_range_y": 6,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242D8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 11,
+      "y": 21,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242D94",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 10,
+      "y": 21,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242D9D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 16,
+      "y": 30,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 3,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DA6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 33,
+      "y": 14,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DAF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 54,
+      "y": 31,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DB8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 54,
+      "y": 32,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DC3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 58,
+      "y": 55,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DE9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 48,
+      "y": 41,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DE0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 29,
+      "y": 14,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideEast_EventScript_242E08",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 39,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 45,
+      "y": 56,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 58,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 35,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_RANKING_HALL",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 44,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 51,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE6",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 65,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 51,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE8",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 21,
+      "y": 45,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE9",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 51,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 28,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ARTISAN_CAVE_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 17,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C43"
+    },
+    {
+      "type": "sign",
+      "x": 43,
+      "y": 56,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C4C"
+    },
+    {
+      "type": "sign",
+      "x": 36,
+      "y": 34,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C55"
+    },
+    {
+      "type": "sign",
+      "x": 62,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideEast_EventScript_242C5E"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 29,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DD7"
+    },
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 13,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideEast_EventScript_242DCE"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index 9a90f23f9..5c1af6700 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
-	map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F
-	map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D
 	.byte 0
 
 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
@@ -10,12 +10,12 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
 BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
 	end
diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc
deleted file mode 100644
index 1d20172f2..000000000
--- a/data/maps/BattleFrontier_OutsideWest/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0
-	connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_OutsideWest_MapConnections: @ 8486EDC
-	.4byte 0x1
-	.4byte BattleFrontier_OutsideWest_MapConnectionsList
-
diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc
deleted file mode 100644
index de372832f..000000000
--- a/data/maps/BattleFrontier_OutsideWest/events.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-BattleFrontier_OutsideWest_EventObjects: @ 853B350
-	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0
-	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0
-	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0
-	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0
-	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0
-	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0
-	object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0
-	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0
-	object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0
-	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0
-	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0
-	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0
-	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0
-	object_event 22, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0
-	object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0
-	object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0
-
-BattleFrontier_OutsideWest_MapWarps: @ 853B590
-	warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
-	warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY
-	warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY
-	warp_def 45, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE2
-	warp_def 51, 51, 0, 0, MAP_BATTLE_FRONTIER_MART
-	warp_def 44, 5, 0, 0, MAP_BATTLE_FRONTIER_SCOTTS_HOUSE
-	warp_def 53, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE4
-	warp_def 5, 20, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE7
-	warp_def 26, 65, 0, 0, MAP_BATTLE_FRONTIER_RECEPTION_GATE
-	warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE
-	warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F
-
-BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8
-	bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2
-	bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4
-	bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB
-	bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A
-	bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A
-
-BattleFrontier_OutsideWest_MapEvents:: @ 853B624
-	map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc
deleted file mode 100644
index 312c1961a..000000000
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_OutsideWest: @ 84851AC
-	.4byte BattleFrontier_OutsideWest_Layout
-	.4byte BattleFrontier_OutsideWest_MapEvents
-	.4byte BattleFrontier_OutsideWest_MapScripts
-	.4byte BattleFrontier_OutsideWest_MapConnections
-	.2byte MUS_B_FRONTIER
-	.2byte 265
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json
new file mode 100644
index 000000000..a2972e0b4
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideWest/map.json
@@ -0,0 +1,458 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+  "name": "BattleFrontier_OutsideWest",
+  "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST",
+  "music": "MUS_B_FRONTIER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 26,
+      "y": 38,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D50F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
+      "x": 20,
+      "y": 70,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 19,
+      "y": 68,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D3F0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 26,
+      "y": 20,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 8,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D68B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 27,
+      "y": 30,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D52D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 33,
+      "y": 41,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D69D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 28,
+      "y": 43,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D6A6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 17,
+      "y": 20,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D679",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 13,
+      "y": 44,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D536",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 14,
+      "y": 44,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D53D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 23,
+      "y": 47,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D694",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 38,
+      "y": 27,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D5C6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 45,
+      "y": 18,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D635",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 9,
+      "y": 47,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D57F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 35,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D682",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 11,
+      "y": 66,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_249E19",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 31,
+      "y": 31,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D667",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 42,
+      "y": 48,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D518",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 38,
+      "y": 22,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D6AF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 12,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D6B8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 12,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D6C3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 11,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D6CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D6D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 4,
+      "y": 26,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D6EE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 42,
+      "y": 27,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 45,
+      "y": 44,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 51,
+      "y": 51,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 44,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 53,
+      "y": 44,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE7",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 65,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 61,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 39,
+      "y": 55,
+      "elevation": 0,
+      "dest_map": "MAP_ARTISAN_CAVE_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D4E2"
+    },
+    {
+      "type": "sign",
+      "x": 45,
+      "y": 30,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D4F4"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 43,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideWest_EventScript_23D4EB"
+    },
+    {
+      "type": "sign",
+      "x": 52,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 53,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Common_EventScript_ShowPokemartSign"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc
index da5724259..2d2bdb1c0 100644
--- a/data/maps/BattleFrontier_OutsideWest/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
@@ -1,9 +1,9 @@
 BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
-	map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7
 	.byte 0
 
 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	end
 
@@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
 
 BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
 	closemessage
-	applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
 	faceplayer
 	message BattleFrontier_OutsideWest_Text_23DA60
 	waitmessage
-	applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0
+	applymovement 18, Common_Movement_FaceAwayPlayer
 	waitmovement 0
 	waitbuttonpress
 	release
@@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
-	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
-	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4
+	applymovement 10, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
 	closemessage
 	delay 25
-	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6
-	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6
+	applymovement 9, Common_Movement_WalkInPlaceUp
+	applymovement 10, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	release
 	end
@@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
-	applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6
+	applymovement 14, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
@@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT
 	closemessage
-	applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2
+	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
deleted file mode 100644
index 5f2782f0f..000000000
--- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0
-	object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0
-
-BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
-	warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F
-
-BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC
-	map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
deleted file mode 100644
index dcf26742c..000000000
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_PokemonCenter_1F: @ 8485708
-	.4byte PokemonCenter_1F_Layout
-	.4byte BattleFrontier_PokemonCenter_1F_MapEvents
-	.4byte BattleFrontier_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..8f8153c08
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
+  "name": "BattleFrontier_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SKITTY",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 42c6db053..c99a0de38 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
-	map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904
-	map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
deleted file mode 100644
index 75bd2ebbb..000000000
--- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
-	warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678
-	map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
deleted file mode 100644
index 6bcff1234..000000000
--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_PokemonCenter_2F: @ 8485724
-	.4byte PokemonCenter_2F_Layout
-	.4byte BattleFrontier_PokemonCenter_2F_MapEvents
-	.4byte BattleFrontier_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..caa6fed8a
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
+  "name": "BattleFrontier_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
index 7d3c3a2f1..c6ae8da2a 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
-	map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9
diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc
deleted file mode 100644
index abec40c17..000000000
--- a/data/maps/BattleFrontier_RankingHall/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-BattleFrontier_RankingHall_EventObjects: @ 853CEB8
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0
-	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0
-
-BattleFrontier_RankingHall_MapWarps: @ 853CF00
-	warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_RankingHall_MapBGEvents: @ 853CF10
-	bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA
-	bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6
-	bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2
-	bg_event 29, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4CE
-	bg_event 42, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4DA
-	bg_event 46, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4E6
-	bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4F2
-	bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4FE
-	bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E50A
-	bg_event 44, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E516
-	bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538
-	bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541
-
-BattleFrontier_RankingHall_MapEvents:: @ 853CFA0
-	map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc
deleted file mode 100644
index 03d9e3622..000000000
--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_RankingHall: @ 848559C
-	.4byte BattleFrontier_RankingHall_Layout
-	.4byte BattleFrontier_RankingHall_MapEvents
-	.4byte BattleFrontier_RankingHall_MapScripts
-	.4byte 0x0
-	.2byte MUS_BIJYUTU
-	.2byte 396
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json
new file mode 100644
index 000000000..af28ecea6
--- /dev/null
+++ b/data/maps/BattleFrontier_RankingHall/map.json
@@ -0,0 +1,172 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_RANKING_HALL",
+  "name": "BattleFrontier_RankingHall",
+  "layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL",
+  "music": "MUS_BIJYUTU",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 24,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_RankingHall_EventScript_25E52F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_RankingHall_EventScript_25E54A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 44,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_RankingHall_EventScript_25E573",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 26,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 27,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 26,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4AA"
+    },
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4B6"
+    },
+    {
+      "type": "sign",
+      "x": 26,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4C2"
+    },
+    {
+      "type": "sign",
+      "x": 29,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4CE"
+    },
+    {
+      "type": "sign",
+      "x": 42,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4DA"
+    },
+    {
+      "type": "sign",
+      "x": 46,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4E6"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4F2"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E4FE"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E50A"
+    },
+    {
+      "type": "sign",
+      "x": 44,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_RankingHall_EventScript_25E516"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_RankingHall_EventScript_25E538"
+    },
+    {
+      "type": "sign",
+      "x": 36,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_RankingHall_EventScript_25E541"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc
deleted file mode 100644
index 551cb802f..000000000
--- a/data/maps/BattleFrontier_ReceptionGate/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_ReceptionGate_EventObjects: @ 853D420
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0
-	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT
-	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0
-
-BattleFrontier_ReceptionGate_MapWarps: @ 853D498
-	warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8
-	map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc
deleted file mode 100644
index 099ab38e1..000000000
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_ReceptionGate: @ 84856B4
-	.4byte BattleFrontier_ReceptionGate_Layout
-	.4byte BattleFrontier_ReceptionGate_MapEvents
-	.4byte BattleFrontier_ReceptionGate_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 399
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json
new file mode 100644
index 000000000..db140442e
--- /dev/null
+++ b/data/maps/BattleFrontier_ReceptionGate/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
+  "name": "BattleFrontier_ReceptionGate",
+  "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 0,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_ReceptionGate_EventScript_2662FC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 8,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_ReceptionGate_EventScript_266310",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_ReceptionGate_EventScript_266436",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 0,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_ReceptionGate_EventScript_2664F4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 5ed97bd60..8ce438d75 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
-	map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9
-	map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5
 	.byte 0
 
 BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
@@ -8,16 +8,16 @@ BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
 	end
 
 BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
-	map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
+	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
 	.2byte 0
 
 BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
 	lockall
-	setvar VAR_0x40D0, 1
+	setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1
 	playse SE_PIN
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT
 	closemessage
@@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
 	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
 	msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement 2, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_272598
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
+	applymovement 2, Common_Movement_ExclamationMark
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
 	msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc
deleted file mode 100644
index 3f4dcff86..000000000
--- a/data/maps/BattleFrontier_ScottsHouse/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0
-	object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0
-
-BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8
-	warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8
-	map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc
deleted file mode 100644
index fe55f8272..000000000
--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_ScottsHouse: @ 8485644
-	.4byte BattleFrontier_ScottsHouse_Layout
-	.4byte BattleFrontier_ScottsHouse_MapEvents
-	.4byte BattleFrontier_ScottsHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 430
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json
new file mode 100644
index 000000000..bff7696b3
--- /dev/null
+++ b/data/maps/BattleFrontier_ScottsHouse/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
+  "name": "BattleFrontier_ScottsHouse",
+  "layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_ScottsHouse_EventScript_2636A8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index 6f8d6ee4b..52863d474 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -181,14 +181,14 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
 	compare VAR_FACING, 3
 	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
 	msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
-	compare VAR_0x40D1, 13
+	compare VAR_SCOTT_STATE, 13
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC
-	compare VAR_0x40D1, 9
+	compare VAR_SCOTT_STATE, 9
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB
-	compare VAR_0x40D1, 6
+	compare VAR_SCOTT_STATE, 6
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA
 	goto BattleFrontier_ScottsHouse_EventScript_2639E9
 	end
@@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
 	end
 
 BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc
deleted file mode 100644
index cf5cfc1af..000000000
--- a/data/maps/BattlePyramidSquare01/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare01_EventObjects: @ 853A460
-	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare01_MapEvents:: @ 853A508
-	map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc
deleted file mode 100644
index d9105ed4a..000000000
--- a/data/maps/BattlePyramidSquare01/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare01: @ 8484F60
-	.4byte BattlePyramidSquare01_Layout
-	.4byte BattlePyramidSquare01_MapEvents
-	.4byte BattlePyramidSquare01_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 362
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json
new file mode 100644
index 000000000..d4cbfd71d
--- /dev/null
+++ b/data/maps/BattlePyramidSquare01/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE01",
+  "name": "BattlePyramidSquare01",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 2,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 5,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 2,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 6,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc
deleted file mode 100644
index ad621d684..000000000
--- a/data/maps/BattlePyramidSquare02/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare02_EventObjects: @ 853A51C
-	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare02_MapEvents:: @ 853A5C4
-	map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc
deleted file mode 100644
index cebb14906..000000000
--- a/data/maps/BattlePyramidSquare02/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare02: @ 8484F7C
-	.4byte BattlePyramidSquare02_Layout
-	.4byte BattlePyramidSquare02_MapEvents
-	.4byte BattlePyramidSquare02_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 363
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json
new file mode 100644
index 000000000..e68b71284
--- /dev/null
+++ b/data/maps/BattlePyramidSquare02/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE02",
+  "name": "BattlePyramidSquare02",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 2,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 5,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 2,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 5,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc
deleted file mode 100644
index 8eb81b96a..000000000
--- a/data/maps/BattlePyramidSquare03/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare03_EventObjects: @ 853A5D8
-	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare03_MapEvents:: @ 853A680
-	map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc
deleted file mode 100644
index 389cd6538..000000000
--- a/data/maps/BattlePyramidSquare03/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare03: @ 8484F98
-	.4byte BattlePyramidSquare03_Layout
-	.4byte BattlePyramidSquare03_MapEvents
-	.4byte BattlePyramidSquare03_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 364
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json
new file mode 100644
index 000000000..8a495158e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare03/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE03",
+  "name": "BattlePyramidSquare03",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 2,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 6,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 6,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 3,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc
deleted file mode 100644
index 79caf09ff..000000000
--- a/data/maps/BattlePyramidSquare04/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare04_EventObjects: @ 853A694
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare04_MapEvents:: @ 853A73C
-	map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc
deleted file mode 100644
index 3b09fce2e..000000000
--- a/data/maps/BattlePyramidSquare04/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare04: @ 8484FB4
-	.4byte BattlePyramidSquare04_Layout
-	.4byte BattlePyramidSquare04_MapEvents
-	.4byte BattlePyramidSquare04_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 365
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json
new file mode 100644
index 000000000..e413a7e5f
--- /dev/null
+++ b/data/maps/BattlePyramidSquare04/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE04",
+  "name": "BattlePyramidSquare04",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 7,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 7,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 1,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 6,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc
deleted file mode 100644
index 472178c56..000000000
--- a/data/maps/BattlePyramidSquare05/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare05_EventObjects: @ 853A750
-	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare05_MapEvents:: @ 853A7F8
-	map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc
deleted file mode 100644
index ec6eff68c..000000000
--- a/data/maps/BattlePyramidSquare05/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare05: @ 8484FD0
-	.4byte BattlePyramidSquare05_Layout
-	.4byte BattlePyramidSquare05_MapEvents
-	.4byte BattlePyramidSquare05_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 366
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json
new file mode 100644
index 000000000..d16a87646
--- /dev/null
+++ b/data/maps/BattlePyramidSquare05/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE05",
+  "name": "BattlePyramidSquare05",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 6,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 3,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 3,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 6,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc
deleted file mode 100644
index 3363f6d43..000000000
--- a/data/maps/BattlePyramidSquare06/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare06_EventObjects: @ 853A80C
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare06_MapEvents:: @ 853A8B4
-	map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc
deleted file mode 100644
index 7890c3088..000000000
--- a/data/maps/BattlePyramidSquare06/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare06: @ 8484FEC
-	.4byte BattlePyramidSquare06_Layout
-	.4byte BattlePyramidSquare06_MapEvents
-	.4byte BattlePyramidSquare06_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 367
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json
new file mode 100644
index 000000000..ddf011814
--- /dev/null
+++ b/data/maps/BattlePyramidSquare06/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE06",
+  "name": "BattlePyramidSquare06",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 5,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 2,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 5,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 2,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc
deleted file mode 100644
index 8d63fc4e1..000000000
--- a/data/maps/BattlePyramidSquare07/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare07_EventObjects: @ 853A8C8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare07_MapEvents:: @ 853A970
-	map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc
deleted file mode 100644
index 7f1bb51f1..000000000
--- a/data/maps/BattlePyramidSquare07/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare07: @ 8485008
-	.4byte BattlePyramidSquare07_Layout
-	.4byte BattlePyramidSquare07_MapEvents
-	.4byte BattlePyramidSquare07_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 368
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json
new file mode 100644
index 000000000..8719c6d25
--- /dev/null
+++ b/data/maps/BattlePyramidSquare07/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE07",
+  "name": "BattlePyramidSquare07",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 0,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 4,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 6,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 4,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc
deleted file mode 100644
index 77ed5da6b..000000000
--- a/data/maps/BattlePyramidSquare08/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare08_EventObjects: @ 853A984
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare08_MapEvents:: @ 853AA2C
-	map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc
deleted file mode 100644
index a5d641519..000000000
--- a/data/maps/BattlePyramidSquare08/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare08: @ 8485024
-	.4byte BattlePyramidSquare08_Layout
-	.4byte BattlePyramidSquare08_MapEvents
-	.4byte BattlePyramidSquare08_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 369
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json
new file mode 100644
index 000000000..54cfa4fe8
--- /dev/null
+++ b/data/maps/BattlePyramidSquare08/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE08",
+  "name": "BattlePyramidSquare08",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 1,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 6,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 1,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 6,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc
deleted file mode 100644
index 0fd84a8c5..000000000
--- a/data/maps/BattlePyramidSquare09/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare09_EventObjects: @ 853AA40
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare09_MapEvents:: @ 853AAE8
-	map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc
deleted file mode 100644
index d396c65a6..000000000
--- a/data/maps/BattlePyramidSquare09/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare09: @ 8485040
-	.4byte BattlePyramidSquare09_Layout
-	.4byte BattlePyramidSquare09_MapEvents
-	.4byte BattlePyramidSquare09_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 370
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json
new file mode 100644
index 000000000..67b9ceb1f
--- /dev/null
+++ b/data/maps/BattlePyramidSquare09/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE09",
+  "name": "BattlePyramidSquare09",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 3,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 6,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 6,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 3,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc
deleted file mode 100644
index b697a7d02..000000000
--- a/data/maps/BattlePyramidSquare10/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare10_EventObjects: @ 853AAFC
-	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare10_MapEvents:: @ 853ABA4
-	map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc
deleted file mode 100644
index 254c24708..000000000
--- a/data/maps/BattlePyramidSquare10/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare10: @ 848505C
-	.4byte BattlePyramidSquare10_Layout
-	.4byte BattlePyramidSquare10_MapEvents
-	.4byte BattlePyramidSquare10_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 371
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json
new file mode 100644
index 000000000..0a5e88bf7
--- /dev/null
+++ b/data/maps/BattlePyramidSquare10/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE10",
+  "name": "BattlePyramidSquare10",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 3,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 6,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 0,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc
deleted file mode 100644
index e90e691e5..000000000
--- a/data/maps/BattlePyramidSquare11/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare11_EventObjects: @ 853ABB8
-	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare11_MapEvents:: @ 853AC60
-	map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc
deleted file mode 100644
index 765b74a0a..000000000
--- a/data/maps/BattlePyramidSquare11/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare11: @ 8485078
-	.4byte BattlePyramidSquare11_Layout
-	.4byte BattlePyramidSquare11_MapEvents
-	.4byte BattlePyramidSquare11_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 372
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json
new file mode 100644
index 000000000..5dc7736a3
--- /dev/null
+++ b/data/maps/BattlePyramidSquare11/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE11",
+  "name": "BattlePyramidSquare11",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 3,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 3,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 6,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 6,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc
deleted file mode 100644
index cad871e8d..000000000
--- a/data/maps/BattlePyramidSquare12/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare12_EventObjects: @ 853AC74
-	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare12_MapEvents:: @ 853AD1C
-	map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc
deleted file mode 100644
index e81801a35..000000000
--- a/data/maps/BattlePyramidSquare12/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare12: @ 8485094
-	.4byte BattlePyramidSquare12_Layout
-	.4byte BattlePyramidSquare12_MapEvents
-	.4byte BattlePyramidSquare12_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 373
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json
new file mode 100644
index 000000000..dcb57812d
--- /dev/null
+++ b/data/maps/BattlePyramidSquare12/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE12",
+  "name": "BattlePyramidSquare12",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 7,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 0,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 3,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 3,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc
deleted file mode 100644
index af56598c3..000000000
--- a/data/maps/BattlePyramidSquare13/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare13_EventObjects: @ 853AD30
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare13_MapEvents:: @ 853ADD8
-	map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc
deleted file mode 100644
index 356063c35..000000000
--- a/data/maps/BattlePyramidSquare13/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare13: @ 84850B0
-	.4byte BattlePyramidSquare13_Layout
-	.4byte BattlePyramidSquare13_MapEvents
-	.4byte BattlePyramidSquare13_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 374
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json
new file mode 100644
index 000000000..d277c5b1b
--- /dev/null
+++ b/data/maps/BattlePyramidSquare13/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE13",
+  "name": "BattlePyramidSquare13",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 5,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 5,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 1,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc
deleted file mode 100644
index f2d28d456..000000000
--- a/data/maps/BattlePyramidSquare14/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare14_EventObjects: @ 853ADEC
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare14_MapEvents:: @ 853AE94
-	map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc
deleted file mode 100644
index 76ae3925c..000000000
--- a/data/maps/BattlePyramidSquare14/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare14: @ 84850CC
-	.4byte BattlePyramidSquare14_Layout
-	.4byte BattlePyramidSquare14_MapEvents
-	.4byte BattlePyramidSquare14_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 375
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json
new file mode 100644
index 000000000..5727356ed
--- /dev/null
+++ b/data/maps/BattlePyramidSquare14/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE14",
+  "name": "BattlePyramidSquare14",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 7,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 1,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 6,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 0,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc
deleted file mode 100644
index 2556030e3..000000000
--- a/data/maps/BattlePyramidSquare15/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare15_EventObjects: @ 853AEA8
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare15_MapEvents:: @ 853AF50
-	map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc
deleted file mode 100644
index 57e45e1b2..000000000
--- a/data/maps/BattlePyramidSquare15/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare15: @ 84850E8
-	.4byte BattlePyramidSquare15_Layout
-	.4byte BattlePyramidSquare15_MapEvents
-	.4byte BattlePyramidSquare15_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 376
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json
new file mode 100644
index 000000000..62c7e34f3
--- /dev/null
+++ b/data/maps/BattlePyramidSquare15/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE15",
+  "name": "BattlePyramidSquare15",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 2,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 2,
+      "y": 1,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 6,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 6,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc
deleted file mode 100644
index e08cb110e..000000000
--- a/data/maps/BattlePyramidSquare16/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare16_EventObjects: @ 853AF64
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-
-BattlePyramidSquare16_MapEvents:: @ 853B00C
-	map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc
deleted file mode 100644
index 24aa3edcc..000000000
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattlePyramidSquare16: @ 8485104
-	.4byte BattlePyramidSquare16_Layout
-	.4byte BattlePyramidSquare16_MapEvents
-	.4byte BattlePyramidSquare16_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 377
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json
new file mode 100644
index 000000000..a69a0ed5a
--- /dev/null
+++ b/data/maps/BattlePyramidSquare16/map.json
@@ -0,0 +1,112 @@
+{
+  "id": "MAP_BATTLE_PYRAMID_SQUARE16",
+  "name": "BattlePyramidSquare16",
+  "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 0,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 1,
+      "y": 0,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 6,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 6,
+      "y": 0,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BattlePyramid_TrainerBattle",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 2,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattlePyramid_FindItemBall",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc
deleted file mode 100644
index c5a485f9a..000000000
--- a/data/maps/BirthIsland_Exterior/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BirthIsland_Exterior_EventObjects: @ 853D7DC
-	object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
-	object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS
-
-BirthIsland_Exterior_MapWarps: @ 853D80C
-	warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR
-
-BirthIsland_Exterior_MapEvents:: @ 853D814
-	map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc
deleted file mode 100644
index c6b02f600..000000000
--- a/data/maps/BirthIsland_Exterior/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BirthIsland_Exterior: @ 8485794
-	.4byte BirthIsland_Exterior_Layout
-	.4byte BirthIsland_Exterior_MapEvents
-	.4byte BirthIsland_Exterior_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 404
-	.byte MAPSEC_BIRTH_ISLAND_2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
new file mode 100644
index 000000000..c3e5ddddf
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_BIRTH_ISLAND_EXTERIOR",
+  "name": "BirthIsland_Exterior",
+  "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DEOXYS_TRIANGLE",
+      "x": 15,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BirthIsland_Exterior_EventScript_267F83",
+      "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DEOXYS",
+      "x": 15,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_DEOXYS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_BIRTH_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 5bff32eb6..594790ff3 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -1,7 +1,7 @@
 BirthIsland_Exterior_MapScripts:: @ 8267F15
-	map_script 3, BirthIsland_Exterior_MapScript1_267F29
-	map_script 5, BirthIsland_Exterior_MapScript1_267F65
-	map_script 7, BirthIsland_Exterior_MapScript1_267F25
+	map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29
+	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25
 	.byte 0
 
 BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
@@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
 	return
 
 BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
-	goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	clearflag FLAG_DEOXYS_ROCK_COMPLETE
 	return
@@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne BirthIsland_Exterior_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 2
 	return
 
diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc
deleted file mode 100644
index 8b8fe4660..000000000
--- a/data/maps/BirthIsland_Harbor/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BirthIsland_Harbor_EventObjects: @ 853D828
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-
-BirthIsland_Harbor_MapWarps: @ 853D858
-	warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR
-
-BirthIsland_Harbor_MapEvents:: @ 853D860
-	map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc
deleted file mode 100644
index 82b752f90..000000000
--- a/data/maps/BirthIsland_Harbor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BirthIsland_Harbor: @ 84857B0
-	.4byte IslandHarbor_Layout
-	.4byte BirthIsland_Harbor_MapEvents
-	.4byte BirthIsland_Harbor_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 405
-	.byte MAPSEC_BIRTH_ISLAND_2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
new file mode 100644
index 000000000..48937d482
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_BIRTH_ISLAND_HARBOR",
+  "name": "BirthIsland_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BirthIsland_Harbor_EventScript_26805D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
+      "x": 8,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc
index 1a5ef87ec..5f850ed7b 100644
--- a/data/maps/BirthIsland_Harbor/scripts.inc
+++ b/data/maps/BirthIsland_Harbor/scripts.inc
@@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
 	goto_if_eq BirthIsland_Harbor_EventScript_2680A2
 	msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR
diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc
deleted file mode 100644
index bdc629846..000000000
--- a/data/maps/CaveOfOrigin_1F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_1F_MapWarps: @ 8535D40
-	warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE
-	warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F
-
-CaveOfOrigin_1F_MapEvents:: @ 8535D50
-	map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
deleted file mode 100644
index f051c230c..000000000
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_1F: @ 84842E8
-	.4byte CaveOfOrigin_1F_Layout
-	.4byte CaveOfOrigin_1F_MapEvents
-	.4byte CaveOfOrigin_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 158
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json
new file mode 100644
index 000000000..989b1cf30
--- /dev/null
+++ b/data/maps/CaveOfOrigin_1F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_1F",
+  "name": "CaveOfOrigin_1F",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_1F",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 1804e58ea..e8d722dee 100644
--- a/data/maps/CaveOfOrigin_1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_1F_MapScripts:: @ 8235768
-	map_script 3, CaveOfOrigin_1F_MapScript1_23576E
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E
 	.byte 0
 
 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E
diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc
deleted file mode 100644
index 94f30d262..000000000
--- a/data/maps/CaveOfOrigin_B1F/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-CaveOfOrigin_B1F_EventObjects: @ 8535DD0
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE
-
-CaveOfOrigin_B1F_MapWarps: @ 8535DE8
-	warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F
-
-CaveOfOrigin_B1F_MapEvents:: @ 8535DF0
-	map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
deleted file mode 100644
index 7b70ba43f..000000000
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_B1F: @ 8484358
-	.4byte CaveOfOrigin_B1F_Layout
-	.4byte CaveOfOrigin_B1F_MapEvents
-	.4byte CaveOfOrigin_B1F_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 162
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json
new file mode 100644
index 000000000..ac3baeaf8
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B1F/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_B1F",
+  "name": "CaveOfOrigin_B1F",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLACE",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "CaveOfOrigin_B1F_EventScript_2357A9",
+      "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index 371ea1ba5..0e554a945 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
 	faceplayer
 	msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, CaveOfOrigin_B1F_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 60
 	playse SE_PIN
-	applymovement 1, CaveOfOrigin_B1F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, CaveOfOrigin_B1F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	delay 30
-	applymovement 1, CaveOfOrigin_B1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	message CaveOfOrigin_B1F_Text_235ACE
 	waitmessage
@@ -52,7 +52,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
 	playse SE_KAIDAN
 	fadescreenspeed 1, 4
 	setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
-	setvar VAR_0x405E, 3
+	setvar VAR_RAYQUAZA_STATE, 3
 	removeobject 1
 	clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
 	fadescreen 0
diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc
deleted file mode 100644
index 5a5ad59f7..000000000
--- a/data/maps/CaveOfOrigin_Entrance/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_Entrance_MapWarps: @ 8535D1C
-	warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY
-	warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F
-
-CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C
-	map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
deleted file mode 100644
index af622019a..000000000
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_Entrance: @ 84842CC
-	.4byte CaveOfOrigin_Entrance_Layout
-	.4byte CaveOfOrigin_Entrance_MapEvents
-	.4byte CaveOfOrigin_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 157
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json
new file mode 100644
index 000000000..07c7af816
--- /dev/null
+++ b/data/maps/CaveOfOrigin_Entrance/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
+  "name": "CaveOfOrigin_Entrance",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc
index 1a771ae82..53228f63c 100644
--- a/data/maps/CaveOfOrigin_Entrance/scripts.inc
+++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_Entrance_MapScripts:: @ 8235759
-	map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F
+	map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F
 	.byte 0
 
 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc
deleted file mode 100644
index 049c263da..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64
-	warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F
-	warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2
-
-CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74
-	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
deleted file mode 100644
index 6b928bb3c..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 159
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 1
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
new file mode 100644
index 000000000..e131e4f0c
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
+  "name": "CaveOfOrigin_UnusedRubySapphireMap1",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
index 79c00f28c..e3e296945 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
-	map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
deleted file mode 100644
index 5af05a471..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88
-	warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1
-	warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3
-
-CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98
-	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
deleted file mode 100644
index 0088131dc..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 160
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 1
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
new file mode 100644
index 000000000..8b83029e3
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
+  "name": "CaveOfOrigin_UnusedRubySapphireMap2",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": true,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
index 6f9812c38..417a7369a 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
-	map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
deleted file mode 100644
index a17416bd3..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC
-	warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2
-	warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F
-
-CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC
-	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
deleted file mode 100644
index 75bd4189e..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 161
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 1
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
new file mode 100644
index 000000000..2b7c6db19
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
+  "name": "CaveOfOrigin_UnusedRubySapphireMap3",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": true,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
index baa40934a..51d9b8654 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
-	map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc
deleted file mode 100644
index e7a815ce0..000000000
--- a/data/maps/DesertRuins/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DesertRuins_EventObjects: @ 8534354
-	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK
-
-DesertRuins_MapWarps: @ 853436C
-	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: @ 8534384
-	bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB
-	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8
-	bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8
-
-DesertRuins_MapEvents:: @ 85343A8
-	map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
-
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
deleted file mode 100644
index c717661f4..000000000
--- a/data/maps/DesertRuins/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DesertRuins: @ 8483F68
-	.4byte DesertRuins_Layout
-	.4byte DesertRuins_MapEvents
-	.4byte DesertRuins_MapScripts
-	.4byte 0x0
-	.2byte MUS_MABOROSI
-	.2byte 131
-	.byte MAPSEC_DESERT_RUINS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json
new file mode 100644
index 000000000..28a04a458
--- /dev/null
+++ b/data/maps/DesertRuins/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_DESERT_RUINS",
+  "name": "DesertRuins",
+  "layout": "LAYOUT_DESERT_RUINS",
+  "music": "MUS_MABOROSI",
+  "region_map_section": "MAPSEC_DESERT_RUINS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REGIROCK",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DesertRuins_EventScript_22DA02",
+      "flag": "FLAG_HIDE_REGIROCK"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_DESERT_RUINS",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_DESERT_RUINS",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DesertRuins_EventScript_22D9DB"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DesertRuins_EventScript_22D9F8"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DesertRuins_EventScript_22D9F8"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index 62828e971..75fcf061c 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -1,7 +1,7 @@
 DesertRuins_MapScripts:: @ 822D95B
-	map_script 5, DesertRuins_MapScript1_22D96B
-	map_script 1, DesertRuins_MapScript1_22D989
-	map_script 3, DesertRuins_MapScript1_22D9CA
+	map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B
+	map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989
+	map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA
 	.byte 0
 
 DesertRuins_MapScript1_22D96B: @ 822D96B
@@ -11,12 +11,12 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
 DesertRuins_EventScript_22D975:: @ 822D975
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne DesertRuins_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
 DesertRuins_MapScript1_22D989: @ 822D989
-	call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993
+	call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D993
 	end
 
 DesertRuins_EventScript_22D993:: @ 822D993
@@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7
 
 DesertRuins_EventScript_22D9DB:: @ 822D9DB
 	lockall
-	goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE
+	goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D9EE
 	braillemessage DesertRuins_Braille_2A6CA0
 	waitbuttonpress
 	hidebox2
diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc
deleted file mode 100644
index aec461c34..000000000
--- a/data/maps/DesertUnderpass/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DesertUnderpass_EventObjects: @ 85376D4
-	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
-
-DesertUnderpass_MapWarps: @ 85376EC
-	warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
-
-DesertUnderpass_MapEvents:: @ 85376F4
-	map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
deleted file mode 100644
index 757d81e73..000000000
--- a/data/maps/DesertUnderpass/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DesertUnderpass: @ 8484978
-	.4byte DesertUnderpass_Layout
-	.4byte DesertUnderpass_MapEvents
-	.4byte DesertUnderpass_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 389
-	.byte MAPSEC_DESERT_UNDERPASS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json
new file mode 100644
index 000000000..ca4b894d4
--- /dev/null
+++ b/data/maps/DesertUnderpass/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_DESERT_UNDERPASS",
+  "name": "DesertUnderpass",
+  "layout": "LAYOUT_DESERT_UNDERPASS",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_DESERT_UNDERPASS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FOSSIL",
+      "x": 132,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DesertUnderpass_EventScript_23AF41",
+      "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc
index c64597d6c..9c5e83180 100644
--- a/data/maps/DesertUnderpass/scripts.inc
+++ b/data/maps/DesertUnderpass/scripts.inc
@@ -1,5 +1,5 @@
 DesertUnderpass_MapScripts:: @ 823AF37
-	map_script 3, DesertUnderpass_MapScript1_23AF3D
+	map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D
 	.byte 0
 
 DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc
deleted file mode 100644
index d03004922..000000000
--- a/data/maps/DewfordTown/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-DewfordTown_MapConnectionsList: @ 8486640
-	connection up, -60, MAP_ROUTE106
-	connection right, 0, MAP_ROUTE107
-
-DewfordTown_MapConnections: @ 8486658
-	.4byte 0x2
-	.4byte DewfordTown_MapConnectionsList
-
diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc
deleted file mode 100644
index 3d2d0af4a..000000000
--- a/data/maps/DewfordTown/events.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DewfordTown_EventObjects: @ 8527964
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0
-	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0
-
-DewfordTown_MapWarps: @ 85279DC
-	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: @ 8527A04
-	bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA
-	bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3
-	bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73
-	bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73
-	bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC
-
-DewfordTown_MapEvents:: @ 8527A40
-	map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
-
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
deleted file mode 100644
index 9314f753f..000000000
--- a/data/maps/DewfordTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown: @ 84825EC
-	.4byte DewfordTown_Layout
-	.4byte DewfordTown_MapEvents
-	.4byte DewfordTown_MapScripts
-	.4byte DewfordTown_MapConnections
-	.2byte MUS_HIGHTOWN
-	.2byte 12
-	.byte MAPSEC_DEWFORD_TOWN
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_TOWN
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json
new file mode 100644
index 000000000..32fe0c313
--- /dev/null
+++ b/data/maps/DewfordTown/map.json
@@ -0,0 +1,174 @@
+{
+  "id": "MAP_DEWFORD_TOWN",
+  "name": "DewfordTown",
+  "layout": "LAYOUT_DEWFORD_TOWN",
+  "music": "MUS_HIGHTOWN",
+  "region_map_section": "MAPSEC_DEWFORD_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": -60,
+      "map": "MAP_ROUTE106"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE107"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_EventScript_1E95B1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "DewfordTown_EventScript_1E9511",
+      "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 12,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_EventScript_1E95D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT",
+      "x": 12,
+      "y": 8,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_EventScript_1E9922",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN_HALL",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN_GYM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN_HOUSE2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DewfordTown_EventScript_1E95BA"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DewfordTown_EventScript_1E95C3"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DewfordTown_EventScript_1E95CC"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index 6c66f4860..ed8acea17 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -1,5 +1,5 @@
 DewfordTown_MapScripts:: @ 81E9507
-	map_script 3, DewfordTown_MapScript1_1E950D
+	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D
 	.byte 0
 
 DewfordTown_MapScript1_1E950D: @ 81E950D
@@ -138,10 +138,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
 	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	hideobjectat 4, MAP_DEWFORD_TOWN
-	setvar VAR_0x408E, 2
+	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
 	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
-	copyvar VAR_0x4096, VAR_0x8008
+	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	waitstate
 	release
 	end
@@ -177,7 +177,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
 	call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790
 	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799
 	closemessage
-	copyvar VAR_0x4096, VAR_0x8008
+	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
 	resetobjectpriority 2, MAP_ROUTE109
 	moveobjectoffscreen 2
@@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948
 
 DewfordTown_EventScript_1E9952:: @ 81E9952
 	msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 9
-	call DewfordTown_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc
deleted file mode 100644
index a4c45c2cb..000000000
--- a/data/maps/DewfordTown_Gym/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DewfordTown_Gym_EventObjects: @ 852DB34
-	object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0
-	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0
-	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0
-	object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0
-
-DewfordTown_Gym_MapWarps: @ 852DBF4
-	warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN
-	warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN
-
-DewfordTown_Gym_MapBGEvents: @ 852DC04
-	bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2
-	bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2
-	bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2
-	bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2
-
-DewfordTown_Gym_MapEvents:: @ 852DC34
-	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
deleted file mode 100644
index 783a7eacc..000000000
--- a/data/maps/DewfordTown_Gym/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_Gym: @ 8482C60
-	.4byte DewfordTown_Gym_Layout
-	.4byte DewfordTown_Gym_MapEvents
-	.4byte DewfordTown_Gym_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 65
-	.byte MAPSEC_DEWFORD_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json
new file mode 100644
index 000000000..cf87f878a
--- /dev/null
+++ b/data/maps/DewfordTown_Gym/map.json
@@ -0,0 +1,173 @@
+{
+  "id": "MAP_DEWFORD_TOWN_GYM",
+  "name": "DewfordTown_Gym",
+  "layout": "LAYOUT_DEWFORD_TOWN_GYM",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_DEWFORD_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BRAWLY",
+      "x": 4,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Gym_EventScript_1FC7C2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 2,
+      "y": 18,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "DewfordTown_Gym_EventScript_1FC8B7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 15,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "DewfordTown_Gym_EventScript_1FC8D9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 12,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "DewfordTown_Gym_EventScript_1FC8FB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 5,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Gym_EventScript_1FC983",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 7,
+      "y": 8,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "DewfordTown_Gym_EventScript_1FC93F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 16,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "DewfordTown_Gym_EventScript_1FC961",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 14,
+      "y": 12,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "DewfordTown_Gym_EventScript_1FC91D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 27,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 27,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 23,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "DewfordTown_Gym_EventScript_1FC9A2"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 23,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "DewfordTown_Gym_EventScript_1FC9B2"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 24,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "DewfordTown_Gym_EventScript_1FC9A2"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 24,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "DewfordTown_Gym_EventScript_1FC9B2"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 90fd3d4ae..eb8183585 100644
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -1,5 +1,5 @@
 DewfordTown_Gym_MapScripts:: @ 81FC63C
-	map_script 3, DewfordTown_Gym_MapScript1_1FC642
+	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642
 	.byte 0
 
 DewfordTown_Gym_MapScript1_1FC642: @ 81FC642
@@ -169,12 +169,12 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 	call DewfordTown_Gym_EventScript_1FC75D
 	message DewfordTown_Gym_Text_1FD07D
 	waitmessage
-	call DewfordTown_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_DEWFORD_GYM
 	setflag FLAG_BADGE02_GET
-	addvar VAR_0x4085, 1
-	compare VAR_0x4085, 6
+	addvar VAR_PETALBURG_GYM_STATE, 1
+	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq DewfordTown_Gym_EventScript_271E84
 	setvar VAR_0x8008, 2
 	call DewfordTown_Gym_EventScript_271F43
@@ -187,7 +187,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_BRAWLY_MATCH_CALL
-	setvar VAR_0x40F4, 0
+	setvar VAR_ROXANNE_CALL_STEP_COUNTER, 0
 	setflag FLAG_ENABLE_ROXANNE_FIRST_CALL
 	release
 	end
@@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	return
@@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	release
diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc
deleted file mode 100644
index 4f1881f92..000000000
--- a/data/maps/DewfordTown_Hall/events.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DewfordTown_Hall_EventObjects: @ 852DC48
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0
-	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0
-	object_event 5, EVENT_OBJ_GFX_TWIN, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0
-	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0
-	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
-
-DewfordTown_Hall_MapWarps: @ 852DD20
-	warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
-	warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN
-
-DewfordTown_Hall_MapBGEvents: @ 852DD30
-	bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590
-	bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0
-
-DewfordTown_Hall_MapEvents:: @ 852DD48
-	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
deleted file mode 100644
index 600b02763..000000000
--- a/data/maps/DewfordTown_Hall/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_Hall: @ 8482C7C
-	.4byte DewfordTown_Hall_Layout
-	.4byte DewfordTown_Hall_MapEvents
-	.4byte DewfordTown_Hall_MapScripts
-	.4byte 0x0
-	.2byte MUS_HIGHTOWN
-	.2byte 66
-	.byte MAPSEC_DEWFORD_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json
new file mode 100644
index 000000000..b801ea3c2
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/map.json
@@ -0,0 +1,170 @@
+{
+  "id": "MAP_DEWFORD_TOWN_HALL",
+  "name": "DewfordTown_Hall",
+  "layout": "LAYOUT_DEWFORD_TOWN_HALL",
+  "music": "MUS_HIGHTOWN",
+  "region_map_section": "MAPSEC_DEWFORD_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD4D0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 1,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD4F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD50A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 9,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD547",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD563",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 14,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD57F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD62F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 15,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD63B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_Hall_EventScript_1FD7DA",
+      "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DewfordTown_Hall_EventScript_1FD590"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "DewfordTown_Hall_EventScript_1FD5A0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 0d9cf514c..22bf5ed6a 100644
--- a/data/maps/DewfordTown_Hall/scripts.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
 	call DewfordTown_Hall_EventScript_271E8B
 	msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, DewfordTown_Hall_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	release
 	end
@@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
 	call DewfordTown_Hall_EventScript_271E8B
 	msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, DewfordTown_Hall_Movement_2725A6
+	applymovement 5, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	release
 	end
@@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
 DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
 	compare VAR_FACING, 4
 	goto_if_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
 	return
 
 DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
 	compare VAR_FACING, 3
 	goto_if_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
 	msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM36
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Hall_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM36
 	release
 	end
diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc
deleted file mode 100644
index 53d72959c..000000000
--- a/data/maps/DewfordTown_House1/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DewfordTown_House1_EventObjects: @ 852D9C8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0
-	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0
-
-DewfordTown_House1_MapWarps: @ 852DA10
-	warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN
-	warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN
-
-DewfordTown_House1_MapEvents:: @ 852DA20
-	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
deleted file mode 100644
index cfaaaa698..000000000
--- a/data/maps/DewfordTown_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_House1: @ 8482C0C
-	.4byte House3_Layout
-	.4byte DewfordTown_House1_MapEvents
-	.4byte DewfordTown_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_HIGHTOWN
-	.2byte 64
-	.byte MAPSEC_DEWFORD_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json
new file mode 100644
index 000000000..dfae500bd
--- /dev/null
+++ b/data/maps/DewfordTown_House1/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_DEWFORD_TOWN_HOUSE1",
+  "name": "DewfordTown_House1",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "MUS_HIGHTOWN",
+  "region_map_section": "MAPSEC_DEWFORD_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_House1_EventScript_1FC3D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_House1_EventScript_1FC3CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_House1_EventScript_1FC3E0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc
deleted file mode 100644
index 039ebac7c..000000000
--- a/data/maps/DewfordTown_House2/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DewfordTown_House2_EventObjects: @ 852DD5C
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0
-
-DewfordTown_House2_MapWarps: @ 852DD8C
-	warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN
-	warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN
-
-DewfordTown_House2_MapEvents:: @ 852DD9C
-	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
deleted file mode 100644
index 2f9a36cf8..000000000
--- a/data/maps/DewfordTown_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_House2: @ 8482C98
-	.4byte House4_Layout
-	.4byte DewfordTown_House2_MapEvents
-	.4byte DewfordTown_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_HIGHTOWN
-	.2byte 67
-	.byte MAPSEC_DEWFORD_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json
new file mode 100644
index 000000000..bc9c008fc
--- /dev/null
+++ b/data/maps/DewfordTown_House2/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_DEWFORD_TOWN_HOUSE2",
+  "name": "DewfordTown_House2",
+  "layout": "LAYOUT_HOUSE4",
+  "music": "MUS_HIGHTOWN",
+  "region_map_section": "MAPSEC_DEWFORD_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_House2_EventScript_1FE22E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_House2_EventScript_1FE271",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
deleted file mode 100644
index 830b6fd9b..000000000
--- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0
-
-DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C
-	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:: @ 852DA94
-	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
deleted file mode 100644
index ae98bd680..000000000
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_PokemonCenter_1F: @ 8482C28
-	.4byte PokemonCenter_1F_Layout
-	.4byte DewfordTown_PokemonCenter_1F_MapEvents
-	.4byte DewfordTown_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_DEWFORD_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..89acf1ea8
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
+  "name": "DewfordTown_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_DEWFORD_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 5,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_DEWFORD_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index e21fd13af..b4f5fc4c6 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
-	map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E
-	map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E
+	map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
deleted file mode 100644
index 4f37111a5..000000000
--- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
-	warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20
-	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
deleted file mode 100644
index bb46a43d0..000000000
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DewfordTown_PokemonCenter_2F: @ 8482C44
-	.4byte PokemonCenter_2F_Layout
-	.4byte DewfordTown_PokemonCenter_2F_MapEvents
-	.4byte DewfordTown_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_DEWFORD_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..2792a9a20
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
+  "name": "DewfordTown_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_DEWFORD_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index f2a30ecd2..58b0b63a1 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
-	map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A
diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc
deleted file mode 100644
index ffea67228..000000000
--- a/data/maps/DoubleBattleColosseum/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DoubleBattleColosseum_MapWarps: @ 8539E88
-	warp_def 5, 8, 3, 127, MAP_NONE
-	warp_def 6, 8, 3, 127, MAP_NONE
-	warp_def 7, 8, 3, 127, MAP_NONE
-	warp_def 8, 8, 3, 127, MAP_NONE
-
-DoubleBattleColosseum_MapCoordEvents: @ 8539EA8
-	coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388
-	coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE
-	coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3
-	coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9
-
-DoubleBattleColosseum_MapEvents:: @ 8539EE8
-	map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0
-
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
deleted file mode 100644
index 032ef58ab..000000000
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DoubleBattleColosseum: @ 8484D84
-	.4byte DoubleBattleColosseum_Layout
-	.4byte DoubleBattleColosseum_MapEvents
-	.4byte DoubleBattleColosseum_MapScripts
-	.4byte 0x0
-	.2byte MUS_RAINBOW
-	.2byte 224
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json
new file mode 100644
index 000000000..172bb3fdc
--- /dev/null
+++ b/data/maps/DoubleBattleColosseum/map.json
@@ -0,0 +1,86 @@
+{
+  "id": "MAP_DOUBLE_BATTLE_COLOSSEUM",
+  "name": "DoubleBattleColosseum",
+  "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
+  "music": "MUS_RAINBOW",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc
deleted file mode 100644
index 830240b07..000000000
--- a/data/maps/EverGrandeCity/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-EverGrandeCity_MapConnectionsList: @ 84867F8
-	connection left, 40, MAP_ROUTE128
-
-EverGrandeCity_MapConnections: @ 8486804
-	.4byte 0x1
-	.4byte EverGrandeCity_MapConnectionsList
-
diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc
deleted file mode 100644
index e6bc7a10a..000000000
--- a/data/maps/EverGrandeCity/events.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-EverGrandeCity_MapWarps: @ 8527588
-	warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
-	warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F
-	warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F
-
-EverGrandeCity_MapCoordEvents: @ 85275A8
-	coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
-
-EverGrandeCity_MapBGEvents: @ 8527658
-	bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B
-	bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73
-	bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34
-	bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D
-	bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73
-
-EverGrandeCity_MapEvents:: @ 8527694
-	map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents
-
diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
deleted file mode 100644
index b1ee8e3a4..000000000
--- a/data/maps/EverGrandeCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity: @ 8482598
-	.4byte EverGrandeCity_Layout
-	.4byte EverGrandeCity_MapEvents
-	.4byte EverGrandeCity_MapScripts
-	.4byte EverGrandeCity_MapConnections
-	.2byte MUS_RAINBOW
-	.2byte 9
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
new file mode 100644
index 000000000..90175db1d
--- /dev/null
+++ b/data/maps/EverGrandeCity/map.json
@@ -0,0 +1,196 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY",
+  "name": "EverGrandeCity",
+  "layout": "LAYOUT_EVER_GRANDE_CITY",
+  "music": "MUS_RAINBOW",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 40,
+      "map": "MAP_ROUTE128"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 27,
+      "y": 48,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 41,
+      "elevation": 0,
+      "dest_map": "MAP_VICTORY_ROAD_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 27,
+      "elevation": 0,
+      "dest_map": "MAP_VICTORY_ROAD_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 16,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 18,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 19,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 20,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 21,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    },
+    {
+      "type": "trigger",
+      "x": 26,
+      "y": 58,
+      "elevation": 1,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "EverGrandeCity_EventScript_1E7D46"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 43,
+      "elevation": 5,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "EverGrandeCity_EventScript_1E7D2B"
+    },
+    {
+      "type": "sign",
+      "x": 29,
+      "y": 48,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 52,
+      "elevation": 5,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "EverGrandeCity_EventScript_1E7D34"
+    },
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "EverGrandeCity_EventScript_1E7D3D"
+    },
+    {
+      "type": "sign",
+      "x": 28,
+      "y": 48,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc
index 75327b839..ffbf5a6cd 100644
--- a/data/maps/EverGrandeCity/scripts.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_MapScripts:: @ 81E7D1B
-	map_script 3, EverGrandeCity_MapScript1_1E7D21
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21
 	.byte 0
 
 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21
-	call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	end
 
 EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
deleted file mode 100644
index 9ce5831ba..000000000
--- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
-	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
-
-EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
-	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME
-
-EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758
-	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
deleted file mode 100644
index bd2ab305f..000000000
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_ChampionsRoom: @ 8483C3C
-	.4byte EverGrandeCity_ChampionsRoom_Layout
-	.4byte EverGrandeCity_ChampionsRoom_MapEvents
-	.4byte EverGrandeCity_ChampionsRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 115
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json
new file mode 100644
index 000000000..4819c3b89
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
+  "name": "EverGrandeCity_ChampionsRoom",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLACE",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_CHAMPIONS_ROOM_BIRCH"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL4",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 149c54cd8..49411aeb4 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -1,11 +1,11 @@
 EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
-	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
-	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05
-	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14
 	.byte 0
 
 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF
-	call EverGrandeCity_ChampionsRoom_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	end
 
 EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
@@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6
 	msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	call EverGrandeCity_ChampionsRoom_EventScript_228C12
 	msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT
@@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB
 	msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	call EverGrandeCity_ChampionsRoom_EventScript_228C12
 	msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT
@@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
 	addobject 3
 	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
 	call EverGrandeCity_ChampionsRoom_EventScript_272184
 	msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 20
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceUp
 	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
 	waitmovement 0
 	delay 20
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
 	checkplayergender
@@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
 	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc
deleted file mode 100644
index 4f61f50ea..000000000
--- a/data/maps/EverGrandeCity_DrakesRoom/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4
-	object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0
-
-EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4
-
-EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC
-	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
deleted file mode 100644
index da5c8fa47..000000000
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_DrakesRoom: @ 8483C20
-	.4byte EverGrandeCity_DrakesRoom_Layout
-	.4byte EverGrandeCity_DrakesRoom_MapEvents
-	.4byte EverGrandeCity_DrakesRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 114
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_DRAKE
-
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json
new file mode 100644
index 000000000..4fb0d16ef
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
+  "name": "EverGrandeCity_DrakesRoom",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_DRAKE",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DRAKE",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL3",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL4",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index 2c0949842..ed8d82be2 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C
-	map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB
-	map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2
-	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E
 	.byte 0
 
 EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
@@ -13,19 +13,19 @@ EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
 	end
 
 EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
-	map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
+	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
 	.2byte 0
 
 EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
 	lockall
 	call EverGrandeCity_DrakesRoom_EventScript_272475
-	setvar VAR_0x409C, 4
+	setvar VAR_ELITE_4_STATE, 4
 	releaseall
 	end
 
 EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
 	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7
-	compare VAR_0x409C, 4
+	compare VAR_ELITE_4_STATE, 4
 	call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
 	end
 
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
deleted file mode 100644
index 63dfbc0df..000000000
--- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688
-	object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0
-
-EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3
-
-EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0
-	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
deleted file mode 100644
index 0773a613e..000000000
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_GlaciasRoom: @ 8483C04
-	.4byte EverGrandeCity_GlaciasRoom_Layout
-	.4byte EverGrandeCity_GlaciasRoom_MapEvents
-	.4byte EverGrandeCity_GlaciasRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 113
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GLACIA
-
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json
new file mode 100644
index 000000000..ea3116460
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
+  "name": "EverGrandeCity_GlaciasRoom",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GLACIA",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GLACIA",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_GlaciasRoom_EventScript_228469",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL3",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index 7510f468f..24960d95e 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412
-	map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431
-	map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448
-	map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422
 	.byte 0
 
 EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
@@ -13,19 +13,19 @@ EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431
-	map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
+	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
 	.2byte 0
 
 EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
 	lockall
 	call EverGrandeCity_GlaciasRoom_EventScript_272475
-	setvar VAR_0x409C, 3
+	setvar VAR_ELITE_4_STATE, 3
 	releaseall
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
 	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D
-	compare VAR_0x409C, 3
+	compare VAR_ELITE_4_STATE, 3
 	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc
deleted file mode 100644
index 3351b42e0..000000000
--- a/data/maps/EverGrandeCity_Hall1/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall1_MapWarps: @ 853376C
-	warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
-	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
-	warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
-	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
-
-EverGrandeCity_Hall1_MapEvents:: @ 853378C
-	map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc
deleted file mode 100644
index d554ff768..000000000
--- a/data/maps/EverGrandeCity_Hall1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_Hall1: @ 8483C58
-	.4byte EverGrandeCity_ShortHall_Layout
-	.4byte EverGrandeCity_Hall1_MapEvents
-	.4byte EverGrandeCity_Hall1_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 116
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json
new file mode 100644
index 000000000..1ebb9c925
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall1/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_HALL1",
+  "name": "EverGrandeCity_Hall1",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc
index a5b7764d7..d9a7adfe3 100644
--- a/data/maps/EverGrandeCity_Hall1/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall1/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall1_MapScripts:: @ 8229569
-	map_script 4, EverGrandeCity_Hall1_MapScript2_22956F
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F
 	.byte 0
 
 EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc
deleted file mode 100644
index e3eacab10..000000000
--- a/data/maps/EverGrandeCity_Hall2/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall2_MapWarps: @ 85337A0
-	warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
-	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
-	warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
-	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
-
-EverGrandeCity_Hall2_MapEvents:: @ 85337C0
-	map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc
deleted file mode 100644
index 646478a25..000000000
--- a/data/maps/EverGrandeCity_Hall2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_Hall2: @ 8483C74
-	.4byte EverGrandeCity_ShortHall_Layout
-	.4byte EverGrandeCity_Hall2_MapEvents
-	.4byte EverGrandeCity_Hall2_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 116
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json
new file mode 100644
index 000000000..0631c14f0
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall2/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_HALL2",
+  "name": "EverGrandeCity_Hall2",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc
index 565d68168..b831d0fd5 100644
--- a/data/maps/EverGrandeCity_Hall2/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall2/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall2_MapScripts:: @ 822957E
-	map_script 4, EverGrandeCity_Hall2_MapScript2_229584
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584
 	.byte 0
 
 EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc
deleted file mode 100644
index e44182b4f..000000000
--- a/data/maps/EverGrandeCity_Hall3/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall3_MapWarps: @ 85337D4
-	warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
-	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM
-	warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
-	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
-
-EverGrandeCity_Hall3_MapEvents:: @ 85337F4
-	map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc
deleted file mode 100644
index d7beaf36e..000000000
--- a/data/maps/EverGrandeCity_Hall3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_Hall3: @ 8483C90
-	.4byte EverGrandeCity_ShortHall_Layout
-	.4byte EverGrandeCity_Hall3_MapEvents
-	.4byte EverGrandeCity_Hall3_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 116
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json
new file mode 100644
index 000000000..f181843bf
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall3/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_HALL3",
+  "name": "EverGrandeCity_Hall3",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc
index 85d0bb2f6..d75cf95b6 100644
--- a/data/maps/EverGrandeCity_Hall3/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall3/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall3_MapScripts:: @ 8229593
-	map_script 4, EverGrandeCity_Hall3_MapScript2_229599
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599
 	.byte 0
 
 EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc
deleted file mode 100644
index b2d011234..000000000
--- a/data/maps/EverGrandeCity_Hall4/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-EverGrandeCity_Hall4_MapWarps: @ 8533808
-	warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM
-	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM
-
-EverGrandeCity_Hall4_MapEvents:: @ 8533818
-	map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc
deleted file mode 100644
index 8cf1eea6e..000000000
--- a/data/maps/EverGrandeCity_Hall4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_Hall4: @ 8483CAC
-	.4byte EverGrandeCity_Hall4_Layout
-	.4byte EverGrandeCity_Hall4_MapEvents
-	.4byte EverGrandeCity_Hall4_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 315
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json
new file mode 100644
index 000000000..b2c095e77
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall4/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_HALL4",
+  "name": "EverGrandeCity_Hall4",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_HALL4",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc
index 29f56829a..faf20646a 100644
--- a/data/maps/EverGrandeCity_Hall4/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall4/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall4_MapScripts:: @ 82295A8
-	map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE
 	.byte 0
 
 EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc
deleted file mode 100644
index 687920b71..000000000
--- a/data/maps/EverGrandeCity_Hall5/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall5_MapWarps: @ 853382C
-	warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
-	warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-
-EverGrandeCity_Hall5_MapEvents:: @ 853384C
-	map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc
deleted file mode 100644
index 38279720e..000000000
--- a/data/maps/EverGrandeCity_Hall5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_Hall5: @ 8483CC8
-	.4byte EverGrandeCity_ShortHall_Layout
-	.4byte EverGrandeCity_Hall5_MapEvents
-	.4byte EverGrandeCity_Hall5_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 116
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json
new file mode 100644
index 000000000..04597cf65
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall5/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_HALL5",
+  "name": "EverGrandeCity_Hall5",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc
index d492c28d2..e586958c2 100644
--- a/data/maps/EverGrandeCity_Hall5/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall5/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall5_MapScripts:: @ 82295BD
-	map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3
 	.byte 0
 
 EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc
deleted file mode 100644
index ad5f088c5..000000000
--- a/data/maps/EverGrandeCity_HallOfFame/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_HallOfFame_EventObjects: @ 85338FC
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-
-EverGrandeCity_HallOfFame_MapWarps: @ 8533914
-	warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM
-
-EverGrandeCity_HallOfFame_MapEvents:: @ 853391C
-	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
deleted file mode 100644
index 865f90b91..000000000
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_HallOfFame: @ 8483D00
-	.4byte EverGrandeCity_HallOfFame_Layout
-	.4byte EverGrandeCity_HallOfFame_MapEvents
-	.4byte EverGrandeCity_HallOfFame_MapScripts
-	.4byte 0x0
-	.2byte MUS_EIKOU_R
-	.2byte 298
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json
new file mode 100644
index 000000000..d0588f76a
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
+  "name": "EverGrandeCity_HallOfFame",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME",
+  "music": "MUS_EIKOU_R",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLACE",
+      "x": 6,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index ddb9ade89..f61547c14 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -1,6 +1,6 @@
 EverGrandeCity_HallOfFame_MapScripts:: @ 822982C
-	map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846
-	map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837
 	.byte 0
 
 EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
@@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
 	waitmovement 0
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
 	closemessage
@@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
 	waitmovement 0
 	delay 20
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 20
 	dofieldeffect 62
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
deleted file mode 100644
index abaa81622..000000000
--- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C
-	object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0
-
-EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2
-
-EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674
-	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
deleted file mode 100644
index eb0d77d7b..000000000
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_PhoebesRoom: @ 8483BE8
-	.4byte EverGrandeCity_PhoebesRoom_Layout
-	.4byte EverGrandeCity_PhoebesRoom_MapEvents
-	.4byte EverGrandeCity_PhoebesRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 112
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_PHOEBE
-
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json
new file mode 100644
index 000000000..a0072fd08
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
+  "name": "EverGrandeCity_PhoebesRoom",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_PHOEBE",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PHOEBE",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index 77f951d76..971eff7ca 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174
-	map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA
-	map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184
-	map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193
 	.byte 0
 
 EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
@@ -13,19 +13,19 @@ EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193
-	map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
+	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
 	.2byte 0
 
 EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
 	lockall
 	call EverGrandeCity_PhoebesRoom_EventScript_272475
-	setvar VAR_0x409C, 2
+	setvar VAR_ELITE_4_STATE, 2
 	releaseall
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
 	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF
-	compare VAR_0x409C, 2
+	compare VAR_ELITE_4_STATE, 2
 	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
 	end
 
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index 23e555622..000000000
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0
-	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
-
-EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
-	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:: @ 85339A8
-	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
deleted file mode 100644
index 292356472..000000000
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_PokemonCenter_1F: @ 8483D1C
-	.4byte PokemonCenter_1F_Layout
-	.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
-	.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..38c527b34
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
+  "name": "EverGrandeCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79",
+      "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 0ec0acbb2..12c6bbb77 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
-	map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
-	map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
+	map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
@@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
 	end
 
 EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
-	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
+	goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	return
 
@@ -40,7 +40,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
 	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
 	compare VAR_FACING, 3
 	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_EVERGRANDE
 	playse SE_KAIDAN
 	waitse
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index 855336146..000000000
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
-	warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34
-	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
deleted file mode 100644
index ec9f3e542..000000000
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_PokemonCenter_2F: @ 8483D38
-	.4byte PokemonCenter_2F_Layout
-	.4byte EverGrandeCity_PokemonCenter_2F_MapEvents
-	.4byte EverGrandeCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..f1dcd3868
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
+  "name": "EverGrandeCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index 09d382b2b..40408c1f8 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
-	map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
deleted file mode 100644
index dcda8722c..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0
-	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
-
-EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
-	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_HALL5
-	warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5
-	warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F
-
-EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8
-	map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
deleted file mode 100644
index 90a42edea..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_PokemonLeague_1F: @ 8483CE4
-	.4byte EverGrandeCity_PokemonLeague_1F_Layout
-	.4byte EverGrandeCity_PokemonLeague_1F_MapEvents
-	.4byte EverGrandeCity_PokemonLeague_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 270
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
new file mode 100644
index 000000000..2a9efbeaf
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
@@ -0,0 +1,109 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+  "name": "EverGrandeCity_PokemonLeague_1F",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 16,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 4,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index ce4be66f8..95345af5c 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -1,6 +1,6 @@
 EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
-	map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
-	map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
+	map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
 	.byte 0
 
 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
@@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE
 	end
 
 EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
deleted file mode 100644
index b6497d824..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
-	warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0
-	map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
deleted file mode 100644
index 4d9ee7f46..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_PokemonLeague_2F: @ 8483D54
-	.4byte PokemonCenter_2F_Layout
-	.4byte EverGrandeCity_PokemonLeague_2F_MapEvents
-	.4byte EverGrandeCity_PokemonLeague_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json
new file mode 100644
index 000000000..0d0bb68a1
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F",
+  "name": "EverGrandeCity_PokemonLeague_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
index d3a77a051..2d2d916a3 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
@@ -1,8 +1,8 @@
 EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
-	map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B
-	map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C
-	map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE
-	map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF
 	.byte 0
 
 EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C
diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc
deleted file mode 100644
index a1446aef8..000000000
--- a/data/maps/EverGrandeCity_SidneysRoom/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_SidneysRoom_EventObjects: @ 8533610
-	object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0
-
-EverGrandeCity_SidneysRoom_MapWarps: @ 8533628
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1
-
-EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638
-	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
deleted file mode 100644
index b19db5fbb..000000000
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-EverGrandeCity_SidneysRoom: @ 8483BCC
-	.4byte EverGrandeCity_SidneysRoom_Layout
-	.4byte EverGrandeCity_SidneysRoom_MapEvents
-	.4byte EverGrandeCity_SidneysRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 111
-	.byte MAPSEC_EVER_GRANDE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_SIDNEY
-
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json
new file mode 100644
index 000000000..87545b597
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+  "name": "EverGrandeCity_SidneysRoom",
+  "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_SIDNEY",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SIDNEY",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EverGrandeCity_SidneysRoom_EventScript_227F64",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_EVER_GRANDE_CITY_HALL1",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index 9152254b3..1713a6d3e 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -1,8 +1,8 @@
 EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
-	map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D
-	map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E
-	map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16
-	map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D
 	.byte 0
 
 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
@@ -12,7 +12,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
 
 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
 	call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
-	compare VAR_0x409C, 1
+	compare VAR_ELITE_4_STATE, 1
 	call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
 	end
 
@@ -34,13 +34,13 @@ EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
 	end
 
 EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D
-	map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
+	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
 	.2byte 0
 
 EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
 	lockall
 	call EverGrandeCity_SidneysRoom_EventScript_272475
-	setvar VAR_0x409C, 1
+	setvar VAR_ELITE_4_STATE, 1
 	releaseall
 	end
 
diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc
deleted file mode 100644
index 3808099d8..000000000
--- a/data/maps/FallarborTown/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FallarborTown_MapConnectionsList: @ 8486674
-	connection left, 0, MAP_ROUTE114
-	connection right, 0, MAP_ROUTE113
-
-FallarborTown_MapConnections: @ 848668C
-	.4byte 0x2
-	.4byte FallarborTown_MapConnectionsList
-
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc
deleted file mode 100644
index 9b2f0a2de..000000000
--- a/data/maps/FallarborTown/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-FallarborTown_EventObjects: @ 8527BE0
-	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
-	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL
-
-FallarborTown_MapWarps: @ 8527C40
-	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
-	warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_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: @ 8527C68
-	bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
-	bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
-	bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250
-	bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
-	bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259
-	bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
-	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262
-	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET
-
-FallarborTown_MapEvents:: @ 8527CC8
-	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
-
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
deleted file mode 100644
index f32f0c30b..000000000
--- a/data/maps/FallarborTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown: @ 8482624
-	.4byte FallarborTown_Layout
-	.4byte FallarborTown_MapEvents
-	.4byte FallarborTown_MapScripts
-	.4byte FallarborTown_MapConnections
-	.2byte MUS_TONEKUSA
-	.2byte 14
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_TOWN
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
new file mode 100644
index 000000000..863319184
--- /dev/null
+++ b/data/maps/FallarborTown/map.json
@@ -0,0 +1,185 @@
+{
+  "id": "MAP_FALLARBOR_TOWN",
+  "name": "FallarborTown",
+  "layout": "LAYOUT_FALLARBOR_TOWN",
+  "music": "MUS_TONEKUSA",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE114"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE113"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_EventScript_1EB22B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_EventScript_1EB20C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_EventScript_1EB234",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZURILL",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_EventScript_1EB23D",
+      "flag": "FLAG_HIDE_FALLARBOR_AZURILL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "FallarborTown_EventScript_1EB250"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 11,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "FallarborTown_EventScript_1EB259"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "FallarborTown_EventScript_1EB262"
+    },
+    {
+      "type": "hidden_item",
+      "x": 2,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_NUGGET",
+      "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index 5e06ed4cb..50e19cfe5 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -1,10 +1,10 @@
 FallarborTown_MapScripts:: @ 81EB1FA
-	map_script 3, FallarborTown_MapScript1_1EB200
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200
 	.byte 0
 
 FallarborTown_MapScript1_1EB200: @ 81EB200
 	setflag FLAG_VISITED_FALLARBOR_TOWN
-	setvar VAR_0x4086, 0
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
 	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end
 
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
deleted file mode 100644
index 681f5b028..000000000
--- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444
-	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-
-FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C
-	map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
deleted file mode 100644
index 3435512f2..000000000
--- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_BattleTentBattleRoom: @ 8482DCC
-	.4byte BattleTentBattleRoom_Layout
-	.4byte FallarborTown_BattleTentBattleRoom_MapEvents
-	.4byte FallarborTown_BattleTentBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 386
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json
new file mode 100644
index 000000000..da4c9fd4f
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json
@@ -0,0 +1,60 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM",
+  "name": "FallarborTown_BattleTentBattleRoom",
+  "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 3,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index dff1d26e0..b376f72e4 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -1,7 +1,7 @@
 FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
-	map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
-	map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
-	map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
 	.byte 0
 
 FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9
diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc
deleted file mode 100644
index 4af82f353..000000000
--- a/data/maps/FallarborTown_BattleTentCorridor/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-FallarborTown_BattleTentCorridor_EventObjects: @ 852E418
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430
-	map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc
deleted file mode 100644
index 4b45ea55d..000000000
--- a/data/maps/FallarborTown_BattleTentCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_BattleTentCorridor: @ 8482DB0
-	.4byte BattleTentCorridor_Layout
-	.4byte FallarborTown_BattleTentCorridor_MapEvents
-	.4byte FallarborTown_BattleTentCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 385
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json
new file mode 100644
index 000000000..60168264f
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentCorridor/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR",
+  "name": "FallarborTown_BattleTentCorridor",
+  "layout": "LAYOUT_BATTLE_TENT_CORRIDOR",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
index f3d0a924e..327033829 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
@@ -1,5 +1,5 @@
 FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
-	map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD
 	.byte 0
 
 FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD
diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc
deleted file mode 100644
index 6a9741c50..000000000
--- a/data/maps/FallarborTown_BattleTentLobby/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-FallarborTown_BattleTentLobby_EventObjects: @ 852E370
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
-
-FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8
-	warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN
-	warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN
-
-FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8
-	bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F
-
-FallarborTown_BattleTentLobby_MapEvents:: @ 852E404
-	map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents
-
diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc
deleted file mode 100644
index 2465f36c8..000000000
--- a/data/maps/FallarborTown_BattleTentLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_BattleTentLobby: @ 8482D94
-	.4byte BattleTentLobby_Layout
-	.4byte FallarborTown_BattleTentLobby_MapEvents
-	.4byte FallarborTown_BattleTentLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 384
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json
new file mode 100644
index 000000000..aa65e71a0
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentLobby/map.json
@@ -0,0 +1,110 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY",
+  "name": "FallarborTown_BattleTentLobby",
+  "layout": "LAYOUT_BATTLE_TENT_LOBBY",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_BattleTentLobby_EventScript_200001",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_BattleTentLobby_EventScript_20020D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_BattleTentLobby_EventScript_200216",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_BattleTentLobby_EventScript_20021F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 0,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_BattleTentLobby_EventScript_200228",
+      "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "FallarborTown_BattleTentLobby_EventScript_20024F"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index 5d05570cc..f6b7e1097 100644
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -1,6 +1,6 @@
 FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66
-	map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85
-	map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71
 	.byte 0
 
 FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
@@ -191,7 +191,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call FallarborTown_BattleTentLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB
@@ -296,7 +296,7 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
 	faceplayer
 	goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245
 	msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_FALLARBOR
 	release
 	end
diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc
deleted file mode 100644
index da261afb4..000000000
--- a/data/maps/FallarborTown_House1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FallarborTown_House1_EventObjects: @ 852E5B8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
-
-FallarborTown_House1_MapWarps: @ 852E5E8
-	warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN
-	warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN
-
-FallarborTown_House1_MapEvents:: @ 852E5F8
-	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
deleted file mode 100644
index d5362b8c5..000000000
--- a/data/maps/FallarborTown_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_House1: @ 8482E20
-	.4byte House1_Layout
-	.4byte FallarborTown_House1_MapEvents
-	.4byte FallarborTown_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_TONEKUSA
-	.2byte 59
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json
new file mode 100644
index 000000000..e5e75c631
--- /dev/null
+++ b/data/maps/FallarborTown_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_HOUSE1",
+  "name": "FallarborTown_House1",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_TONEKUSA",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_House1_EventScript_200F13",
+      "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_House1_EventScript_200FBC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc
index caf915e85..2255f90d3 100644
--- a/data/maps/FallarborTown_House1/scripts.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
@@ -20,7 +20,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38
 	msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM27
 	compare VAR_RESULT, 0
-	goto_if_eq FallarborTown_House1_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setvar VAR_0x8004, 280
 	call FallarborTown_House1_EventScript_2723E4
 	setflag FLAG_RECEIVED_TM27
diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc
deleted file mode 100644
index 1b4e1c96e..000000000
--- a/data/maps/FallarborTown_House2/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FallarborTown_House2_EventObjects: @ 852E60C
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0
-
-FallarborTown_House2_MapWarps: @ 852E624
-	warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN
-	warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN
-
-FallarborTown_House2_MapEvents:: @ 852E634
-	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
deleted file mode 100644
index 7cb16bbf3..000000000
--- a/data/maps/FallarborTown_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_House2: @ 8482E3C
-	.4byte House2_Layout
-	.4byte FallarborTown_House2_MapEvents
-	.4byte FallarborTown_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_TONEKUSA
-	.2byte 60
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json
new file mode 100644
index 000000000..fe0ce67a0
--- /dev/null
+++ b/data/maps/FallarborTown_House2/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_HOUSE2",
+  "name": "FallarborTown_House2",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_TONEKUSA",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_House2_EventScript_201383",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc
index 962c4f64e..d0305ad4b 100644
--- a/data/maps/FallarborTown_House2/scripts.inc
+++ b/data/maps/FallarborTown_House2/scripts.inc
@@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382
 
 FallarborTown_House2_EventScript_201383:: @ 8201383
 	lockall
-	applymovement 1, FallarborTown_House2_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8
 	msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT
@@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6
 
 FallarborTown_House2_EventScript_20140C:: @ 820140C
 	msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT
-	special TeachMoveTutorMove
+	special TeachMoveRelearnerMove
 	waitstate
 	compare VAR_0x8004, 0
 	goto_if_eq FallarborTown_House2_EventScript_2013D6
diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc
deleted file mode 100644
index 41bc31894..000000000
--- a/data/maps/FallarborTown_Mart/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_Mart_EventObjects: @ 852E2D4
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0
-	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0
-
-FallarborTown_Mart_MapWarps: @ 852E34C
-	warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN
-	warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN
-
-FallarborTown_Mart_MapEvents:: @ 852E35C
-	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
deleted file mode 100644
index 65c5caaa6..000000000
--- a/data/maps/FallarborTown_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_Mart: @ 8482D78
-	.4byte Mart_Layout
-	.4byte FallarborTown_Mart_MapEvents
-	.4byte FallarborTown_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json
new file mode 100644
index 000000000..9248eec87
--- /dev/null
+++ b/data/maps/FallarborTown_Mart/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_MART",
+  "name": "FallarborTown_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_Mart_EventScript_1FFCBF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_Mart_EventScript_1FFCF4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_Mart_EventScript_1FFCFD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SKITTY",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_Mart_EventScript_1FFD06",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_Mart_EventScript_2C80B6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
deleted file mode 100644
index cb6243c6f..000000000
--- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE
-
-FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
-	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:: @ 852E518
-	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
deleted file mode 100644
index b30b4874f..000000000
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_PokemonCenter_1F: @ 8482DE8
-	.4byte PokemonCenter_1F_Layout
-	.4byte FallarborTown_PokemonCenter_1F_MapEvents
-	.4byte FallarborTown_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..b1ea1ed14
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
+  "name": "FallarborTown_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01",
+      "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FALLARBOR_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index c9a7ef27c..d34e139eb 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
-	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
-	map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
+	map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
deleted file mode 100644
index 233eab8d9..000000000
--- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
-	warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4
-	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
deleted file mode 100644
index b818368bf..000000000
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_PokemonCenter_2F: @ 8482E04
-	.4byte PokemonCenter_2F_Layout
-	.4byte FallarborTown_PokemonCenter_2F_MapEvents
-	.4byte FallarborTown_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_FALLARBOR_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..029a4a9c6
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F",
+  "name": "FallarborTown_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_FALLARBOR_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 93482e860..8fce8e729 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
-	map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00
diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc
deleted file mode 100644
index 6c2a8ebe3..000000000
--- a/data/maps/FarawayIsland_Entrance/events.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-FarawayIsland_Entrance_EventObjects: @ 853D710
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-
-FarawayIsland_Entrance_MapWarps: @ 853D740
-	warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR
-	warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR
-
-FarawayIsland_Entrance_MapCoordEvents: @ 853D750
-	coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98
-	coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D
-	coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98
-
-FarawayIsland_Entrance_MapBGEvents: @ 853D780
-	bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1
-
-FarawayIsland_Entrance_MapEvents:: @ 853D78C
-	map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents
-
diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc
deleted file mode 100644
index af762d832..000000000
--- a/data/maps/FarawayIsland_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FarawayIsland_Entrance: @ 848575C
-	.4byte FarawayIsland_Entrance_Layout
-	.4byte FarawayIsland_Entrance_MapEvents
-	.4byte FarawayIsland_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 402
-	.byte MAPSEC_FARAWAY_ISLAND
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json
new file mode 100644
index 000000000..e8dc6dbed
--- /dev/null
+++ b/data/maps/FarawayIsland_Entrance/map.json
@@ -0,0 +1,99 @@
+{
+  "id": "MAP_FARAWAY_ISLAND_ENTRANCE",
+  "name": "FarawayIsland_Entrance",
+  "layout": "LAYOUT_FARAWAY_ISLAND_ENTRANCE",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_FARAWAY_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 13,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FarawayIsland_Entrance_EventScript_267CA2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
+      "x": 13,
+      "y": 41,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 23,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 18,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "FarawayIsland_Entrance_EventScript_267C98"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 20,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "FarawayIsland_Entrance_EventScript_267C9D"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "FarawayIsland_Entrance_EventScript_267C98"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 32,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "FarawayIsland_Entrance_EventScript_267CF1"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc
index 37c16885f..347c89aa0 100644
--- a/data/maps/FarawayIsland_Entrance/scripts.inc
+++ b/data/maps/FarawayIsland_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 FarawayIsland_Entrance_MapScripts:: @ 8267C8E
-	map_script 3, FarawayIsland_Entrance_MapScript1_267C94
+	map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94
 	.byte 0
 
 FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
@@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
 	goto_if_eq FarawayIsland_Entrance_EventScript_267CE7
 	msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE
diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc
deleted file mode 100644
index fc8d99166..000000000
--- a/data/maps/FarawayIsland_Interior/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FarawayIsland_Interior_EventObjects: @ 853D7A0
-	object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW
-
-FarawayIsland_Interior_MapWarps: @ 853D7B8
-	warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE
-	warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE
-
-FarawayIsland_Interior_MapEvents:: @ 853D7C8
-	map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc
deleted file mode 100644
index c37bacece..000000000
--- a/data/maps/FarawayIsland_Interior/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FarawayIsland_Interior: @ 8485778
-	.4byte FarawayIsland_Interior_Layout
-	.4byte FarawayIsland_Interior_MapEvents
-	.4byte FarawayIsland_Interior_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 403
-	.byte MAPSEC_FARAWAY_ISLAND
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json
new file mode 100644
index 000000000..b41c5461a
--- /dev/null
+++ b/data/maps/FarawayIsland_Interior/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_FARAWAY_ISLAND_INTERIOR",
+  "name": "FarawayIsland_Interior",
+  "layout": "LAYOUT_FARAWAY_ISLAND_INTERIOR",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_FARAWAY_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MEW",
+      "x": 13,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS",
+      "movement_range_x": 15,
+      "movement_range_y": 15,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "FarawayIsland_Interior_EventScript_267DF2",
+      "flag": "FLAG_HIDE_MEW"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index a1038edac..fe180184b 100644
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -1,8 +1,8 @@
 FarawayIsland_Interior_MapScripts:: @ 8267CFA
-	map_script 5, FarawayIsland_Interior_MapScript1_267D54
-	map_script 3, FarawayIsland_Interior_MapScript1_267D72
-	map_script 2, FarawayIsland_Interior_MapScript2_267D98
-	map_script 7, FarawayIsland_Interior_MapScript1_267D0F
+	map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54
+	map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F
 	.byte 0
 
 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
@@ -33,18 +33,18 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne FarawayIsland_Interior_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
 FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
-	setvar VAR_0x403A, 0
+	setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0
 	setvar VAR_TEMP_1, 1
 	call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
 	end
 
 FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
-	goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_MEW
 	setvar VAR_TEMP_1, 0
 	return
@@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98
 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
 	lockall
 	playse SE_PIN
-	applymovement 1, FarawayIsland_Interior_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, FarawayIsland_Interior_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 1, FarawayIsland_Interior_Movement_267DCE
 	waitmovement 0
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
deleted file mode 100644
index 0ea132989..000000000
--- a/data/maps/FieryPath/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-FieryPath_EventObjects: @ 8534C80
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE
-
-FieryPath_MapWarps: @ 8534D40
-	warp_def 26, 36, 3, 4, MAP_ROUTE112
-	warp_def 26, 4, 3, 5, MAP_ROUTE112
-
-FieryPath_MapEvents:: @ 8534D50
-	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
deleted file mode 100644
index 20278028f..000000000
--- a/data/maps/FieryPath/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FieryPath: @ 8484048
-	.4byte FieryPath_Layout
-	.4byte FieryPath_MapEvents
-	.4byte FieryPath_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 293
-	.byte MAPSEC_FIERY_PATH
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json
new file mode 100644
index 000000000..61324a8ff
--- /dev/null
+++ b/data/maps/FieryPath/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_FIERY_PATH",
+  "name": "FieryPath",
+  "layout": "LAYOUT_FIERY_PATH",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_FIERY_PATH",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_29119E",
+      "flag": "FLAG_ITEM_FIERY_PATH_TM06"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 17,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_2908BA",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 3,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_2908BA",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 6,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_2908BA",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 5,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_2908BA",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FieryPath_EventScript_291191",
+      "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 26,
+      "y": 36,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE112",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 26,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE112",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index 3888c61ef..ddba0dc0b 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -1,5 +1,5 @@
 FieryPath_MapScripts:: @ 8230F24
-	map_script 3, FieryPath_MapScript1_230F2A
+	map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A
 	.byte 0
 
 FieryPath_MapScript1_230F2A: @ 8230F2A
diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc
deleted file mode 100644
index 83b48c0ad..000000000
--- a/data/maps/FortreeCity/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FortreeCity_MapConnectionsList: @ 8486784
-	connection left, 0, MAP_ROUTE119
-	connection right, 0, MAP_ROUTE120
-
-FortreeCity_MapConnections: @ 848679C
-	.4byte 0x2
-	.4byte FortreeCity_MapConnectionsList
-
diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc
deleted file mode 100644
index 4dc9f3e83..000000000
--- a/data/maps/FortreeCity/events.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-FortreeCity_EventObjects: @ 8526B9C
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0
-	object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0
-	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON
-
-FortreeCity_MapWarps: @ 8526C44
-	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: @ 8526C8C
-	bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602
-	bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73
-	bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A
-	bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E260B
-	bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73
-	bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A
-
-FortreeCity_MapEvents:: @ 8526CD4
-	map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
-
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
deleted file mode 100644
index 0bfccda3c..000000000
--- a/data/maps/FortreeCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity: @ 8482528
-	.4byte FortreeCity_Layout
-	.4byte FortreeCity_MapEvents
-	.4byte FortreeCity_MapScripts
-	.4byte FortreeCity_MapConnections
-	.2byte MUS_MACHI_S3
-	.2byte 5
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
new file mode 100644
index 000000000..454fc34d3
--- /dev/null
+++ b/data/maps/FortreeCity/map.json
@@ -0,0 +1,236 @@
+{
+  "id": "MAP_FORTREE_CITY",
+  "name": "FortreeCity",
+  "layout": "LAYOUT_FORTREE_CITY",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE119"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE120"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 31,
+      "y": 3,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_EventScript_1E25B6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 32,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_EventScript_1E25DE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 32,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_EventScript_1E25BF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 11,
+      "y": 14,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_EventScript_1E25F0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_EventScript_1E25E7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_EventScript_1E25F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 25,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_EventScript_1E2614",
+      "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_GYM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_HOUSE3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 32,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_HOUSE4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_HOUSE5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 37,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY_DECORATION_SHOP",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "FortreeCity_EventScript_1E2602"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 26,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "FortreeCity_EventScript_1E260B"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
index d5c1ab29e..1c464df9d 100644
--- a/data/maps/FortreeCity/scripts.inc
+++ b/data/maps/FortreeCity/scripts.inc
@@ -1,6 +1,6 @@
 FortreeCity_MapScripts:: @ 81E25A4
-	map_script 3, FortreeCity_MapScript1_1E25AF
-	map_script 5, FortreeCity_MapScript1_1E25B3
+	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF
+	map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3
 	.byte 0
 
 FortreeCity_MapScript1_1E25AF: @ 81E25AF
diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc
deleted file mode 100644
index 2c5a0d21e..000000000
--- a/data/maps/FortreeCity_DecorationShop/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FortreeCity_DecorationShop_EventObjects: @ 85310B0
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0
-	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0
-	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0
-
-FortreeCity_DecorationShop_MapWarps: @ 8531110
-	warp_def 3, 5, 0, 8, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 8, MAP_FORTREE_CITY
-
-FortreeCity_DecorationShop_MapEvents:: @ 8531120
-	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
deleted file mode 100644
index 4a640a8ad..000000000
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_DecorationShop: @ 848361C
-	.4byte FortreeCity_DecorationShop_Layout
-	.4byte FortreeCity_DecorationShop_MapEvents
-	.4byte FortreeCity_DecorationShop_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 255
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json
new file mode 100644
index 000000000..a8654e708
--- /dev/null
+++ b/data/maps/FortreeCity_DecorationShop/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_FORTREE_CITY_DECORATION_SHOP",
+  "name": "FortreeCity_DecorationShop",
+  "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_DecorationShop_EventScript_21800E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_DecorationShop_EventScript_218017",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_DecorationShop_EventScript_218020",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_DecorationShop_EventScript_21804C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc
deleted file mode 100644
index 307d35cc7..000000000
--- a/data/maps/FortreeCity_Gym/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-FortreeCity_Gym_EventObjects: @ 8530C98
-	object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0
-
-FortreeCity_Gym_MapWarps: @ 8530D58
-	warp_def 15, 24, 0, 2, MAP_FORTREE_CITY
-	warp_def 16, 24, 0, 2, MAP_FORTREE_CITY
-
-FortreeCity_Gym_MapBGEvents: @ 8530D68
-	bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751
-	bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761
-
-FortreeCity_Gym_MapEvents:: @ 8530D80
-	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
deleted file mode 100644
index 68f02747f..000000000
--- a/data/maps/FortreeCity_Gym/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_Gym: @ 848353C
-	.4byte FortreeCity_Gym_Layout
-	.4byte FortreeCity_Gym_MapEvents
-	.4byte FortreeCity_Gym_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 100
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json
new file mode 100644
index 000000000..f985b2ce4
--- /dev/null
+++ b/data/maps/FortreeCity_Gym/map.json
@@ -0,0 +1,157 @@
+{
+  "id": "MAP_FORTREE_CITY_GYM",
+  "name": "FortreeCity_Gym",
+  "layout": "LAYOUT_FORTREE_CITY_GYM",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINONA",
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_Gym_EventScript_2165C8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 4,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "FortreeCity_Gym_EventScript_2166A8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "FortreeCity_Gym_EventScript_2166D6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 5,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "FortreeCity_Gym_EventScript_2166ED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "FortreeCity_Gym_EventScript_2166BF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 15,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_Gym_EventScript_216732",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 4,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "FortreeCity_Gym_EventScript_216704",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "FortreeCity_Gym_EventScript_21671B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 16,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 21,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "FortreeCity_Gym_EventScript_216751"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 21,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "FortreeCity_Gym_EventScript_216761"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 17633c0d5..8192e2039 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -1,6 +1,6 @@
 FortreeCity_Gym_MapScripts:: @ 82165AB
-	map_script 3, FortreeCity_Gym_MapScript1_2165B6
-	map_script 4, FortreeCity_Gym_MapScript2_2165BA
+	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA
 	.byte 0
 
 FortreeCity_Gym_MapScript1_2165B6: @ 82165B6
@@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
 FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	message FortreeCity_Gym_Text_216EEC
 	waitmessage
-	call FortreeCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag FLAG_BADGE06_GET
@@ -43,7 +43,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_WINONA_MATCH_CALL
-	setvar VAR_0x40F3, 0
+	setvar VAR_WINONA_CALL_STEP_COUNTER, 0
 	setflag FLAG_REGISTER_WINONA_POKENAV
 	release
 	end
@@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 FortreeCity_Gym_EventScript_216646:: @ 8216646
 	giveitem_std ITEM_TM40
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM40
 	release
@@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646
 FortreeCity_Gym_EventScript_21666A:: @ 821666A
 	giveitem_std ITEM_TM40
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM40
 	return
diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc
deleted file mode 100644
index 45b2a902a..000000000
--- a/data/maps/FortreeCity_House1/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House1_EventObjects: @ 8530C2C
-	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0
-	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0
-
-FortreeCity_House1_MapWarps: @ 8530C74
-	warp_def 3, 5, 0, 1, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 1, MAP_FORTREE_CITY
-
-FortreeCity_House1_MapEvents:: @ 8530C84
-	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
deleted file mode 100644
index 1b52dd725..000000000
--- a/data/maps/FortreeCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_House1: @ 8483520
-	.4byte FortreeCity_House1_Layout
-	.4byte FortreeCity_House1_MapEvents
-	.4byte FortreeCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 99
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json
new file mode 100644
index 000000000..62469515a
--- /dev/null
+++ b/data/maps/FortreeCity_House1/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_FORTREE_CITY_HOUSE1",
+  "name": "FortreeCity_House1",
+  "layout": "LAYOUT_FORTREE_CITY_HOUSE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House1_EventScript_2162BB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House1_EventScript_216368",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House1_EventScript_21635F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc
deleted file mode 100644
index f9a5c11ab..000000000
--- a/data/maps/FortreeCity_House2/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House2_EventObjects: @ 8530F30
-	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0
-
-FortreeCity_House2_MapWarps: @ 8530F60
-	warp_def 3, 5, 0, 4, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 4, MAP_FORTREE_CITY
-
-FortreeCity_House2_MapEvents:: @ 8530F70
-	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
deleted file mode 100644
index 02b76c394..000000000
--- a/data/maps/FortreeCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_House2: @ 84835AC
-	.4byte FortreeCity_House2_Layout
-	.4byte FortreeCity_House2_MapEvents
-	.4byte FortreeCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 101
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json
new file mode 100644
index 000000000..17f928fe9
--- /dev/null
+++ b/data/maps/FortreeCity_House2/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_FORTREE_CITY_HOUSE2",
+  "name": "FortreeCity_House2",
+  "layout": "LAYOUT_FORTREE_CITY_HOUSE2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House2_EventScript_2177CB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House2_EventScript_2C811E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc
index cebd18884..34344bca3 100644
--- a/data/maps/FortreeCity_House2/scripts.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
@@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB
 	msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM10
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_House2_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM10
 	msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc
deleted file mode 100644
index 23ae10688..000000000
--- a/data/maps/FortreeCity_House3/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House3_EventObjects: @ 8530F84
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0
-
-FortreeCity_House3_MapWarps: @ 8530FB4
-	warp_def 3, 5, 0, 5, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 5, MAP_FORTREE_CITY
-
-FortreeCity_House3_MapEvents:: @ 8530FC4
-	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
deleted file mode 100644
index 1b039c24e..000000000
--- a/data/maps/FortreeCity_House3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_House3: @ 84835C8
-	.4byte FortreeCity_House1_Layout
-	.4byte FortreeCity_House3_MapEvents
-	.4byte FortreeCity_House3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 99
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json
new file mode 100644
index 000000000..8b7e971c7
--- /dev/null
+++ b/data/maps/FortreeCity_House3/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_FORTREE_CITY_HOUSE3",
+  "name": "FortreeCity_House3",
+  "layout": "LAYOUT_FORTREE_CITY_HOUSE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House3_EventScript_217AE8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House3_EventScript_217AF1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc
deleted file mode 100644
index 8c7e03f76..000000000
--- a/data/maps/FortreeCity_House4/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House4_EventObjects: @ 8530FD8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
-
-FortreeCity_House4_MapWarps: @ 8531020
-	warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 6, MAP_FORTREE_CITY
-
-FortreeCity_House4_MapEvents:: @ 8531030
-	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
deleted file mode 100644
index e675e063b..000000000
--- a/data/maps/FortreeCity_House4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_House4: @ 84835E4
-	.4byte FortreeCity_House2_Layout
-	.4byte FortreeCity_House4_MapEvents
-	.4byte FortreeCity_House4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 101
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json
new file mode 100644
index 000000000..a9db995ed
--- /dev/null
+++ b/data/maps/FortreeCity_House4/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_FORTREE_CITY_HOUSE4",
+  "name": "FortreeCity_House4",
+  "layout": "LAYOUT_FORTREE_CITY_HOUSE2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House4_EventScript_217C81",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House4_EventScript_217C8A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House4_EventScript_217D20",
+      "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
index fe4aefe5f..5dc9d769a 100644
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -21,25 +21,25 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
 	end
 
 FortreeCity_House4_EventScript_217CC4:: @ 8217CC4
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FortreeCity_House4_EventScript_217CD8:: @ 8217CD8
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT
 	giveitem_std ITEM_MENTAL_HERB
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_House4_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MENTAL_HERB
 	releaseall
 	end
 
 FortreeCity_House4_EventScript_217D06:: @ 8217D06
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT
 	releaseall
diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc
deleted file mode 100644
index 8db01a8d0..000000000
--- a/data/maps/FortreeCity_House5/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House5_EventObjects: @ 8531044
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0
-	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0
-
-FortreeCity_House5_MapWarps: @ 853108C
-	warp_def 3, 5, 0, 7, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 7, MAP_FORTREE_CITY
-
-FortreeCity_House5_MapEvents:: @ 853109C
-	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
deleted file mode 100644
index bac2fff5b..000000000
--- a/data/maps/FortreeCity_House5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_House5: @ 8483600
-	.4byte FortreeCity_House1_Layout
-	.4byte FortreeCity_House5_MapEvents
-	.4byte FortreeCity_House5_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 99
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json
new file mode 100644
index 000000000..a60c02ec3
--- /dev/null
+++ b/data/maps/FortreeCity_House5/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_FORTREE_CITY_HOUSE5",
+  "name": "FortreeCity_House5",
+  "layout": "LAYOUT_FORTREE_CITY_HOUSE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House5_EventScript_217EF2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House5_EventScript_217F04",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_House5_EventScript_217EFB",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc
deleted file mode 100644
index e41280e89..000000000
--- a/data/maps/FortreeCity_Mart/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FortreeCity_Mart_EventObjects: @ 8530EAC
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0
-
-FortreeCity_Mart_MapWarps: @ 8530F0C
-	warp_def 3, 7, 0, 3, MAP_FORTREE_CITY
-	warp_def 4, 7, 0, 3, MAP_FORTREE_CITY
-
-FortreeCity_Mart_MapEvents:: @ 8530F1C
-	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
deleted file mode 100644
index 37af953ab..000000000
--- a/data/maps/FortreeCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_Mart: @ 8483590
-	.4byte Mart_Layout
-	.4byte FortreeCity_Mart_MapEvents
-	.4byte FortreeCity_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json
new file mode 100644
index 000000000..c1bb6df86
--- /dev/null
+++ b/data/maps/FortreeCity_Mart/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_FORTREE_CITY_MART",
+  "name": "FortreeCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_Mart_EventScript_217666",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_Mart_EventScript_217698",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_Mart_EventScript_2176A1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_Mart_EventScript_2176AA",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index f43cb4063..000000000
--- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0
-
-FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4
-	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:: @ 8530E0C
-	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
deleted file mode 100644
index f2fdf3769..000000000
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_PokemonCenter_1F: @ 8483558
-	.4byte PokemonCenter_1F_Layout
-	.4byte FortreeCity_PokemonCenter_1F_MapEvents
-	.4byte FortreeCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..efa58e87b
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F",
+  "name": "FortreeCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_217407",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_FORTREE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index 339cae9eb..070956590 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
-	map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_2173E3
-	map_script 5, FortreeCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3
+	map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index 028b5cada..000000000
--- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
-	warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98
-	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
deleted file mode 100644
index 1ad4484d9..000000000
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FortreeCity_PokemonCenter_2F: @ 8483574
-	.4byte PokemonCenter_2F_Layout
-	.4byte FortreeCity_PokemonCenter_2F_MapEvents
-	.4byte FortreeCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_FORTREE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..79bdfad30
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F",
+  "name": "FortreeCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_FORTREE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index f631aa3c6..dbe2e31ec 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
-	map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653
diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc
deleted file mode 100644
index 8228e1678..000000000
--- a/data/maps/GraniteCave_1F/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-GraniteCave_1F_EventObjects: @ 85343BC
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE
-
-GraniteCave_1F_MapWarps: @ 85343EC
-	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:: @ 853440C
-	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
deleted file mode 100644
index 7578523b2..000000000
--- a/data/maps/GraniteCave_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_1F: @ 8483F84
-	.4byte GraniteCave_1F_Layout
-	.4byte GraniteCave_1F_MapEvents
-	.4byte GraniteCave_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 132
-	.byte MAPSEC_GRANITE_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json
new file mode 100644
index 000000000..67f2e8000
--- /dev/null
+++ b/data/maps/GraniteCave_1F/map.json
@@ -0,0 +1,76 @@
+{
+  "id": "MAP_GRANITE_CAVE_1F",
+  "name": "GraniteCave_1F",
+  "layout": "LAYOUT_GRANITE_CAVE_1F",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_GRANITE_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 36,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_1F_EventScript_22DA5E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 17,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_1F_EventScript_291150",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 37,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE106",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 35,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_STEVENS_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc
deleted file mode 100644
index b27a68f17..000000000
--- a/data/maps/GraniteCave_B1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_B1F_EventObjects: @ 8534420
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL
-
-GraniteCave_B1F_MapWarps: @ 8534438
-	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:: @ 8534470
-	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
deleted file mode 100644
index 64187397c..000000000
--- a/data/maps/GraniteCave_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_B1F: @ 8483FA0
-	.4byte GraniteCave_B1F_Layout
-	.4byte GraniteCave_B1F_MapEvents
-	.4byte GraniteCave_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 133
-	.byte MAPSEC_GRANITE_CAVE
-	.byte 1
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json
new file mode 100644
index 000000000..b33e751e5
--- /dev/null
+++ b/data/maps/GraniteCave_B1F/map.json
@@ -0,0 +1,84 @@
+{
+  "id": "MAP_GRANITE_CAVE_B1F",
+  "name": "GraniteCave_B1F",
+  "layout": "LAYOUT_GRANITE_CAVE_B1F",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_GRANITE_CAVE",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 15,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B1F_EventScript_29115D",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 25,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 29,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 28,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B2F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 29,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B2F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc
index 360b10a08..099e5a501 100644
--- a/data/maps/GraniteCave_B1F/scripts.inc
+++ b/data/maps/GraniteCave_B1F/scripts.inc
@@ -1,7 +1,7 @@
 GraniteCave_B1F_MapScripts:: @ 822DC5E
-	map_script 2, GraniteCave_B1F_MapScript2_2A8327
-	map_script 3, GraniteCave_B1F_MapScript1_2A8331
-	map_script 5, GraniteCave_B1F_MapScript1_22DC6E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327
+	map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331
+	map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E
 	.byte 0
 
 GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E
diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc
deleted file mode 100644
index 08ac73a5a..000000000
--- a/data/maps/GraniteCave_B2F/events.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-GraniteCave_B2F_EventObjects: @ 8534484
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_12
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_13
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_14
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_15
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16
-	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17
-
-GraniteCave_B2F_MapWarps: @ 853455C
-	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: @ 8534584
-	bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1
-	bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2
-
-GraniteCave_B2F_MapEvents:: @ 853459C
-	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
deleted file mode 100644
index 4fd519156..000000000
--- a/data/maps/GraniteCave_B2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_B2F: @ 8483FBC
-	.4byte GraniteCave_B2F_Layout
-	.4byte GraniteCave_B2F_MapEvents
-	.4byte GraniteCave_B2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 134
-	.byte MAPSEC_GRANITE_CAVE
-	.byte 1
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json
new file mode 100644
index 000000000..48de00180
--- /dev/null
+++ b/data/maps/GraniteCave_B2F/map.json
@@ -0,0 +1,191 @@
+{
+  "id": "MAP_GRANITE_CAVE_B2F",
+  "name": "GraniteCave_B2F",
+  "layout": "LAYOUT_GRANITE_CAVE_B2F",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_GRANITE_CAVE",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_29116A",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 29,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_291177",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 3,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 2,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 4,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 6,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 3,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_17"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 29,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 28,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 29,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_B1F",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 28,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_EVERSTONE",
+      "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_EVERSTONE",
+      "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc
deleted file mode 100644
index 387770626..000000000
--- a/data/maps/GraniteCave_StevensRoom/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-GraniteCave_StevensRoom_EventObjects: @ 85345B0
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN
-
-GraniteCave_StevensRoom_MapWarps: @ 85345C8
-	warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
-
-GraniteCave_StevensRoom_MapEvents:: @ 85345D0
-	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
deleted file mode 100644
index 0bd8e41b2..000000000
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_StevensRoom: @ 8483FD8
-	.4byte GraniteCave_StevensRoom_Layout
-	.4byte GraniteCave_StevensRoom_MapEvents
-	.4byte GraniteCave_StevensRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 288
-	.byte MAPSEC_GRANITE_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json
new file mode 100644
index 000000000..ae5b61a6b
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_GRANITE_CAVE_STEVENS_ROOM",
+  "name": "GraniteCave_StevensRoom",
+  "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_GRANITE_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_StevensRoom_EventScript_22DC7B",
+      "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_GRANITE_CAVE_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc
deleted file mode 100644
index f8dbe9ad7..000000000
--- a/data/maps/InsideOfTruck/events.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-InsideOfTruck_EventObjects: @ 853A078
-	object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
-	object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
-	object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
-
-InsideOfTruck_MapWarps: @ 853A0C0
-	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: @ 853A0D8
-	coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04
-	coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04
-	coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04
-
-InsideOfTruck_MapBGEvents: @ 853A108
-	bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
-	bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
-	bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
-	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
-	bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
-
-InsideOfTruck_MapEvents:: @ 853A144
-	map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
-
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
deleted file mode 100644
index 52ea777a9..000000000
--- a/data/maps/InsideOfTruck/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-InsideOfTruck: @ 8484EF0
-	.4byte InsideOfTruck_Layout
-	.4byte InsideOfTruck_MapEvents
-	.4byte InsideOfTruck_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 237
-	.byte MAPSEC_INSIDE_OF_TRUCK
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json
new file mode 100644
index 000000000..ff76eb774
--- /dev/null
+++ b/data/maps/InsideOfTruck/map.json
@@ -0,0 +1,151 @@
+{
+  "id": "MAP_INSIDE_OF_TRUCK",
+  "name": "InsideOfTruck",
+  "layout": "LAYOUT_INSIDE_OF_TRUCK",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_INSIDE_OF_TRUCK",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX",
+      "x": 0,
+      "y": 0,
+      "elevation": 8,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "InsideOfTruck_EventScript_23BF6C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX",
+      "x": 0,
+      "y": 3,
+      "elevation": 8,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "InsideOfTruck_EventScript_23BF6C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX",
+      "x": 2,
+      "y": 3,
+      "elevation": 8,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "InsideOfTruck_EventScript_23BF6C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 4,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "var": "VAR_LITTLEROOT_INTRO_STATE",
+      "var_value": "0",
+      "script": "InsideOfTruck_EventScript_23BF04"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_LITTLEROOT_INTRO_STATE",
+      "var_value": "0",
+      "script": "InsideOfTruck_EventScript_23BF04"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_LITTLEROOT_INTRO_STATE",
+      "var_value": "0",
+      "script": "InsideOfTruck_EventScript_23BF04"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 0,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "InsideOfTruck_EventScript_23BF6C"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "InsideOfTruck_EventScript_23BF6C"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "InsideOfTruck_EventScript_23BF6C"
+    },
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "InsideOfTruck_EventScript_23BF6C"
+    },
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "InsideOfTruck_EventScript_23BF6C"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 858975d7a..0f7f5447d 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -1,6 +1,6 @@
 InsideOfTruck_MapScripts:: @ 823BEDA
-	map_script 1, InsideOfTruck_MapScript1_23BEE5
-	map_script 5, InsideOfTruck_MapScript1_23BF01
+	map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5
+	map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01
 	.byte 0
 
 InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
@@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_23BF01: @ 823BF01
 
 InsideOfTruck_EventScript_23BF04:: @ 823BF04
 	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq InsideOfTruck_EventScript_23BF20
@@ -25,26 +25,26 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
 
 InsideOfTruck_EventScript_23BF20:: @ 823BF20
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
-	setvar VAR_0x4092, 1
+	setvar VAR_LITTLEROOT_INTRO_STATE, 1
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
-	setvar VAR_0x408C, 1
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
 	releaseall
 	end
 
 InsideOfTruck_EventScript_23BF46:: @ 823BF46
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
-	setvar VAR_0x4092, 2
+	setvar VAR_LITTLEROOT_INTRO_STATE, 2
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
-	setvar VAR_0x4082, 1
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
 	releaseall
 	end
diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc
deleted file mode 100644
index f6abd57a7..000000000
--- a/data/maps/IslandCave/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-IslandCave_EventObjects: @ 8536C74
-	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE
-
-IslandCave_MapWarps: @ 8536C8C
-	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: @ 8536CA4
-	bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF
-	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D
-	bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D
-
-IslandCave_MapEvents:: @ 8536CC8
-	map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
-
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
deleted file mode 100644
index 767df72f0..000000000
--- a/data/maps/IslandCave/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-IslandCave: @ 8484614
-	.4byte IslandCave_Layout
-	.4byte IslandCave_MapEvents
-	.4byte IslandCave_MapScripts
-	.4byte 0x0
-	.2byte MUS_MABOROSI
-	.2byte 280
-	.byte MAPSEC_ISLAND_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json
new file mode 100644
index 000000000..27876f5e5
--- /dev/null
+++ b/data/maps/IslandCave/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_ISLAND_CAVE",
+  "name": "IslandCave",
+  "layout": "LAYOUT_ISLAND_CAVE",
+  "music": "MUS_MABOROSI",
+  "region_map_section": "MAPSEC_ISLAND_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REGICE",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "IslandCave_EventScript_238F58",
+      "flag": "FLAG_HIDE_REGICE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE105",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_ISLAND_CAVE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ISLAND_CAVE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "IslandCave_EventScript_238EEF"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "IslandCave_EventScript_238F1D"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "IslandCave_EventScript_238F1D"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index 7b551b4a7..cb400e817 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -1,7 +1,7 @@
 IslandCave_MapScripts:: @ 8238E2A
-	map_script 5, IslandCave_MapScript1_238E3A
-	map_script 1, IslandCave_MapScript1_238E58
-	map_script 3, IslandCave_MapScript1_238E99
+	map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A
+	map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58
+	map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99
 	.byte 0
 
 IslandCave_MapScript1_238E3A: @ 8238E3A
@@ -11,12 +11,12 @@ IslandCave_MapScript1_238E3A: @ 8238E3A
 IslandCave_EventScript_238E44:: @ 8238E44
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne IslandCave_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
 IslandCave_MapScript1_238E58: @ 8238E58
-	call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62
+	call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238E62
 	end
 
 IslandCave_EventScript_238E62:: @ 8238E62
@@ -47,13 +47,13 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
 	setmetatile 9, 20, 564, 1
 	special DrawWholeMapView
 	playse SE_BAN
-	setflag FLAG_SYS_BRAILLE_WAIT
+	setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
 	end
 
 IslandCave_EventScript_238EEF:: @ 8238EEF
 	lockall
 	call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
-	goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13
+	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F13
 	braillemessage IslandCave_Braille_2A6CD4
 	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
@@ -69,7 +69,7 @@ IslandCave_EventScript_238F1D:: @ 8238F1D
 	lockall
 	call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
 	braillemessage IslandCave_Braille_2A6CD4
-	goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41
+	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F41
 	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
 	goto IslandCave_EventScript_238F41
@@ -82,9 +82,9 @@ IslandCave_EventScript_238F41:: @ 8238F41
 	end
 
 IslandCave_EventScript_238F45:: @ 8238F45
-	setvar VAR_0x403B, 0
-	setvar VAR_0x403C, 0
-	setvar VAR_0x403D, 0
+	setvar VAR_REGICE_STEPS_1, 0
+	setvar VAR_REGICE_STEPS_2, 0
+	setvar VAR_REGICE_STEPS_3, 0
 	clearflag FLAG_TEMP_3
 	return
 
diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc
deleted file mode 100644
index f9a82c89b..000000000
--- a/data/maps/JaggedPass/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-JaggedPass_EventObjects: @ 8534AE4
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0
-	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
-	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0
-	object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0
-
-JaggedPass_MapWarps: @ 8534B8C
-	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
-	warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F
-
-JaggedPass_MapCoordEvents: @ 8534BB4
-	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
-	coord_event 21, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
-	coord_event 22, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
-	coord_event 21, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
-	coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
-	coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
-
-JaggedPass_MapBGEvents: @ 8534C54
-	bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL
-	bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL
-
-JaggedPass_MapEvents:: @ 8534C6C
-	map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
-
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
deleted file mode 100644
index f53bfbe65..000000000
--- a/data/maps/JaggedPass/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-JaggedPass: @ 848402C
-	.4byte JaggedPass_Layout
-	.4byte JaggedPass_MapEvents
-	.4byte JaggedPass_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 292
-	.byte MAPSEC_JAGGED_PASS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json
new file mode 100644
index 000000000..3ec89fce6
--- /dev/null
+++ b/data/maps/JaggedPass/map.json
@@ -0,0 +1,246 @@
+{
+  "id": "MAP_JAGGED_PASS",
+  "name": "JaggedPass",
+  "layout": "LAYOUT_JAGGED_PASS",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_JAGGED_PASS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "JaggedPass_EventScript_230785",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 16,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "JaggedPass_EventScript_2307FB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 23,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "JaggedPass_EventScript_291184",
+      "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 9,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "JaggedPass_EventScript_23079C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 16,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "JaggedPass_EventScript_230718",
+      "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 14,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "JaggedPass_EventScript_230871",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 18,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "JaggedPass_EventScript_23085A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 40,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE112",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 15,
+      "y": 40,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE112",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_MT_CHIMNEY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_MT_CHIMNEY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 16,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "weather",
+      "x": 13,
+      "y": 15,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 21,
+      "y": 12,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 18,
+      "y": 17,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 22,
+      "y": 19,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "trigger",
+      "x": 21,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_JAGGED_PASS_STATE",
+      "var_value": "1",
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 20,
+      "elevation": 3,
+      "var": "VAR_JAGGED_PASS_STATE",
+      "var_value": "1",
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 21,
+      "y": 20,
+      "elevation": 3,
+      "var": "VAR_JAGGED_PASS_STATE",
+      "var_value": "1",
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_JAGGED_PASS_STATE",
+      "var_value": "1",
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_JAGGED_PASS_STATE",
+      "var_value": "1",
+      "script": "JaggedPass_EventScript_2306BB"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "item": "ITEM_FULL_HEAL",
+      "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 29,
+      "elevation": 3,
+      "item": "ITEM_GREAT_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index 93788a703..c51a5ec26 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -1,12 +1,12 @@
 JaggedPass_MapScripts:: @ 8230656
-	map_script 5, JaggedPass_MapScript1_230666
-	map_script 3, JaggedPass_MapScript1_23068B
-	map_script 1, JaggedPass_MapScript1_23069C
+	map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666
+	map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B
+	map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C
 	.byte 0
 
 JaggedPass_MapScript1_230666: @ 8230666
 	setstepcallback 1
-	compare VAR_0x40C8, 0
+	compare VAR_JAGGED_PASS_STATE, 0
 	call_if_eq JaggedPass_EventScript_230674
 	end
 
@@ -17,11 +17,11 @@ JaggedPass_EventScript_230674:: @ 8230674
 	return
 
 JaggedPass_EventScript_230685:: @ 8230685
-	setvar VAR_0x40C8, 1
+	setvar VAR_JAGGED_PASS_STATE, 1
 	return
 
 JaggedPass_MapScript1_23068B: @ 823068B
-	compare VAR_0x40BD, 1
+	compare VAR_JAGGED_PASS_ASH_WEATHER, 1
 	call_if_eq JaggedPass_EventScript_230697
 	end
 
@@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697
 	return
 
 JaggedPass_MapScript1_23069C: @ 823069C
-	compare VAR_0x40C8, 1
+	compare VAR_JAGGED_PASS_STATE, 1
 	goto_if_le JaggedPass_EventScript_2306A8
 	end
 
@@ -61,7 +61,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
 	setmetatile 16, 18, 606, 0
 	special DrawWholeMapView
 	delay 30
-	setvar VAR_0x40C8, 2
+	setvar VAR_JAGGED_PASS_STATE, 2
 	waitse
 	releaseall
 	end
@@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718
 	goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766
 	waitse
 	playse SE_PIN
-	applymovement 5, JaggedPass_Movement_272598
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, JaggedPass_Movement_27259A
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 5, JaggedPass_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT
 	closemessage
 	trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D
 	setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS
-	applymovement 5, JaggedPass_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 JaggedPass_EventScript_230766:: @ 8230766
-	applymovement 5, JaggedPass_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, JaggedPass_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc
deleted file mode 100644
index 0b8181615..000000000
--- a/data/maps/LavaridgeTown/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-LavaridgeTown_MapConnectionsList: @ 8486660
-	connection right, -40, MAP_ROUTE112
-
-LavaridgeTown_MapConnections: @ 848666C
-	.4byte 0x1
-	.4byte LavaridgeTown_MapConnectionsList
-
diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc
deleted file mode 100644
index 6d34ee5c8..000000000
--- a/data/maps/LavaridgeTown/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LavaridgeTown_EventObjects: @ 8527A54
-	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0
-	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
-	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0
-	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0
-	object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
-	object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
-	object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0
-
-LavaridgeTown_MapWarps: @ 8527B2C
-	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: @ 8527B5C
-	coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA
-
-LavaridgeTown_MapBGEvents: @ 8527B6C
-	bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7
-	bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE
-	bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A
-	bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7A5
-	bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
-	bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A
-	bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
-	bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL
-
-LavaridgeTown_MapEvents:: @ 8527BCC
-	map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
-
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
deleted file mode 100644
index 6ea1e048c..000000000
--- a/data/maps/LavaridgeTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown: @ 8482608
-	.4byte LavaridgeTown_Layout
-	.4byte LavaridgeTown_MapEvents
-	.4byte LavaridgeTown_MapScripts
-	.4byte LavaridgeTown_MapConnections
-	.2byte MUS_MACHI_S4
-	.2byte 13
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_TOWN
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json
new file mode 100644
index 000000000..65a6a25d3
--- /dev/null
+++ b/data/maps/LavaridgeTown/map.json
@@ -0,0 +1,262 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN",
+  "name": "LavaridgeTown",
+  "layout": "LAYOUT_LAVARIDGE_TOWN",
+  "music": "MUS_MACHI_S4",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "right",
+      "offset": -40,
+      "map": "MAP_ROUTE112"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_EventScript_1EA73B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_EventScript_1EA70E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_EventScript_1EA717",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_EventScript_1EA720",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_EventScript_1EA729",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_EventScript_1EA732",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 6,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 12,
+      "y": 15,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_EventScript_1EA744",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN_HERB_SHOP",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "LavaridgeTown_EventScript_1EA6FA"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LavaridgeTown_EventScript_1EA7B7"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LavaridgeTown_EventScript_1EA7AE"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LavaridgeTown_EventScript_1EA7A5"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "hidden_item",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_ICE_HEAL",
+      "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 899df4d2c..acbb3fcd2 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -1,17 +1,17 @@
 LavaridgeTown_MapScripts:: @ 81EA4D3
-	map_script 3, LavaridgeTown_MapScript1_1EA4DE
-	map_script 2, LavaridgeTown_MapScript2_1EA547
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547
 	.byte 0
 
 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
 	setflag FLAG_VISITED_LAVARIDGE_TOWN
 	call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
 	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
-	call LavaridgeTown_EventScript_271ED7
-	call LavaridgeTown_EventScript_271EFB
-	compare VAR_0x4053, 1
+	call Common_EventScript_SetupRivalGender
+	call Common_EventScript_SetupRivalOnBikeGender
+	compare VAR_LAVARIDGE_RIVAL_STATE, 1
 	call_if_eq LavaridgeTown_EventScript_1EA518
-	compare VAR_0x4053, 1
+	compare VAR_LAVARIDGE_RIVAL_STATE, 1
 	call_if_eq LavaridgeTown_EventScript_1EA543
 	end
 
@@ -37,11 +37,11 @@ LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
 	return
 
 LavaridgeTown_EventScript_1EA543:: @ 81EA543
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LavaridgeTown_MapScript2_1EA547: @ 81EA547
-	map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551
+	map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_1EA551
 	.2byte 0
 
 LavaridgeTown_EventScript_1EA551:: @ 81EA551
@@ -94,8 +94,8 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
 	compare VAR_0x8008, 9
 	call_if_ne LavaridgeTown_EventScript_1EA6C9
 	removeobject 7
-	setvar VAR_0x4053, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
@@ -110,12 +110,12 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635
 	return
 
 LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
-	applymovement 8, LavaridgeTown_Movement_2725A6
+	applymovement 8, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 8, LavaridgeTown_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_27259A
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
 	return
 
@@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
 	waitmovement 0
 	closedoor 12, 15
 	waitdooranim
-	applymovement 8, LavaridgeTown_Movement_2725A4
+	applymovement 8, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 8, LavaridgeTown_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_27259A
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
deleted file mode 100644
index ee1cf057f..000000000
--- a/data/maps/LavaridgeTown_Gym_1F/events.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C
-	object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0
-
-LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC
-	warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN
-	warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN
-	warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 8, 9, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 17, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 9, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 2, 15, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 3, 14, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 1, 14, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 10, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 3, 10, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 6, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 3, 6, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 2, 3, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 2, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 7, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 8, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 10, 6, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 16, 0, 20, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 12, 3, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 14, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F
-
-LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C
-	bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B
-	bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B
-
-LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94
-	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
deleted file mode 100644
index 86882ed34..000000000
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_Gym_1F: @ 8482CD0
-	.4byte LavaridgeTown_Gym_1F_Layout
-	.4byte LavaridgeTown_Gym_1F_MapEvents
-	.4byte LavaridgeTown_Gym_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 69
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json
new file mode 100644
index 000000000..aae6afc03
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_1F/map.json
@@ -0,0 +1,299 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN_GYM_1F",
+  "name": "LavaridgeTown_Gym_1F",
+  "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FLANNERY",
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 3,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 2,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE900",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 3,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 10,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 0,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 2,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 3,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 1,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 0,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 3,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 13
+    },
+    {
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 14
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 15
+    },
+    {
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 16
+    },
+    {
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 17
+    },
+    {
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 18
+    },
+    {
+      "x": 4,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 20
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 19
+    },
+    {
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 21
+    },
+    {
+      "x": 13,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 22
+    },
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+      "dest_warp_id": 23
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE98B"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "LavaridgeTown_Gym_1F_EventScript_1FE99B"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index bf48225ec..bccd1dfef 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4
-	map_script 3, LavaridgeTown_Gym_1F_MapScript1_1FE6FA
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA
 	.byte 0
 
 LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA
@@ -71,18 +71,18 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
 LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 	message LavaridgeTown_Gym_1F_Text_1FF32F
 	waitmessage
-	call LavaridgeTown_Gym_1F_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT
 	setflag FLAG_FLANNERY_GIVES_BADGE_INFO
 	setflag FLAG_DEFEATED_LAVARIDGE_GYM
 	setflag FLAG_BADGE04_GET
-	addvar VAR_0x4085, 1
-	compare VAR_0x4085, 6
+	addvar VAR_PETALBURG_GYM_STATE, 1
+	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84
 	setvar VAR_0x8008, 4
 	call LavaridgeTown_Gym_1F_EventScript_271F43
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
-	setvar VAR_0x4053, 1
+	setvar VAR_LAVARIDGE_RIVAL_STATE, 1
 	call LavaridgeTown_Gym_1F_EventScript_1FE841
 	closemessage
 	delay 30
@@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	release
@@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
 LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	return
diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc
deleted file mode 100644
index 337bfd761..000000000
--- a/data/maps/LavaridgeTown_Gym_B1F/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0
-	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0
-
-LavaridgeTown_Gym_B1F_MapWarps: @ 852E008
-	warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 14, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 9, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 2, 15, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 3, 14, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 1, 14, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 0, 10, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 3, 10, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 0, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 3, 6, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 2, 3, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 2, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 7, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 8, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 10, 6, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 12, 3, 3, 22, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 4, 16, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 14, 6, 3, 23, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F
-
-LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8
-	map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
deleted file mode 100644
index b393e3693..000000000
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_Gym_B1F: @ 8482CEC
-	.4byte LavaridgeTown_Gym_B1F_Layout
-	.4byte LavaridgeTown_Gym_B1F_MapEvents
-	.4byte LavaridgeTown_Gym_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 70
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json
new file mode 100644
index 000000000..9679beb48
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_B1F/map.json
@@ -0,0 +1,242 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+  "name": "LavaridgeTown_Gym_B1F",
+  "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 4,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 13,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 4,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 0,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 2,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 3,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 1,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 0,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 3,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 13
+    },
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 14
+    },
+    {
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 15
+    },
+    {
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 16
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 17
+    },
+    {
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 18
+    },
+    {
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 19
+    },
+    {
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 20
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 22
+    },
+    {
+      "x": 4,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 21
+    },
+    {
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 23
+    },
+    {
+      "x": 13,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 24
+    },
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+      "dest_warp_id": 25
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
index a8a6eaa54..d2e8d90b5 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E
-	map_script 3, LavaridgeTown_Gym_B1F_MapScript1_1FF884
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884
 	.byte 0
 
 LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884
diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc
deleted file mode 100644
index f8602d872..000000000
--- a/data/maps/LavaridgeTown_HerbShop/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_HerbShop_EventObjects: @ 852DDB0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0
-
-LavaridgeTown_HerbShop_MapWarps: @ 852DDF8
-	warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN
-
-LavaridgeTown_HerbShop_MapEvents:: @ 852DE08
-	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
deleted file mode 100644
index 596d13482..000000000
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_HerbShop: @ 8482CB4
-	.4byte LavaridgeTown_HerbShop_Layout
-	.4byte LavaridgeTown_HerbShop_MapEvents
-	.4byte LavaridgeTown_HerbShop_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S4
-	.2byte 68
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json
new file mode 100644
index 000000000..203812fb2
--- /dev/null
+++ b/data/maps/LavaridgeTown_HerbShop/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP",
+  "name": "LavaridgeTown_HerbShop",
+  "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP",
+  "music": "MUS_MACHI_S4",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_HerbShop_EventScript_1FE505",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index e57996318..f6ad8e26b 100644
--- a/data/maps/LavaridgeTown_HerbShop/scripts.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
@@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
 	msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT
 	giveitem_std ITEM_CHARCOAL
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_HerbShop_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLFLAG_RECEIVED_CHARCOAL
 	release
 	end
diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc
deleted file mode 100644
index 0a44e6e8d..000000000
--- a/data/maps/LavaridgeTown_House/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_House_EventObjects: @ 852E0DC
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0
-	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0
-	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0
-
-LavaridgeTown_House_MapWarps: @ 852E124
-	warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN
-
-LavaridgeTown_House_MapEvents:: @ 852E134
-	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
deleted file mode 100644
index 11bb01e13..000000000
--- a/data/maps/LavaridgeTown_House/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_House: @ 8482D08
-	.4byte House3_Layout
-	.4byte LavaridgeTown_House_MapEvents
-	.4byte LavaridgeTown_House_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S4
-	.2byte 64
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json
new file mode 100644
index 000000000..a0cd74f59
--- /dev/null
+++ b/data/maps/LavaridgeTown_House/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN_HOUSE",
+  "name": "LavaridgeTown_House",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "MUS_MACHI_S4",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_House_EventScript_1FF912",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_House_EventScript_1FF91B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_House_EventScript_2C804E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc
deleted file mode 100644
index 8534faa7b..000000000
--- a/data/maps/LavaridgeTown_Mart/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_Mart_EventObjects: @ 852E148
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0
-
-LavaridgeTown_Mart_MapWarps: @ 852E190
-	warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN
-
-LavaridgeTown_Mart_MapEvents:: @ 852E1A0
-	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
deleted file mode 100644
index 1c3ce0caf..000000000
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_Mart: @ 8482D24
-	.4byte Mart_Layout
-	.4byte LavaridgeTown_Mart_MapEvents
-	.4byte LavaridgeTown_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json
new file mode 100644
index 000000000..2f8d1278f
--- /dev/null
+++ b/data/maps/LavaridgeTown_Mart/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN_MART",
+  "name": "LavaridgeTown_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_Mart_EventScript_1FF9CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_Mart_EventScript_1FF9FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_Mart_EventScript_1FFA07",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
deleted file mode 100644
index bf7246caa..000000000
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0
-	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0
-
-LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214
-	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:: @ 852E234
-	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
deleted file mode 100644
index 0f18f64e9..000000000
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_PokemonCenter_1F: @ 8482D40
-	.4byte LavaridgeTown_PokemonCenter_1F_Layout
-	.4byte LavaridgeTown_PokemonCenter_1F_MapEvents
-	.4byte LavaridgeTown_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 71
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..ef32ef660
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+  "name": "LavaridgeTown_PokemonCenter_1F",
+  "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 10,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LAVARIDGE_TOWN",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index f4fabbf72..2a0cb4a1e 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
-	map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05
-	map_script 5, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05
+	map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
deleted file mode 100644
index 6e1011dd8..000000000
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
-	warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0
-	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
deleted file mode 100644
index d66d90b73..000000000
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_PokemonCenter_2F: @ 8482D5C
-	.4byte PokemonCenter_2F_Layout
-	.4byte LavaridgeTown_PokemonCenter_2F_MapEvents
-	.4byte LavaridgeTown_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_LAVARIDGE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..95d1e194f
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F",
+  "name": "LavaridgeTown_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index b1491f621..b022df141 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
-	map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC
diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc
deleted file mode 100644
index d5469e561..000000000
--- a/data/maps/LilycoveCity/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-LilycoveCity_MapConnectionsList: @ 84867A4
-	connection left, 10, MAP_ROUTE121
-	connection right, -10, MAP_ROUTE124
-
-LilycoveCity_MapConnections: @ 84867BC
-	.4byte 0x2
-	.4byte LilycoveCity_MapConnectionsList
-
diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc
deleted file mode 100644
index 68a782212..000000000
--- a/data/maps/LilycoveCity/events.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-LilycoveCity_EventObjects: @ 8526CE8
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0
-	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0
-	object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
-	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
-	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
-	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL
-	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
-	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
-	object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
-	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
-	object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL
-	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
-	object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0
-	object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0
-	object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0
-
-LilycoveCity_MapWarps: @ 8526EF8
-	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
-
-LilycoveCity_MapBGEvents: @ 8526F68
-	bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A
-	bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73
-	bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B
-	bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73
-	bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2CFF
-	bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D08
-	bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D11
-	bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44
-	bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62
-	bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74
-	bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE
-	bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP
-	bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL
-
-LilycoveCity_MapEvents:: @ 8527004
-	map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
-
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
deleted file mode 100644
index cf3ebf2f5..000000000
--- a/data/maps/LilycoveCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity: @ 8482544
-	.4byte LilycoveCity_Layout
-	.4byte LilycoveCity_MapEvents
-	.4byte LilycoveCity_MapScripts
-	.4byte LilycoveCity_MapConnections
-	.2byte MUS_MINAMO
-	.2byte 6
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
new file mode 100644
index 000000000..ea771c3b5
--- /dev/null
+++ b/data/maps/LilycoveCity/map.json
@@ -0,0 +1,522 @@
+{
+  "id": "MAP_LILYCOVE_CITY",
+  "name": "LilycoveCity",
+  "layout": "LAYOUT_LILYCOVE_CITY",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 10,
+      "map": "MAP_ROUTE121"
+    },
+    {
+      "direction": "right",
+      "offset": -10,
+      "map": "MAP_ROUTE124"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 32,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2C53",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 15,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2C2B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 28,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2C22",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 21,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2C4A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 16,
+      "y": 9,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2C91",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 35,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2C72",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 35,
+      "y": 37,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2C9A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 34,
+      "y": 37,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2CA3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 57,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2CAC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 73,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2D7D",
+      "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 61,
+      "y": 36,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_2910E8",
+      "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 43,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2DD5",
+      "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 46,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2DBA",
+      "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 45,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2DC3",
+      "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 38,
+      "y": 9,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2DCC",
+      "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 50,
+      "y": 7,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2BD8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 27,
+      "y": 7,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2DDE",
+      "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 16,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E302D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 41,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2CEE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 40,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2CDD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 16,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2CCB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 16,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_EventScript_1E2CD4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 27,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 37,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 24,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 23,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 39,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 70,
+      "y": 5,
+      "elevation": 1,
+      "dest_map": "MAP_AQUA_HIDEOUT_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 36,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 42,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 55,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 22,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_HOUSE3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_HOUSE4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_HARBOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2D1A"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 29,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2D6B"
+    },
+    {
+      "type": "sign",
+      "x": 26,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2CFF"
+    },
+    {
+      "type": "sign",
+      "x": 29,
+      "y": 24,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2D08"
+    },
+    {
+      "type": "sign",
+      "x": 35,
+      "y": 24,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2D11"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 30,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2D44"
+    },
+    {
+      "type": "sign",
+      "x": 36,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2D62"
+    },
+    {
+      "type": "sign",
+      "x": 34,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_EventScript_1E2D74"
+    },
+    {
+      "type": "hidden_item",
+      "x": 36,
+      "y": 31,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 61,
+      "y": 7,
+      "elevation": 0,
+      "item": "ITEM_PP_UP",
+      "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP"
+    },
+    {
+      "type": "hidden_item",
+      "x": 64,
+      "y": 31,
+      "elevation": 0,
+      "item": "ITEM_POKE_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index c1cec509f..7f4c9e3fd 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -1,14 +1,14 @@
 LilycoveCity_MapScripts:: @ 81E2B3C
-	map_script 3, LilycoveCity_MapScript1_1E2B47
-	map_script 1, LilycoveCity_MapScript1_1E2B61
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61
 	.byte 0
 
 LilycoveCity_MapScript1_1E2B47: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
-	setvar VAR_0x4086, 0
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
-	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A
-	call LilycoveCity_EventScript_271ED7
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call Common_EventScript_SetupRivalGender
 	end
 
 LilycoveCity_MapScript1_1E2B61: @ 81E2B61
@@ -33,14 +33,14 @@ LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
 LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
 	msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
 	msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
 	release
@@ -134,13 +134,13 @@ LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4
 LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD
 	lockall
 	msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC
-	applymovement 20, LilycoveCity_Movement_2725A2
+	applymovement 20, Common_Movement_FaceOriginalDirection
 	end
 
 LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE
 	lockall
 	msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC
-	applymovement 19, LilycoveCity_Movement_2725A2
+	applymovement 19, Common_Movement_FaceOriginalDirection
 	end
 
 LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF
@@ -197,10 +197,10 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
 	lockall
 	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0
 	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
@@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD
 
 LilycoveCity_EventScript_1E3006:: @ 81E3006
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc
deleted file mode 100644
index 61d1cd63a..000000000
--- a/data/maps/LilycoveCity_ContestHall/events.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-LilycoveCity_ContestHall_EventObjects: @ 8531850
-	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0
-	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0
-	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0
-	object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0
-	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0
-	object_event 9, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0
-	object_event 10, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0
-	object_event 11, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0
-	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0
-	object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0
-	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_4, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0
-	object_event 16, EVENT_OBJ_GFX_TWIN, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0
-	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0
-	object_event 18, EVENT_OBJ_GFX_POKEFAN_F, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0
-	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0
-	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0
-	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0
-	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0
-	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0
-	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0
-	object_event 28, EVENT_OBJ_GFX_EXPERT_F, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0
-	object_event 29, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0
-	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0
-	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0
-	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0
-
-LilycoveCity_ContestHall_MapWarps: @ 8531B50
-	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: @ 8531B70
-	bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733
-	bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C
-	bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745
-	bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745
-	bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733
-	bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C
-
-LilycoveCity_ContestHall_MapEvents:: @ 8531BB8
-	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
deleted file mode 100644
index eb07c7d59..000000000
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_ContestHall: @ 84836C4
-	.4byte LilycoveCity_ContestHall_Layout
-	.4byte LilycoveCity_ContestHall_MapEvents
-	.4byte LilycoveCity_ContestHall_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONLOBBY
-	.2byte 106
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json
new file mode 100644
index 000000000..3522c7963
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestHall/map.json
@@ -0,0 +1,515 @@
+{
+  "id": "MAP_LILYCOVE_CITY_CONTEST_HALL",
+  "name": "LilycoveCity_ContestHall",
+  "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL",
+  "music": "MUS_CONLOBBY",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 30,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 4,
+      "movement_range_y": 4,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B485",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B48E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 40,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B497",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 12,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B4A9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE",
+      "x": 15,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B4C0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 10,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B4D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 12,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B4EE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 14,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B505",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 16,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B51C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 8,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B533",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 18,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B56A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 8,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B53C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 24,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B581",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE",
+      "x": 27,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B598",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 22,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B5AF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 24,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B5C6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 26,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B5DD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 28,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B5F4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 20,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B60B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B639",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 26,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B622",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 13,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B553",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 36,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B650",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE",
+      "x": 39,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B667",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 34,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B67E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 36,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B695",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 38,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B6AC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 40,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B6C3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 32,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B6DA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 37,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B71C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 42,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B705",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 23,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestHall_EventScript_21B4A0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 30,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 20,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 31,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestHall_EventScript_21B733"
+    },
+    {
+      "type": "sign",
+      "x": 39,
+      "y": 28,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 28,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestHall_EventScript_21B745"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 28,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestHall_EventScript_21B745"
+    },
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestHall_EventScript_21B733"
+    },
+    {
+      "type": "sign",
+      "x": 35,
+      "y": 28,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index f6a53cc5e..5823b6da4 100644
--- a/data/maps/LilycoveCity_ContestHall/scripts.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
@@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -32,7 +32,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -42,7 +42,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -52,7 +52,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -72,7 +72,7 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT
 	closemessage
-	applymovement 9, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 9, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT
 	closemessage
-	applymovement 12, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT
 	closemessage
-	applymovement 22, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 22, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT
 	closemessage
-	applymovement 11, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 11, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -116,7 +116,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT
 	closemessage
-	applymovement 13, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -126,7 +126,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT
 	closemessage
-	applymovement 14, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -136,7 +136,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT
 	closemessage
-	applymovement 15, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT
 	closemessage
-	applymovement 16, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 16, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -156,7 +156,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 17, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 17, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -166,7 +166,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT
 	closemessage
-	applymovement 18, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -176,7 +176,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 19, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT
 	closemessage
-	applymovement 21, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 21, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -196,7 +196,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT
 	closemessage
-	applymovement 20, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 20, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -206,7 +206,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 23, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -216,7 +216,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT
 	closemessage
-	applymovement 24, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 24, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -226,7 +226,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 25, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 25, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -236,7 +236,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT
 	closemessage
-	applymovement 26, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -246,7 +246,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT
 	closemessage
-	applymovement 27, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -256,18 +256,18 @@ LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT
 	closemessage
-	applymovement 28, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA
 	lockall
-	applymovement 29, LilycoveCity_ContestHall_Movement_27259E
+	applymovement 29, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 29, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	delay 25
 	msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT
@@ -279,7 +279,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -289,7 +289,7 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT
 	closemessage
-	applymovement 30, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
deleted file mode 100644
index fa04b72e7..000000000
--- a/data/maps/LilycoveCity_ContestLobby/events.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-LilycoveCity_ContestLobby_EventObjects: @ 8531534
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0
-	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0
-	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0
-	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0
-	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
-	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0
-	object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0
-	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2
-	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0
-	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0
-	object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0
-	object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0
-	object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
-	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
-	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
-	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
-	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
-	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
-	object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
-	object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
-	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0
-
-LilycoveCity_ContestLobby_MapWarps: @ 853178C
-	warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY
-	warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY
-	warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL
-	warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL
-
-LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
-	bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink
-	bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E
-	bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753
-	bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A
-	bg_event 27, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A761
-	bg_event 30, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A77A
-	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E
-	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745
-	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C
-	bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask
-	bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D
-	bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784
-
-LilycoveCity_ContestLobby_MapEvents:: @ 853183C
-	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
deleted file mode 100644
index 605d594d3..000000000
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_ContestLobby: @ 84836A8
-	.4byte LilycoveCity_ContestLobby_Layout
-	.4byte LilycoveCity_ContestLobby_MapEvents
-	.4byte LilycoveCity_ContestLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONLOBBY
-	.2byte 105
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json
new file mode 100644
index 000000000..3cbb48f21
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/map.json
@@ -0,0 +1,472 @@
+{
+  "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+  "name": "LilycoveCity_ContestLobby",
+  "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY",
+  "music": "MUS_CONLOBBY",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A554",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A806",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 26,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_293FA2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARTIST",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 18,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A708",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A711",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARTIST",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A71A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_M",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_28CA59",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 23,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A768",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 28,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_293FB4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARTIST",
+      "x": 21,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A72C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 0,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A723",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A735",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_293FAB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 26,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_293FBD",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 24,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A771",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 27,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A7B3",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 28,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A7BE",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 28,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A7C9",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2",
+      "x": 26,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A7D9",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 27,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A7E9",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 26,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A7A8",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 26,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A798",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_ContestLobby_EventScript_21ACF1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 15,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 21,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "EventScript_PblockLink"
+    },
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_293E1E"
+    },
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A753"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A75A"
+    },
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A761"
+    },
+    {
+      "type": "sign",
+      "x": 30,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A77A"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A73E"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A745"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A74C"
+    },
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "EventScript_Pblock1_Ask"
+    },
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_293D4D"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_ContestLobby_EventScript_21A784"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 42ce7beeb..d5dac8bfd 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_ContestLobby_MapScripts:: @ 821A211
-	map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C
-	map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243
 	.byte 0
 
 LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C
@@ -22,13 +22,13 @@ LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
 	return
 
 LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
-	map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255
-	map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427
 	.2byte 0
 
 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
 	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264
-	setvar VAR_0x4099, 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264
@@ -55,7 +55,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
 	msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
 	closemessage
 	special sub_80F88DC
-	setvar VAR_0x4099, 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar VAR_RESULT, GiveMonArtistRibbon
 	compare VAR_RESULT, 1
 	call_if_eq LilycoveCity_ContestLobby_EventScript_21A314
@@ -75,7 +75,7 @@ LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4
 	closemessage
 	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
 	waitmovement 0
-	setvar VAR_0x4099, 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	removeobject 4
 	releaseall
 	end
@@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
 	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A
 	waitmovement 0
 	playse SE_PIN
-	applymovement 4, LilycoveCity_ContestLobby_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E
 	waitmovement 0
@@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
 
 LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
 	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436
-	setvar VAR_0x4099, 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436
@@ -227,7 +227,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
 	msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
 	closemessage
 	special sub_80F88DC
-	setvar VAR_0x4099, 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar VAR_RESULT, GiveMonArtistRibbon
 	compare VAR_RESULT, 1
 	call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4
@@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4
 	closemessage
 	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
 	waitmovement 0
-	setvar VAR_0x4099, 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	removeobject 11
 	releaseall
 	end
@@ -259,7 +259,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
 	applymovement 11, LilycoveCity_ContestLobby_Movement_21A547
 	waitmovement 0
 	playse SE_PIN
-	applymovement 11, LilycoveCity_ContestLobby_Movement_272598
+	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B
 	waitmovement 0
@@ -338,28 +338,28 @@ LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7
-	setvar VAR_0x4088, 1
+	setvar VAR_CONTEST_LOCATION, 1
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD
-	setvar VAR_0x4088, 2
+	setvar VAR_CONTEST_LOCATION, 2
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3
-	setvar VAR_0x4088, 3
+	setvar VAR_CONTEST_LOCATION, 3
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
-	setvar VAR_0x4088, 4
+	setvar VAR_CONTEST_LOCATION, 4
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-	copyvar VAR_0x4094, 0x1
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
 	giveitem ITEM_CONTEST_PASS, 1
 	setvar VAR_0x800B, 8
 	setvar VAR_CONTEST_RANK, 3
-	setvar VAR_0x4099, 1
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
 	setflag FLAG_SYS_RIBBON_GET
 	end
 
@@ -614,7 +614,7 @@ LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9
 
 LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -642,7 +642,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
 	msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	call LilycoveCity_ContestLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
 	message LilycoveCity_ContestLobby_Text_27C8FD
@@ -833,9 +833,9 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17
 	waitmessage
 	subvar VAR_0x8004, 1
 	call LilycoveCity_ContestLobby_EventScript_21AC49
-	setvar VAR_0x4086, 1
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
 	special sub_80F8AFC
-	setvar VAR_0x4088, 5
+	setvar VAR_CONTEST_LOCATION, 5
 	setvar VAR_CONTEST_RANK, 3
 	call LilycoveCity_ContestLobby_EventScript_21A5EF
 	end
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
deleted file mode 100644
index 66fd112c4..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0
-
-LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C
-	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: @ 8531164
-	coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211
-
-LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174
-	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
deleted file mode 100644
index 0322b01e1..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F: @ 8483638
-	.4byte LilycoveCity_CoveLilyMotel_1F_Layout
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapEvents
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 299
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
new file mode 100644
index 000000000..8f251039c
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
@@ -0,0 +1,66 @@
+{
+  "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
+  "name": "LilycoveCity_CoveLilyMotel_1F",
+  "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index 7ccc8b82f..87e4c0afd 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
@@ -6,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
 LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
 	lockall
 	playse SE_PIN
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
deleted file mode 100644
index d7e508ec6..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT
-
-LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
-	warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
-
-LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238
-	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
deleted file mode 100644
index 92ccdc1b3..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F: @ 8483654
-	.4byte LilycoveCity_CoveLilyMotel_2F_Layout
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapEvents
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 300
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
new file mode 100644
index 000000000..0bd551815
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
@@ -0,0 +1,120 @@
+{
+  "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
+  "name": "LilycoveCity_CoveLilyMotel_2F",
+  "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3",
+      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729",
+      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732",
+      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720",
+      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744",
+      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B",
+      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D",
+      "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index 03ac733f9..fd6aa34bd 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -26,7 +26,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702
 LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
 	message LilycoveCity_CoveLilyMotel_2F_Text_21881C
 	waitmessage
-	call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	special Special_ShowDiploma
 	waitstate
 	release
@@ -57,7 +57,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D
 	faceplayer
 	goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_LILYCOVE
 	release
 	end
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
deleted file mode 100644
index adafc5b61..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0
-
-LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8
-	warp_def 1, 5, 3, 127, MAP_NONE
-	warp_def 2, 5, 3, 127, MAP_NONE
-
-LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8
-	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
deleted file mode 100644
index eb728241b..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStoreElevator: @ 84838A0
-	.4byte LilycoveCity_DepartmentStoreElevator_Layout
-	.4byte LilycoveCity_DepartmentStoreElevator_MapEvents
-	.4byte LilycoveCity_DepartmentStoreElevator_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 273
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
new file mode 100644
index 000000000..75a1fddf9
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+  "name": "LilycoveCity_DepartmentStoreElevator",
+  "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index 80a93df47..18fc0404b 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
 	special sub_8139C10
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	waitse
 	special ShakeScreenInElevator
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
deleted file mode 100644
index 594a439ce..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0
-	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0
-
-LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C
-	warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
-
-LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484
-	bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
-	bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
-
-LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C
-	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
deleted file mode 100644
index 73ba491c3..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStoreRooftop: @ 8483884
-	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapEvents
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 262
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
new file mode 100644
index 000000000..7514a548a
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
@@ -0,0 +1,98 @@
+{
+  "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
+  "name": "LilycoveCity_DepartmentStoreRooftop",
+  "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN",
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F",
+      "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 15,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index d5379f96a..f1c974dd9 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
-	map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D
 	.byte 0
 
 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
deleted file mode 100644
index dfd7cc46d..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0
-	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0
-	object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0
-	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0
-
-LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C
-	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: @ 853213C
-	bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D
-
-LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148
-	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
deleted file mode 100644
index 949b23403..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_1F: @ 84837F8
-	.4byte LilycoveCity_DepartmentStore_1F_Layout
-	.4byte LilycoveCity_DepartmentStore_1F_MapEvents
-	.4byte LilycoveCity_DepartmentStore_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 257
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
new file mode 100644
index 000000000..564377f7f
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
@@ -0,0 +1,137 @@
+{
+  "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
+  "name": "LilycoveCity_DepartmentStore_1F",
+  "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZUMARILL",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F85D"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index 2f8fcda3a..1e01fc168 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
@@ -8,8 +8,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693
 LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	lock
 	faceplayer
-	dodailyevents
-	compare VAR_POKELOT_PRIZE, 0
+	dotimebasedevents
+	compare VAR_POKELOT_PRIZE_ITEM, 0
 	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7
 	goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
 	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO
@@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	copyvar VAR_0x8008, VAR_RESULT
 	special BufferLottoTicketNumber
 	msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT
-	applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	playse SE_PC_ON
 	special DoLotteryCornerComputerEffect
@@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	delay 220
 	special EndLotteryCornerComputerEffect
 	delay 10
-	applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x8004, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1
@@ -100,8 +100,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4
 	return
 
 LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD
-	copyvar VAR_0x404D, VAR_0x8004
-	copyvar VAR_POKELOT_PRIZE, VAR_0x8005
+	copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004
+	copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005
 	goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
 	end
 
@@ -112,14 +112,14 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED
 
 LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7
 	msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT
-	giveitem_std VAR_POKELOT_PRIZE
+	giveitem_std VAR_POKELOT_PRIZE_ITEM
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
-	copyvar VAR_0x8004, VAR_0x404D
-	copyvar VAR_0x8005, VAR_POKELOT_PRIZE
+	copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE
+	copyvar VAR_0x8005, VAR_POKELOT_PRIZE_ITEM
 	special sub_80EE2CC
-	setvar VAR_POKELOT_PRIZE, 0
-	setvar VAR_0x404D, 0
+	setvar VAR_POKELOT_PRIZE_ITEM, 0
+	setvar VAR_POKELOT_PRIZE_PLACE, 0
 	release
 	end
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
deleted file mode 100644
index 9e7d5514e..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C
-	object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0
-	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0
-
-LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4
-	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:: @ 85321EC
-	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
deleted file mode 100644
index 01f94ac14..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_2F: @ 8483814
-	.4byte LilycoveCity_DepartmentStore_2F_Layout
-	.4byte LilycoveCity_DepartmentStore_2F_MapEvents
-	.4byte LilycoveCity_DepartmentStore_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 258
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
new file mode 100644
index 000000000..3238eeee8
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
+  "name": "LilycoveCity_DepartmentStore_2F",
+  "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_COOK",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
deleted file mode 100644
index 84796fad4..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200
-	object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0
-
-LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278
-	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:: @ 8532290
-	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
deleted file mode 100644
index bc62df7d6..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_3F: @ 8483830
-	.4byte LilycoveCity_DepartmentStore_3F_Layout
-	.4byte LilycoveCity_DepartmentStore_3F_MapEvents
-	.4byte LilycoveCity_DepartmentStore_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 259
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
new file mode 100644
index 000000000..9ecf5104a
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
+  "name": "LilycoveCity_DepartmentStore_3F",
+  "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
deleted file mode 100644
index 7b39c9194..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0
-
-LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C
-	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:: @ 8532334
-	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
deleted file mode 100644
index 94a8d29c6..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_4F: @ 848384C
-	.4byte LilycoveCity_DepartmentStore_4F_Layout
-	.4byte LilycoveCity_DepartmentStore_4F_MapEvents
-	.4byte LilycoveCity_DepartmentStore_4F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 260
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
new file mode 100644
index 000000000..2abccb783
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
+  "name": "LilycoveCity_DepartmentStore_4F",
+  "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
deleted file mode 100644
index 2118c33e8..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0
-
-LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0
-	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:: @ 8532408
-	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
deleted file mode 100644
index 6c8070d80..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_5F: @ 8483868
-	.4byte LilycoveCity_DepartmentStore_5F_Layout
-	.4byte LilycoveCity_DepartmentStore_5F_MapEvents
-	.4byte LilycoveCity_DepartmentStore_5F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 261
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
new file mode 100644
index 000000000..a49de9255
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
@@ -0,0 +1,134 @@
+{
+  "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
+  "name": "LilycoveCity_DepartmentStore_5F",
+  "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 17,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index b278d3e14..7cab0f1fa 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
@@ -1,11 +1,11 @@
 LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
-	map_script 4, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80
 	.byte 0
 
 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80
-	map_script_2 VAR_0x405E, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
-	map_script_2 VAR_0x405E, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
-	map_script_2 VAR_0x405E, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
+	map_script_2 VAR_RAYQUAZA_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
+	map_script_2 VAR_RAYQUAZA_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
+	map_script_2 VAR_RAYQUAZA_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
 	.2byte 0
 
 LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A
@@ -123,11 +123,11 @@ LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C
 
 LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075
 	lockall
-	applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E
+	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x405E, 0
+	compare VAR_RAYQUAZA_STATE, 0
 	goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C
 	goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7
 	end
@@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C
 LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7
 	msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6
+	applymovement 7, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	releaseall
 	end
diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc
deleted file mode 100644
index 4f69e4fc6..000000000
--- a/data/maps/LilycoveCity_Harbor/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_Harbor_EventObjects: @ 8531E1C
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
-	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0
-	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR
-	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER
-
-LilycoveCity_Harbor_MapWarps: @ 8531E94
-	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
-	warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY
-
-LilycoveCity_Harbor_MapEvents:: @ 8531EA4
-	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
deleted file mode 100644
index e818c894f..000000000
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_Harbor: @ 8483750
-	.4byte Harbor_Layout
-	.4byte LilycoveCity_Harbor_MapEvents
-	.4byte LilycoveCity_Harbor_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 88
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json
new file mode 100644
index 000000000..28e2366e6
--- /dev/null
+++ b/data/maps/LilycoveCity_Harbor/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_LILYCOVE_CITY_HARBOR",
+  "name": "LilycoveCity_Harbor",
+  "layout": "LAYOUT_HARBOR",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_Harbor_EventScript_21E00F",
+      "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
+      "x": 8,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 3,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_Harbor_EventScript_21E637",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 12,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 12
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 5e9157826..67b05c692 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -1,5 +1,5 @@
 LilycoveCity_Harbor_MapScripts:: @ 821E000
-	map_script 3, LilycoveCity_Harbor_MapScript1_21E006
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006
 	.byte 0
 
 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006
@@ -107,45 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171
 
 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
 	setvar VAR_TEMP_E, 0
-	goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn
 	checkitem ITEM_EON_TICKET, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_E, 1
-	goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_E, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
 	setvar VAR_TEMP_D, 0
-	goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_AURORA_TICKET, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_D, 1
-	goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_D, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
 	setvar VAR_TEMP_C, 0
-	goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_OLD_SEA_MAP, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_C, 1
-	goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn
 	setvar VAR_TEMP_C, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
 	setvar VAR_TEMP_9, 0
-	goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn
 	checkitem ITEM_MYSTIC_TICKET, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_9, 1
-	goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_9, 2
 	return
 
@@ -246,12 +246,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
 	call LilycoveCity_Harbor_EventScript_21E4EE
 	msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 4, LilycoveCity_Harbor_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LilycoveCity_Harbor_Movement_27259A
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_FACING, 2
 	call_if_eq LilycoveCity_Harbor_EventScript_21E656
@@ -328,12 +328,12 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D
 LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
 	msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	removeobject 4
 	delay 30
-	applymovement 1, LilycoveCity_Harbor_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	showobjectat 1, MAP_LILYCOVE_CITY_HARBOR
 	delay 30
@@ -342,19 +342,19 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
 	end
 
 LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
 	delay 60
 	addobject 4
 	delay 30
-	applymovement 4, LilycoveCity_Harbor_Movement_27259E
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	removeobject 4
@@ -415,7 +415,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0
 LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
 	msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -494,22 +494,22 @@ LilycoveCity_Harbor_Movement_21E671: @ 821E671
 	step_end
 
 LilycoveCity_Harbor_EventScript_21E675:: @ 821E675
-	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
+	applymovement 5, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E680:: @ 821E680
-	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
+	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B
-	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
+	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E696:: @ 821E696
-	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
+	applymovement 5, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc
deleted file mode 100644
index 392336e02..000000000
--- a/data/maps/LilycoveCity_House1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LilycoveCity_House1_EventObjects: @ 8531EF4
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0
-	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0
-
-LilycoveCity_House1_MapWarps: @ 8531F24
-	warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY
-	warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY
-
-LilycoveCity_House1_MapEvents:: @ 8531F34
-	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
deleted file mode 100644
index ecae30372..000000000
--- a/data/maps/LilycoveCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House1: @ 8483788
-	.4byte House1_Layout
-	.4byte LilycoveCity_House1_MapEvents
-	.4byte LilycoveCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 59
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json
new file mode 100644
index 000000000..54fa58333
--- /dev/null
+++ b/data/maps/LilycoveCity_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_LILYCOVE_CITY_HOUSE1",
+  "name": "LilycoveCity_House1",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House1_EventScript_21ECCE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House1_EventScript_21ECD7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc
deleted file mode 100644
index e4839eb5c..000000000
--- a/data/maps/LilycoveCity_House2/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_House2_EventObjects: @ 8531F48
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0
-
-LilycoveCity_House2_MapWarps: @ 8531F60
-	warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY
-	warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY
-
-LilycoveCity_House2_MapEvents:: @ 8531F70
-	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
deleted file mode 100644
index f3b009880..000000000
--- a/data/maps/LilycoveCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House2: @ 84837A4
-	.4byte LilycoveCity_House2_Layout
-	.4byte LilycoveCity_House2_MapEvents
-	.4byte LilycoveCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 74
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json
new file mode 100644
index 000000000..b3e4127a6
--- /dev/null
+++ b/data/maps/LilycoveCity_House2/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_LILYCOVE_CITY_HOUSE2",
+  "name": "LilycoveCity_House2",
+  "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House2_EventScript_21ED75",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 92adafe5a..0a0792bfd 100644
--- a/data/maps/LilycoveCity_House2/scripts.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
@@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75
 	msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM44
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_House2_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM44
 	msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc
deleted file mode 100644
index 363e62132..000000000
--- a/data/maps/LilycoveCity_House3/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House3_EventObjects: @ 8531F84
-	object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0
-	object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0
-	object_event 4, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0
-	object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0
-
-LilycoveCity_House3_MapWarps: @ 8532014
-	warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY
-	warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY
-
-LilycoveCity_House3_MapEvents:: @ 8532024
-	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
deleted file mode 100644
index 9126bb8fc..000000000
--- a/data/maps/LilycoveCity_House3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House3: @ 84837C0
-	.4byte House2_Layout
-	.4byte LilycoveCity_House3_MapEvents
-	.4byte LilycoveCity_House3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 60
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json
new file mode 100644
index 000000000..537fc46b3
--- /dev/null
+++ b/data/maps/LilycoveCity_House3/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_LILYCOVE_CITY_HOUSE3",
+  "name": "LilycoveCity_House3",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House3_EventScript_21EF3D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House3_EventScript_21EE4B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House3_EventScript_21EED5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House3_EventScript_21EF09",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House3_EventScript_21EEA1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House3_EventScript_21EE8A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 644c50113..ad8989b4c 100644
--- a/data/maps/LilycoveCity_House3/scripts.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House3_MapScripts:: @ 821EE3C
-	map_script 3, LilycoveCity_House3_MapScript1_21EE42
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42
 	.byte 0
 
 LilycoveCity_House3_MapScript1_21EE42: @ 821EE42
@@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B
 	goto_if_eq LilycoveCity_House3_EventScript_21EE75
 	msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B
 LilycoveCity_House3_EventScript_21EE75:: @ 821EE75
 	msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A
 	faceplayer
 	msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc
deleted file mode 100644
index d14a5c82b..000000000
--- a/data/maps/LilycoveCity_House4/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LilycoveCity_House4_EventObjects: @ 8532038
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0
-
-LilycoveCity_House4_MapWarps: @ 8532068
-	warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY
-	warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY
-
-LilycoveCity_House4_MapEvents:: @ 8532078
-	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
deleted file mode 100644
index 6ddb9a5f7..000000000
--- a/data/maps/LilycoveCity_House4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House4: @ 84837DC
-	.4byte House1_Layout
-	.4byte LilycoveCity_House4_MapEvents
-	.4byte LilycoveCity_House4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 59
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json
new file mode 100644
index 000000000..f442d00ba
--- /dev/null
+++ b/data/maps/LilycoveCity_House4/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_LILYCOVE_CITY_HOUSE4",
+  "name": "LilycoveCity_House4",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House4_EventScript_21F5B5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_House4_EventScript_21F5BE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
deleted file mode 100644
index 52f7a2f9e..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0
-	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0
-	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
-	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
-	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
-	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
-
-LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C
-	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: @ 8531354
-	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
-	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
-	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
-	bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
-	bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
-	bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
-	bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
-	bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA
-	bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
-	bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8
-	bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
-	bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
-	bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
-	bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
-	bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3
-	bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
-
-LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414
-	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
deleted file mode 100644
index b0aef9efa..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F: @ 8483670
-	.4byte LilycoveCity_LilycoveMuseum_1F_Layout
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapEvents
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_BIJYUTU
-	.2byte 103
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
new file mode 100644
index 000000000..11272059e
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
@@ -0,0 +1,302 @@
+{
+  "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+  "name": "LilycoveCity_LilycoveMuseum_1F",
+  "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+  "music": "MUS_BIJYUTU",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 16,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARTIST",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 11,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARTIST",
+      "x": 19,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 10,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 13
+    },
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF"
+    },
+    {
+      "type": "sign",
+      "x": 20,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 11,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
index 89ac90dc6..8f2cdde28 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
@@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2
 	lockall
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	message LilycoveCity_LilycoveMuseum_1F_Text_218EBC
 	waitmessage
 	multichoice 20, 8, 16, 1
@@ -154,7 +154,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B
 	faceplayer
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
deleted file mode 100644
index ecae340c0..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
-	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
-
-LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488
-	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
-
-LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490
-	bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
-	bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
-	bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
-	bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
-	bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
-	bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
-	bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
-	bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
-	bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
-	bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
-	bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
-	bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
-
-LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520
-	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
deleted file mode 100644
index c58b69225..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F: @ 848368C
-	.4byte LilycoveCity_LilycoveMuseum_2F_Layout
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapEvents
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_BIJYUTU
-	.2byte 104
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
new file mode 100644
index 000000000..18a2829e4
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
@@ -0,0 +1,178 @@
+{
+  "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
+  "name": "LilycoveCity_LilycoveMuseum_2F",
+  "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
+  "music": "MUS_BIJYUTU",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 19,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C",
+      "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index f73fbf092..3bbfa8a38 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
-	map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745
-	map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE
 	.byte 0
 
 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745
@@ -57,12 +57,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
 	end
 
 LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
-	map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
+	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
 	.2byte 0
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
 	lockall
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN
@@ -71,12 +71,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
 	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN
-	copyvar VAR_0x4094, 0x1
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
 	releaseall
 	end
 
@@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT
 	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
@@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT
 	givedecoration_std 44
 	compare VAR_RESULT, 0
@@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911
-	call LilycoveCity_LilycoveMuseum_2F_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT
 	closemessage
 	releaseall
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
deleted file mode 100644
index 100ee364c..000000000
--- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0
-
-LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0
-	warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY
-	warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY
-
-LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0
-	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
deleted file mode 100644
index cdd8668ad..000000000
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_MoveDeletersHouse: @ 848376C
-	.4byte House2_Layout
-	.4byte LilycoveCity_MoveDeletersHouse_MapEvents
-	.4byte LilycoveCity_MoveDeletersHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 60
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json
new file mode 100644
index 000000000..f4adbabe8
--- /dev/null
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE",
+  "name": "LilycoveCity_MoveDeletersHouse",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index c5c2188e5..e94fa43f1 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A
 
 LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B
 	lockall
-	applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO
 	switch VAR_RESULT
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index 26b6955c0..000000000
--- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0
-	object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0
-	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
-
-LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
-	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:: @ 8531C5C
-	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
deleted file mode 100644
index bcca0354d..000000000
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_PokemonCenter_1F: @ 84836E0
-	.4byte PokemonCenter_1F_Layout
-	.4byte LilycoveCity_PokemonCenter_1F_MapEvents
-	.4byte LilycoveCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..c5c0121f4
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F",
+  "name": "LilycoveCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7",
+      "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index dd0dff376..0d8da38d5 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
-	map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD
-	map_script 5, LilycoveCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD
+	map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index 1a7e9a6a2..000000000
--- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0
-	warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8
-	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
deleted file mode 100644
index 26c0789d6..000000000
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_PokemonCenter_2F: @ 84836FC
-	.4byte PokemonCenter_2F_Layout
-	.4byte LilycoveCity_PokemonCenter_2F_MapEvents
-	.4byte LilycoveCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..6bfb1c4cb
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F",
+  "name": "LilycoveCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index f4a25f137..1e8035483 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
-	map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
deleted file mode 100644
index 3d08ce647..000000000
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0
-	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, FLAG_HIDE_FANCLUB_LITTLE_BOY
-	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, FLAG_HIDE_FANCLUB_BOY
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, FLAG_HIDE_FANCLUB_LADY
-	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY
-	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
-
-LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8
-	warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY
-	warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY
-
-LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08
-	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
deleted file mode 100644
index aba9dcb3c..000000000
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub: @ 8483734
-	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapEvents
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 107
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
new file mode 100644
index 000000000..0591d3c8e
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
@@ -0,0 +1,153 @@
+{
+  "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
+  "name": "LilycoveCity_PokemonTrainerFanClub",
+  "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 7,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3",
+      "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55",
+      "flag": "FLAG_HIDE_FANCLUB_BOY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 3,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7",
+      "flag": "FLAG_HIDE_FANCLUB_LADY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19",
+      "flag": "FLAG_HIDE_FANCLUB_OLD_LADY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B",
+      "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 77bc40635..f83be42b9 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
-	map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
-	map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D
 	.byte 0
 
 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
@@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
 	lockall
-	applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
 	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
 	waitmovement 0
@@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
 	copyvar VAR_0x8005, VAR_0x800A
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
 	copyvar VAR_0x8005, VAR_0x800A
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc
deleted file mode 100644
index 0481a1c0b..000000000
--- a/data/maps/LilycoveCity_UnusedMart/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-LilycoveCity_UnusedMart_MapWarps: @ 8531CFC
-	warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY
-	warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY
-
-LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C
-	map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
deleted file mode 100644
index f1cbaf550..000000000
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_UnusedMart: @ 8483718
-	.4byte Mart_Layout
-	.4byte LilycoveCity_UnusedMart_MapEvents
-	.4byte LilycoveCity_UnusedMart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_LILYCOVE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json
new file mode 100644
index 000000000..44cd20815
--- /dev/null
+++ b/data/maps/LilycoveCity_UnusedMart/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_LILYCOVE_CITY_UNUSED_MART",
+  "name": "LilycoveCity_UnusedMart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_LILYCOVE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_LILYCOVE_CITY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc
deleted file mode 100644
index 7b6b875c2..000000000
--- a/data/maps/LinkContestRoom1/events.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-LinkContestRoom1_EventObjects: @ 8539EFC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-	object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
-	object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_POKE_BALL
-	object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
-
-LinkContestRoom1_MapEvents:: @ 853A064
-	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
deleted file mode 100644
index 2465a8680..000000000
--- a/data/maps/LinkContestRoom1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom1: @ 8484DA0
-	.4byte LinkContestRoom1_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONTEST0
-	.2byte 225
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json
new file mode 100644
index 000000000..664a32b29
--- /dev/null
+++ b/data/maps/LinkContestRoom1/map.json
@@ -0,0 +1,216 @@
+{
+  "id": "MAP_LINK_CONTEST_ROOM1",
+  "name": "LinkContestRoom1",
+  "layout": "LAYOUT_LINK_CONTEST_ROOM1",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_LINK_CONTEST_POKE_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARTIST",
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc
index e756c2bc6..b81f35834 100644
--- a/data/maps/LinkContestRoom1/scripts.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
@@ -1,9 +1,9 @@
 LinkContestRoom1_MapScripts:: @ 823B781
-	map_script 4, LinkContestRoom1_MapScript2_23B81F
-	map_script 2, LinkContestRoom1_MapScript2_23B815
-	map_script 3, LinkContestRoom1_MapScript1_23B79F
-	map_script 5, LinkContestRoom1_MapScript1_23B803
-	map_script 7, LinkContestRoom1_MapScript1_23B79B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815
+	map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F
+	map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B
 	.byte 0
 
 LinkContestRoom1_MapScript1_23B79B: @ 823B79B
@@ -61,11 +61,11 @@ LinkContestRoom1_EventScript_23B80F:: @ 823B80F
 	return
 
 LinkContestRoom1_MapScript2_23B815: @ 823B815
-	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829
+	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829
 	.2byte 0
 
 LinkContestRoom1_MapScript2_23B81F: @ 823B81F
-	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834
+	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834
 	.2byte 0
 
 LinkContestRoom1_EventScript_23B829:: @ 823B829
@@ -303,7 +303,7 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
 	specialvar VAR_RESULT, sub_80F9160
 	compare VAR_RESULT, 1
 	goto_if_eq LinkContestRoom1_EventScript_23BD86
-	switch VAR_0x4088
+	switch VAR_CONTEST_LOCATION
 	case 1, LinkContestRoom1_EventScript_23BB78
 	case 2, LinkContestRoom1_EventScript_23BB8B
 	case 3, LinkContestRoom1_EventScript_23BBE6
@@ -407,7 +407,7 @@ LinkContestRoom1_EventScript_23BD86:: @ 823BD86
 
 LinkContestRoom1_EventScript_23BE44:: @ 823BE44
 	special sub_80F9154
-	switch VAR_0x4088
+	switch VAR_CONTEST_LOCATION
 	case 1, LinkContestRoom1_EventScript_23BE84
 	case 2, LinkContestRoom1_EventScript_23BE8E
 	case 3, LinkContestRoom1_EventScript_23BE98
diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom2/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
deleted file mode 100644
index e37d65f86..000000000
--- a/data/maps/LinkContestRoom2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom2: @ 8484E64
-	.4byte LinkContestRoom2_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONTEST0
-	.2byte 232
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json
new file mode 100644
index 000000000..b02da178f
--- /dev/null
+++ b/data/maps/LinkContestRoom2/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_LINK_CONTEST_ROOM2",
+  "name": "LinkContestRoom2",
+  "layout": "LAYOUT_LINK_CONTEST_ROOM2",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom3/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
deleted file mode 100644
index 90333ebd9..000000000
--- a/data/maps/LinkContestRoom3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom3: @ 8484E80
-	.4byte LinkContestRoom3_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONTEST0
-	.2byte 233
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json
new file mode 100644
index 000000000..fb0bf29e0
--- /dev/null
+++ b/data/maps/LinkContestRoom3/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_LINK_CONTEST_ROOM3",
+  "name": "LinkContestRoom3",
+  "layout": "LAYOUT_LINK_CONTEST_ROOM3",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom4/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
deleted file mode 100644
index 781ebed0f..000000000
--- a/data/maps/LinkContestRoom4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom4: @ 8484E9C
-	.4byte LinkContestRoom4_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONTEST0
-	.2byte 234
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json
new file mode 100644
index 000000000..85d12ece4
--- /dev/null
+++ b/data/maps/LinkContestRoom4/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_LINK_CONTEST_ROOM4",
+  "name": "LinkContestRoom4",
+  "layout": "LAYOUT_LINK_CONTEST_ROOM4",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom5/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
deleted file mode 100644
index 87253d0d6..000000000
--- a/data/maps/LinkContestRoom5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom5: @ 8484EB8
-	.4byte LinkContestRoom5_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONTEST0
-	.2byte 235
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json
new file mode 100644
index 000000000..f312d4c2b
--- /dev/null
+++ b/data/maps/LinkContestRoom5/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_LINK_CONTEST_ROOM5",
+  "name": "LinkContestRoom5",
+  "layout": "LAYOUT_LINK_CONTEST_ROOM5",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom6/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
deleted file mode 100644
index ade67e7e7..000000000
--- a/data/maps/LinkContestRoom6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom6: @ 8484ED4
-	.4byte LinkContestRoom6_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONTEST0
-	.2byte 236
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json
new file mode 100644
index 000000000..38bfcd979
--- /dev/null
+++ b/data/maps/LinkContestRoom6/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_LINK_CONTEST_ROOM6",
+  "name": "LinkContestRoom6",
+  "layout": "LAYOUT_LINK_CONTEST_ROOM6",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc
deleted file mode 100644
index 0fed8d8e1..000000000
--- a/data/maps/LittlerootTown/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-LittlerootTown_MapConnectionsList: @ 8486600
-	connection up, 0, MAP_ROUTE101
-
-LittlerootTown_MapConnections: @ 848660C
-	.4byte 0x1
-	.4byte LittlerootTown_MapConnectionsList
-
diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc
deleted file mode 100644
index fc151a220..000000000
--- a/data/maps/LittlerootTown/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LittlerootTown_EventObjects: @ 85276A8
-	object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0
-	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
-	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
-	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
-	object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
-	object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
-
-LittlerootTown_MapWarps: @ 8527768
-	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: @ 8527780
-	coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091
-	coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF
-	coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F
-	coord_event 8, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81F9
-	coord_event 9, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E8205
-	coord_event 10, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81E1
-	coord_event 11, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81ED
-	coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB
-	coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE
-
-LittlerootTown_MapBGEvents: @ 8527810
-	bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151
-	bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A
-	bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163
-	bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F
-
-LittlerootTown_MapEvents:: @ 8527840
-	map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
-
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
deleted file mode 100644
index a94244f95..000000000
--- a/data/maps/LittlerootTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown: @ 84825B4
-	.4byte LittlerootTown_Layout
-	.4byte LittlerootTown_MapEvents
-	.4byte LittlerootTown_MapScripts
-	.4byte LittlerootTown_MapConnections
-	.2byte MUS_MISHIRO
-	.2byte 10
-	.byte MAPSEC_LITTLEROOT_TOWN
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_TOWN
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
new file mode 100644
index 000000000..7ef696a58
--- /dev/null
+++ b/data/maps/LittlerootTown/map.json
@@ -0,0 +1,268 @@
+{
+  "id": "MAP_LITTLEROOT_TOWN",
+  "name": "LittlerootTown",
+  "layout": "LAYOUT_LITTLEROOT_TOWN",
+  "music": "MUS_MISHIRO",
+  "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE101"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 16,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_EventScript_1E8034",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 12,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_EventScript_1E8022",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 14,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_EventScript_1E802B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOM",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_EventScript_1E863D",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRUCK",
+      "x": 2,
+      "y": 10,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRUCK",
+      "x": 11,
+      "y": 10,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+      "x": 14,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCH"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "0",
+      "script": "LittlerootTown_EventScript_1E8091"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 1,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "0",
+      "script": "LittlerootTown_EventScript_1E80EF"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 1,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "1",
+      "script": "LittlerootTown_EventScript_1E811F"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "3",
+      "script": "LittlerootTown_EventScript_1E81F9"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "3",
+      "script": "LittlerootTown_EventScript_1E8205"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "3",
+      "script": "LittlerootTown_EventScript_1E81E1"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "3",
+      "script": "LittlerootTown_EventScript_1E81ED"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "3",
+      "script": "LittlerootTown_EventScript_1E81BB"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_0x4050",
+      "var_value": "3",
+      "script": "LittlerootTown_EventScript_1E81CE"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 13,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_EventScript_1E8151"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 17,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_EventScript_1E815A"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_EventScript_1E8163"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_EventScript_1E818F"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index 5d9161cb4..f347811f8 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -1,24 +1,24 @@
 LittlerootTown_MapScripts:: @ 81E7DCB
-	map_script 3, LittlerootTown_MapScript1_1E7DDB
-	map_script 2, LittlerootTown_MapScript2_1E7EC1
-	map_script 4, LittlerootTown_MapScript2_1E7FE2
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2
 	.byte 0
 
 LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
 	setflag FLAG_VISITED_LITTLEROOT_TOWN
-	call LittlerootTown_EventScript_271ED7
-	compare VAR_0x4092, 2
+	call Common_EventScript_SetupRivalGender
+	compare VAR_LITTLEROOT_INTRO_STATE, 2
 	call_if_eq LittlerootTown_EventScript_1E7E67
 	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
 	compare VAR_0x4050, 3
 	call_if_eq LittlerootTown_EventScript_1E7E92
-	compare VAR_0x4082, 4
+	compare VAR_LITTLEROOT_HOUSES_STATE, 4
 	call_if_eq LittlerootTown_EventScript_1E7E5C
-	compare VAR_0x408C, 4
+	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
 	call_if_eq LittlerootTown_EventScript_1E7E5C
-	compare VAR_0x40C7, 1
+	compare VAR_OLDALE_STATE, 1
 	call_if_eq LittlerootTown_EventScript_1E7E53
-	compare VAR_0x408D, 3
+	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	call_if_eq LittlerootTown_EventScript_1E7E4F
 	compare VAR_0x40D3, 1
 	call_if_eq LittlerootTown_EventScript_1E7E4B
@@ -31,7 +31,7 @@ LittlerootTown_EventScript_1E7E45:: @ 81E7E45
 	return
 
 LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
@@ -39,13 +39,13 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
 	return
 
 LittlerootTown_EventScript_1E7E53:: @ 81E7E53
-	setvar VAR_0x40C7, 2
+	setvar VAR_OLDALE_STATE, 2
 	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	return
 
 LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C
-	setvar VAR_0x4082, 5
-	setvar VAR_0x408C, 5
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 5
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5
 	return
 
 LittlerootTown_EventScript_1E7E67:: @ 81E7E67
@@ -83,8 +83,8 @@ LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9
 	return
 
 LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1
-	map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB
-	map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9
 	map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1
 	.2byte 0
 
@@ -136,12 +136,12 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9
 	waitmovement 0
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
-	setvar VAR_0x4092, 3
+	setvar VAR_LITTLEROOT_INTRO_STATE, 3
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LittlerootTown_Movement_1E7F98: @ 81E7F98
@@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC
 LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	lockall
 	playse SE_PIN
-	applymovement 8, LittlerootTown_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 80
 	msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT
@@ -194,7 +194,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	delay 20
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
 	waitstate
 	releaseall
@@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
 	special GetPlayerBigGuyGirlString
 	msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setvar VAR_0x4050, 2
 	release
@@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118
 
 LittlerootTown_EventScript_1E811F:: @ 81E811F
 	lockall
-	applymovement 1, LittlerootTown_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	special GetPlayerBigGuyGirlString
 	msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setvar VAR_0x4050, 2
 	releaseall
@@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C
 	return
 
 LittlerootTown_EventScript_1E8297:: @ 81E8297
-	applymovement 4, LittlerootTown_Movement_2725A8
+	applymovement 4, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E82A2:: @ 81E82A2
-	applymovement 4, LittlerootTown_Movement_2725A4
+	applymovement 4, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0
 	return
 
 LittlerootTown_EventScript_1E8333:: @ 81E8333
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85D1
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8348:: @ 81E8348
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85D8
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E835D:: @ 81E835D
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85DF
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8372:: @ 81E8372
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85E4
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8387:: @ 81E8387
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85EA
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E839C:: @ 81E839C
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85ED
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83B1:: @ 81E83B1
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F1
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83C6:: @ 81E83C6
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F5
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83DB:: @ 81E83DB
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F8
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83F0:: @ 81E83F0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85FE
 	waitmovement 0
@@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
 	compare VAR_RESULT, FEMALE
 	call_if_eq LittlerootTown_EventScript_1E828C
 	call LittlerootTown_EventScript_1E8693
-	applymovement 4, LittlerootTown_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
deleted file mode 100644
index 6f327d330..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C
-	object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
-	object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
-	object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
-	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD
-	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
-	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
-
-LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134
-	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: @ 852D14C
-	coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3
-	coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE
-	coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA
-	coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6
-
-LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C
-	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
deleted file mode 100644
index edae81a87..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_BrendansHouse_1F: @ 8482AF4
-	.4byte LittlerootTown_BrendansHouse_1F_Layout
-	.4byte LittlerootTown_BrendansHouse_1F_MapEvents
-	.4byte LittlerootTown_BrendansHouse_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_MISHIRO
-	.2byte 54
-	.byte MAPSEC_LITTLEROOT_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
new file mode 100644
index 000000000..d6d4af86c
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
@@ -0,0 +1,171 @@
+{
+  "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
+  "name": "LittlerootTown_BrendansHouse_1F",
+  "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
+  "music": "MUS_MISHIRO",
+  "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOM",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 3,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NORMAN",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 8,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_INTRO_STATE",
+      "var_value": "4",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_RIVAL_STATE",
+      "var_value": "2",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_RIVAL_STATE",
+      "var_value": "2",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_RIVAL_STATE",
+      "var_value": "2",
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 42cfe308b..31a526a25 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -1,11 +1,11 @@
 LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
-	map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765
-	map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4
-	map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA
+	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA
 	.byte 0
 
 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
-	compare VAR_0x4092, 6
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
 	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A
 	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
 	end
@@ -26,11 +26,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
 	return
 
 LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
-	compare VAR_0x4092, 3
+	compare VAR_LITTLEROOT_INTRO_STATE, 3
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
-	compare VAR_0x4092, 5
+	compare VAR_LITTLEROOT_INTRO_STATE, 5
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
-	compare VAR_0x4092, 6
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
 	end
 
@@ -50,11 +50,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE
 	return
 
 LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA
-	map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C
-	map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814
-	map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D
-	map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E
-	map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2
 	.2byte 0
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814
@@ -90,17 +90,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D
 LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
 	lockall
 	playse SE_PIN
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
 	setflag FLAG_MET_RIVAL_MOM
-	setvar VAR_0x4082, 2
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 2
 	releaseall
 	end
 
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 0
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	goto LittlerootTown_BrendansHouse_1F_EventScript_292765
 	end
@@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	addobject 7
 	delay 30
 	playse SE_PIN
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598
+	applymovement 7, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	applymovement 7, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
 	call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981
@@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	delay 30
-	setvar VAR_0x408D, 3
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setvar VAR_0x4050, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
@@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
deleted file mode 100644
index 46a4fcfc2..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0
-	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
-	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
-	object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
-
-LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320
-	warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
-
-LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328
-	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale
-	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656
-	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781
-	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F
-
-LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358
-	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
deleted file mode 100644
index 4c9e566d0..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_BrendansHouse_2F: @ 8482B10
-	.4byte LittlerootTown_BrendansHouse_2F_Layout
-	.4byte LittlerootTown_BrendansHouse_2F_MapEvents
-	.4byte LittlerootTown_BrendansHouse_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_MISHIRO
-	.2byte 55
-	.byte MAPSEC_LITTLEROOT_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
new file mode 100644
index 000000000..e07959b20
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
@@ -0,0 +1,270 @@
+{
+  "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
+  "name": "LittlerootTown_BrendansHouse_2F",
+  "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
+  "music": "MUS_MISHIRO",
+  "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 1,
+      "y": 0,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOM",
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWABLU_DOLL",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "EventScript_PlayerPCMale"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8656"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_292781"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F865F"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index ea00693a8..b553cf65b 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -1,22 +1,22 @@
 LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
-	map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE
-	map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A
 	.byte 0
 
 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
-	compare VAR_0x408D, 2
+	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457
-	compare VAR_0x408D, 3
+	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A
-	compare VAR_0x4092, 4
+	compare VAR_LITTLEROOT_INTRO_STATE, 4
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE
 	call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
-	setvar VAR_0x4089, 0
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
 	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433
-	compare VAR_0x4084, 2
+	compare VAR_BIRCH_LAB_STATE, 2
 	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456
 	goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433
 
@@ -40,11 +40,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464
-	setvar VAR_0x408D, 2
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 2
 	return
 
 LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
-	map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474
+	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474
 	.2byte 0
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
@@ -55,7 +55,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481
 	lockall
-	compare VAR_0x408D, 2
+	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT
 	releaseall
@@ -67,9 +67,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	delay 10
 	playbgm MUS_BOY_SUP, 1
@@ -81,7 +81,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565
 	compare VAR_FACING, 4
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594
-	setvar VAR_0x408D, 3
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	setvar VAR_0x4050, 1
@@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -307,7 +307,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F
 	.string "Record your progress with SAVE.\p"
 	.string "The remaining pages are blank…$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820
+Common_Text_LookCloserAtMap: @ 81F8820
 	.string "{PLAYER} took a closer look at the\n"
 	.string "HOENN region map.$"
 
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
deleted file mode 100644
index 3075945f1..000000000
--- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C
-	object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
-	object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
-	object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
-	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD
-	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
-	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
-
-LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414
-	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: @ 852D42C
-	coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C
-	coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67
-	coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73
-	coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F
-
-LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C
-	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
deleted file mode 100644
index 768c7d1b4..000000000
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_MaysHouse_1F: @ 8482B2C
-	.4byte LittlerootTown_MaysHouse_1F_Layout
-	.4byte LittlerootTown_MaysHouse_1F_MapEvents
-	.4byte LittlerootTown_MaysHouse_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_MISHIRO
-	.2byte 56
-	.byte MAPSEC_LITTLEROOT_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json
new file mode 100644
index 000000000..0938e6966
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json
@@ -0,0 +1,171 @@
+{
+  "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
+  "name": "LittlerootTown_MaysHouse_1F",
+  "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
+  "music": "MUS_MISHIRO",
+  "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOM",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NORMAN",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_INTRO_STATE",
+      "var_value": "4",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_RIVAL_STATE",
+      "var_value": "2",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_RIVAL_STATE",
+      "var_value": "2",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_LITTLEROOT_RIVAL_STATE",
+      "var_value": "2",
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 36bda7e03..6b226da24 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -1,11 +1,11 @@
 LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
-	map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5
-	map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4
-	map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A
+	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A
 	.byte 0
 
 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
-	compare VAR_0x4092, 6
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
 	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA
 	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
 	end
@@ -26,11 +26,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
 	return
 
 LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
-	compare VAR_0x4092, 3
+	compare VAR_LITTLEROOT_INTRO_STATE, 3
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E
-	compare VAR_0x4092, 5
+	compare VAR_LITTLEROOT_INTRO_STATE, 5
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916
-	compare VAR_0x4092, 6
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922
 	end
 
@@ -50,11 +50,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E
 	return
 
 LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A
-	map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C
-	map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964
-	map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D
-	map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE
-	map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2
 	.2byte 0
 
 LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964
@@ -90,17 +90,17 @@ LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D
 LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
 	lockall
 	playse SE_PIN
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
 	setflag FLAG_MET_RIVAL_MOM
-	setvar VAR_0x408C, 2
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2
 	releaseall
 	end
 
@@ -119,7 +119,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
 	faceplayer
 	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33
 	goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
-	compare VAR_0x408D, 3
+	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT
@@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	goto LittlerootTown_MaysHouse_1F_EventScript_292765
 	end
@@ -183,9 +183,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	addobject 7
 	delay 30
 	playse SE_PIN
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598
+	applymovement 7, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A
+	applymovement 7, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
 	call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A
@@ -210,7 +210,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	delay 30
-	setvar VAR_0x408D, 3
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setvar VAR_0x4050, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
@@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
deleted file mode 100644
index 8f4c74737..000000000
--- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480
-	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
-	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
-
-LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600
-	warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
-
-LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608
-	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F
-	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656
-	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D
-	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale
-
-LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638
-	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
deleted file mode 100644
index 8729bedeb..000000000
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_MaysHouse_2F: @ 8482B48
-	.4byte LittlerootTown_MaysHouse_2F_Layout
-	.4byte LittlerootTown_MaysHouse_2F_MapEvents
-	.4byte LittlerootTown_MaysHouse_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_MISHIRO
-	.2byte 57
-	.byte MAPSEC_LITTLEROOT_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json
new file mode 100644
index 000000000..d92b024c6
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json
@@ -0,0 +1,270 @@
+{
+  "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+  "name": "LittlerootTown_MaysHouse_2F",
+  "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+  "music": "MUS_MISHIRO",
+  "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 2,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MOM",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL",
+      "x": 3,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F865F"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F8656"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_29278D"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "EventScript_PlayerPCFemale"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 353437ad4..49a9523e0 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -1,22 +1,22 @@
 LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
-	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1
-	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D
 	.byte 0
 
 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
-	compare VAR_0x408D, 2
+	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A
-	compare VAR_0x408D, 3
+	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD
-	compare VAR_0x4092, 4
+	compare VAR_LITTLEROOT_INTRO_STATE, 4
 	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE
 	call LittlerootTown_MaysHouse_2F_EventScript_275CE1
-	setvar VAR_0x4089, 0
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
 LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
 	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6
-	compare VAR_0x4084, 2
+	compare VAR_BIRCH_LAB_STATE, 2
 	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
 	goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
 
@@ -41,11 +41,11 @@ LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
 	return
 
 LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317
-	setvar VAR_0x408D, 2
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 2
 	return
 
 LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
-	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327
+	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327
 	.2byte 0
 
 LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
@@ -56,7 +56,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
 
 LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
 	lockall
-	compare VAR_0x408D, 2
+	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT
 	releaseall
@@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	delay 10
 	playbgm MUS_GIRL_SUP, 1
@@ -82,7 +82,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418
 	compare VAR_FACING, 4
 	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440
-	setvar VAR_0x408D, 3
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	setvar VAR_0x4050, 1
@@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
 LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -268,7 +268,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
deleted file mode 100644
index 7ab449ecd..000000000
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0
-	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
-	object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA
-
-LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC
-	warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN
-	warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN
-
-LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC
-	bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
-	bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
-	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
-	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
-	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-
-LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0
-	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
deleted file mode 100644
index 49ab94727..000000000
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LittlerootTown_ProfessorBirchsLab: @ 8482B64
-	.4byte LittlerootTown_ProfessorBirchsLab_Layout
-	.4byte LittlerootTown_ProfessorBirchsLab_MapEvents
-	.4byte LittlerootTown_ProfessorBirchsLab_MapScripts
-	.4byte 0x0
-	.2byte MUS_ODAMAKI
-	.2byte 58
-	.byte MAPSEC_LITTLEROOT_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
new file mode 100644
index 000000000..25ec2e745
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
@@ -0,0 +1,235 @@
+{
+  "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
+  "name": "LittlerootTown_ProfessorBirchsLab",
+  "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
+  "music": "MUS_ODAMAKI",
+  "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023",
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_LITTLEROOT_TOWN",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+    },
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index ee7e1730b..c02381982 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -1,11 +1,11 @@
 LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
-	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1
-	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06
-	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9
 	.byte 0
 
 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
-	call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
@@ -28,17 +28,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
-	setmaplayoutindex 432
+	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
-	setmaplayoutindex 432
+	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm 3, 5, 10
 	end
 
 LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
-	map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
 	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
 	map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
 	map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
@@ -85,8 +85,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
 	end
 
 LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9
-	map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
-	map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
+	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
 	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80
 	map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62
 	.2byte 0
@@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
 	setvar VAR_0x8004, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
 	end
 
@@ -122,7 +122,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_ROUTE_101_BOY
-	setvar VAR_0x4084, 3
+	setvar VAR_BIRCH_LAB_STATE, 3
 	releaseall
 	end
 
@@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	delay 10
 	playse SE_TK_KASYA
 	delay 20
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4
+	applymovement 3, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	delay 20
 	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58
 	waitmovement 0
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
@@ -195,7 +195,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	setvar VAR_0x40D3, 2
-	setvar VAR_0x40F5, 0
+	setvar VAR_SCOTT_CALL_STEP_COUNTER, 0
 	setflag FLAG_SCOTT_CALL_NATIONAL_DEX
 	releaseall
 	end
@@ -264,7 +264,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
 	lock
 	faceplayer
-	compare VAR_0x4084, 3
+	compare VAR_BIRCH_LAB_STATE, 3
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
 	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT
@@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
 	release
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	drawmonpic SPECIES_CYNDAQUIL, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
@@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
 	release
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	drawmonpic SPECIES_TOTODILE, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
@@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
 	release
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	drawmonpic SPECIES_CHIKORITA, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
@@ -351,7 +351,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
 	end
 
@@ -396,7 +396,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
 	end
 
@@ -441,7 +441,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
 	end
 
@@ -502,7 +502,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
-	compare VAR_0x4084, 5
+	compare VAR_BIRCH_LAB_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
 	release
@@ -530,17 +530,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
 	closemessage
 	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352
 	compare VAR_RESULT, FEMALE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
-	setvar VAR_0x4084, 5
+	setvar VAR_BIRCH_LAB_STATE, 5
 	setflag FLAG_ADVENTURE_STARTED
-	setvar VAR_0x4051, 1
-	setvar VAR_0x408D, 4
+	setvar VAR_ROUTE102_ACCESSIBLE, 1
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 4
 	setvar VAR_0x4050, 3
 	releaseall
 	end
@@ -570,7 +570,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC
 	setflag FLAG_SYS_POKEDEX_GET
 	special sub_81AFDA0
 	setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
-	setvar VAR_0x40CD, 1
+	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4
diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc
deleted file mode 100644
index fd82f78e0..000000000
--- a/data/maps/MagmaHideout_1F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MagmaHideout_1F_EventObjects: @ 85371CC
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_11
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13
-
-MagmaHideout_1F_MapWarps: @ 853725C
-	warp_def 10, 34, 3, 4, MAP_JAGGED_PASS
-	warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R
-	warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R
-	warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R
-
-MagmaHideout_1F_MapEvents:: @ 853727C
-	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
deleted file mode 100644
index 897f4f4fd..000000000
--- a/data/maps/MagmaHideout_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_1F: @ 8484828
-	.4byte MagmaHideout_1F_Layout
-	.4byte MagmaHideout_1F_MapEvents
-	.4byte MagmaHideout_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 336
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json
new file mode 100644
index 000000000..8eb3e23b5
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -0,0 +1,128 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_1F",
+  "name": "MagmaHideout_1F",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_1F",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MagmaHideout_1F_EventScript_23988C",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 20,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_1F_EventScript_2914DE",
+      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 30,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "MagmaHideout_1F_EventScript_2398A3",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 5,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 7,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 6,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_13"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_JAGGED_PASS",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 25,
+      "y": 34,
+      "elevation": 3,
+      "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 31,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 22,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc
index 56ad204a9..0e0360990 100644
--- a/data/maps/MagmaHideout_1F/scripts.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
@@ -1,9 +1,9 @@
 MagmaHideout_1F_MapScripts:: @ 8239880
-	map_script 3, MagmaHideout_1F_MapScript1_239886
+	map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886
 	.byte 0
 
 MagmaHideout_1F_MapScript1_239886: @ 8239886
-	setvar VAR_0x40BD, 0
+	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
 MagmaHideout_1F_EventScript_23988C:: @ 823988C
diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc
deleted file mode 100644
index d80849231..000000000
--- a/data/maps/MagmaHideout_2F_1R/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MagmaHideout_2F_1R_EventObjects: @ 8537290
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-
-MagmaHideout_2F_1R_MapWarps: @ 85372F0
-	warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R
-	warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F
-	warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R
-
-MagmaHideout_2F_1R_MapEvents:: @ 8537308
-	map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc
deleted file mode 100644
index cafe144d8..000000000
--- a/data/maps/MagmaHideout_2F_1R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_1R: @ 8484844
-	.4byte MagmaHideout_2F_1R_Layout
-	.4byte MagmaHideout_2F_1R_MapEvents
-	.4byte MagmaHideout_2F_1R_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 337
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json
new file mode 100644
index 000000000..d628c1b5a
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_1R/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_2F_1R",
+  "name": "MagmaHideout_2F_1R",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_2F_1R",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 18,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN",
+      "movement_range_x": 5,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MagmaHideout_2F_1R_EventScript_239B7F",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 12,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT",
+      "movement_range_x": 7,
+      "movement_range_y": 6,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MagmaHideout_2F_1R_EventScript_239B96",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F",
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "MagmaHideout_2F_1R_EventScript_239B51",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 21,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MagmaHideout_2F_1R_EventScript_239B68",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 23,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 17,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc
deleted file mode 100644
index 8bc61def7..000000000
--- a/data/maps/MagmaHideout_2F_2R/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_2R_EventObjects: @ 853731C
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE
-
-MagmaHideout_2F_2R_MapWarps: @ 85373AC
-	warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R
-	warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F
-
-MagmaHideout_2F_2R_MapEvents:: @ 85373BC
-	map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc
deleted file mode 100644
index 1493ae076..000000000
--- a/data/maps/MagmaHideout_2F_2R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_2R: @ 8484860
-	.4byte MagmaHideout_2F_2R_Layout
-	.4byte MagmaHideout_2F_2R_MapEvents
-	.4byte MagmaHideout_2F_2R_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 338
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json
new file mode 100644
index 000000000..ef7086bbf
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_2R/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_2F_2R",
+  "name": "MagmaHideout_2F_2R",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_2F_2R",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 29,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "MagmaHideout_2F_2R_EventScript_239E4D",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 25,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MagmaHideout_2F_2R_EventScript_239E36",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 21,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_2F_2R_EventScript_2914EB",
+      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "MagmaHideout_2F_2R_EventScript_239E1F",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MagmaHideout_2F_2R_EventScript_239E08",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_2F_2R_EventScript_2914F8",
+      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 36,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc
deleted file mode 100644
index ca379a0c7..000000000
--- a/data/maps/MagmaHideout_2F_3R/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-MagmaHideout_2F_3R_MapWarps: @ 85375B0
-	warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F
-	warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R
-
-MagmaHideout_2F_3R_MapEvents:: @ 85375C0
-	map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc
deleted file mode 100644
index 5e1ccdcda..000000000
--- a/data/maps/MagmaHideout_2F_3R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_3R: @ 84848EC
-	.4byte MagmaHideout_2F_3R_Layout
-	.4byte MagmaHideout_2F_3R_MapEvents
-	.4byte MagmaHideout_2F_3R_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 380
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json
new file mode 100644
index 000000000..186fa9dd8
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_3R/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_2F_3R",
+  "name": "MagmaHideout_2F_3R",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 16,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc
deleted file mode 100644
index 1fbad5042..000000000
--- a/data/maps/MagmaHideout_3F_1R/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MagmaHideout_3F_1R_EventObjects: @ 85373D0
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET
-
-MagmaHideout_3F_1R_MapWarps: @ 8537418
-	warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F
-	warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R
-	warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R
-
-MagmaHideout_3F_1R_MapEvents:: @ 8537430
-	map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc
deleted file mode 100644
index 492fb8a7e..000000000
--- a/data/maps/MagmaHideout_3F_1R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_3F_1R: @ 848487C
-	.4byte MagmaHideout_3F_1R_Layout
-	.4byte MagmaHideout_3F_1R_MapEvents
-	.4byte MagmaHideout_3F_1R_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 339
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json
new file mode 100644
index 000000000..67202e748
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_1R/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_3F_1R",
+  "name": "MagmaHideout_3F_1R",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_3F_1R",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 2,
+      "y": 7,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "MagmaHideout_3F_1R_EventScript_23A1B3",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F",
+      "x": 21,
+      "y": 21,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "MagmaHideout_3F_1R_EventScript_23A1CA",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 9,
+      "y": 16,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_3F_1R_EventScript_291505",
+      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 21,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_3F_2R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 23,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc
deleted file mode 100644
index d00cbf423..000000000
--- a/data/maps/MagmaHideout_3F_2R/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MagmaHideout_3F_2R_EventObjects: @ 8537444
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX
-
-MagmaHideout_3F_2R_MapWarps: @ 8537474
-	warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R
-
-MagmaHideout_3F_2R_MapEvents:: @ 853747C
-	map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc
deleted file mode 100644
index e1cd32f9c..000000000
--- a/data/maps/MagmaHideout_3F_2R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_3F_2R: @ 8484898
-	.4byte MagmaHideout_3F_2R_Layout
-	.4byte MagmaHideout_3F_2R_MapEvents
-	.4byte MagmaHideout_3F_2R_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 340
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json
new file mode 100644
index 000000000..bc67b15e5
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_2R/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_3F_2R",
+  "name": "MagmaHideout_3F_2R",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_3F_2R",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 16,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MagmaHideout_3F_2R_EventScript_23A3D5",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_3F_2R_EventScript_291512",
+      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc
deleted file mode 100644
index 26ffa3dff..000000000
--- a/data/maps/MagmaHideout_3F_3R/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MagmaHideout_3F_3R_EventObjects: @ 8537574
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE
-
-MagmaHideout_3F_3R_MapWarps: @ 853758C
-	warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R
-	warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F
-
-MagmaHideout_3F_3R_MapEvents:: @ 853759C
-	map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc
deleted file mode 100644
index b21df5e70..000000000
--- a/data/maps/MagmaHideout_3F_3R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_3F_3R: @ 84848D0
-	.4byte MagmaHideout_3F_3R_Layout
-	.4byte MagmaHideout_3F_3R_MapEvents
-	.4byte MagmaHideout_3F_3R_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 379
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json
new file mode 100644
index 000000000..00fc5a46c
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_3R/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_3F_3R",
+  "name": "MagmaHideout_3F_3R",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_3F_3R",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 9,
+      "y": 19,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_3F_3R_EventScript_29152C",
+      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 16,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_4F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc
deleted file mode 100644
index 09e054109..000000000
--- a/data/maps/MagmaHideout_4F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MagmaHideout_4F_EventObjects: @ 8537490
-	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE
-
-MagmaHideout_4F_MapWarps: @ 8537550
-	warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R
-	warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R
-
-MagmaHideout_4F_MapEvents:: @ 8537560
-	map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc
deleted file mode 100644
index e10a780f7..000000000
--- a/data/maps/MagmaHideout_4F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_4F: @ 84848B4
-	.4byte MagmaHideout_4F_Layout
-	.4byte MagmaHideout_4F_MapEvents
-	.4byte MagmaHideout_4F_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 341
-	.byte MAPSEC_MAGMA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json
new file mode 100644
index 000000000..b627ae1ed
--- /dev/null
+++ b/data/maps/MagmaHideout_4F/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_MAGMA_HIDEOUT_4F",
+  "name": "MagmaHideout_4F",
+  "layout": "LAYOUT_MAGMA_HIDEOUT_4F",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GROUDON_1",
+      "x": 16,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 31,
+      "y": 22,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MagmaHideout_4F_EventScript_23A68C",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 30,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MagmaHideout_4F_EventScript_23A6A3",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 26,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MagmaHideout_4F_EventScript_23A6BA",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 22,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "MagmaHideout_4F_EventScript_23A6D1",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 16,
+      "y": 21,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_4F_EventScript_23A560",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GROUDON_2",
+      "x": 16,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MagmaHideout_4F_EventScript_29151F",
+      "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 46,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 20,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index ba585c98a..77c339b11 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
 	special sub_80B0534
-	applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 150
 	removeobject 7
@@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	waitmovement 0
 	msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 30
-	applymovement 6, MagmaHideout_4F_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT
 	closemessage
@@ -62,9 +62,9 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	closemessage
 	clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
 	clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
-	setvar VAR_0x4058, 1
+	setvar VAR_SLATEPORT_STATE, 1
 	setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
-	setvar VAR_0x40A0, 1
+	setvar VAR_SLATEPORT_HARBOR_STATE, 1
 	fadescreen 1
 	removeobject 6
 	removeobject 2
diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc
deleted file mode 100644
index 62d1cd37e..000000000
--- a/data/maps/MarineCave_End/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MarineCave_End_EventObjects: @ 85377E8
-	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE
-
-MarineCave_End_MapWarps: @ 8537800
-	warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE
-
-MarineCave_End_MapCoordEvents: @ 8537808
-	coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B
-
-MarineCave_End_MapEvents:: @ 8537818
-	map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0
-
diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc
deleted file mode 100644
index 5a3c1106b..000000000
--- a/data/maps/MarineCave_End/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MarineCave_End: @ 8484A04
-	.4byte MarineCave_End_Layout
-	.4byte MarineCave_End_MapEvents
-	.4byte MarineCave_End_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 413
-	.byte MAPSEC_MARINE_CAVE
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json
new file mode 100644
index 000000000..ec1c3389a
--- /dev/null
+++ b/data/maps/MarineCave_End/map.json
@@ -0,0 +1,52 @@
+{
+  "id": "MAP_MARINE_CAVE_END",
+  "name": "MarineCave_End",
+  "layout": "LAYOUT_MARINE_CAVE_END",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_MARINE_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1",
+      "x": 9,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MARINE_CAVE_KYOGRE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 20,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_MARINE_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "1",
+      "script": "MarineCave_End_EventScript_23B01B"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
index aae89cb8a..028075648 100644
--- a/data/maps/MarineCave_End/scripts.inc
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -1,6 +1,6 @@
 MarineCave_End_MapScripts:: @ 823AFDF
-	map_script 5, MarineCave_End_MapScript1_23AFEA
-	map_script 3, MarineCave_End_MapScript1_23B008
+	map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA
+	map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008
 	.byte 0
 
 MarineCave_End_MapScript1_23AFEA: @ 823AFEA
@@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA
 MarineCave_End_EventScript_23AFF4:: @ 823AFF4
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne MarineCave_End_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 
@@ -25,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012
 
 MarineCave_End_EventScript_23B01B:: @ 823B01B
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	applymovement 1, MarineCave_End_Movement_23B09D
 	waitmovement 0
@@ -47,13 +47,13 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
 	goto_if_eq MarineCave_End_EventScript_23B092
 	compare VAR_RESULT, 5
 	goto_if_eq MarineCave_End_EventScript_23B092
-	setvar VAR_0x4039, 1
+	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	releaseall
 	end
 
 MarineCave_End_EventScript_23B084:: @ 823B084
-	setvar VAR_0x4039, 1
+	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	goto MarineCave_End_EventScript_27376D
 	end
diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc
deleted file mode 100644
index 4db3e1ddc..000000000
--- a/data/maps/MarineCave_Entrance/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-MarineCave_Entrance_MapWarps: @ 85377CC
-	warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END
-
-MarineCave_Entrance_MapEvents:: @ 85377D4
-	map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc
deleted file mode 100644
index 338da988a..000000000
--- a/data/maps/MarineCave_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MarineCave_Entrance: @ 84849E8
-	.4byte MarineCave_Entrance_Layout
-	.4byte MarineCave_Entrance_MapEvents
-	.4byte MarineCave_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 407
-	.byte MAPSEC_MARINE_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json
new file mode 100644
index 000000000..545fe1c9b
--- /dev/null
+++ b/data/maps/MarineCave_Entrance/map.json
@@ -0,0 +1,28 @@
+{
+  "id": "MAP_MARINE_CAVE_ENTRANCE",
+  "name": "MarineCave_Entrance",
+  "layout": "LAYOUT_MARINE_CAVE_ENTRANCE",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_MARINE_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MARINE_CAVE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc
index 24b288050..82ff756e1 100644
--- a/data/maps/MarineCave_Entrance/scripts.inc
+++ b/data/maps/MarineCave_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 MarineCave_Entrance_MapScripts:: @ 823AFD0
-	map_script 5, MarineCave_Entrance_MapScript1_23AFD6
+	map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_MapScript1_23AFD6
 	.byte 0
 
 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6
diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc
deleted file mode 100644
index ee1f4e72a..000000000
--- a/data/maps/MauvilleCity/connections.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MauvilleCity_MapConnectionsList: @ 8486720
-	connection up, 0, MAP_ROUTE111
-	connection down, 0, MAP_ROUTE110
-	connection left, 0, MAP_ROUTE117
-	connection right, 0, MAP_ROUTE118
-
-MauvilleCity_MapConnections: @ 8486750
-	.4byte 0x4
-	.4byte MauvilleCity_MapConnectionsList
-
diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc
deleted file mode 100644
index ebdc866f5..000000000
--- a/data/maps/MauvilleCity/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-MauvilleCity_EventObjects: @ 852662C
-	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0
-	object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0
-	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0
-	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, FLAG_HIDE_MAUVILLE_CITY_WALLY
-	object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE
-	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, FLAG_HIDE_MAUVILLE_CITY_WATTSON
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, FLAG_ITEM_MAUVILLE_CITY_X_SPEED
-	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0
-	object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT
-
-MauvilleCity_MapWarps: @ 8526734
-	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: @ 852676C
-	bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73
-	bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0
-	bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A
-	bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A
-	bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73
-	bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3D7
-	bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9
-	bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2
-
-MauvilleCity_MapEvents:: @ 85267CC
-	map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
-
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
deleted file mode 100644
index aa107e460..000000000
--- a/data/maps/MauvilleCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity: @ 84824F0
-	.4byte MauvilleCity_Layout
-	.4byte MauvilleCity_MapEvents
-	.4byte MauvilleCity_MapScripts
-	.4byte MauvilleCity_MapConnections
-	.2byte MUS_GOTOWN
-	.2byte 3
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
new file mode 100644
index 000000000..e44bc78dd
--- /dev/null
+++ b/data/maps/MauvilleCity/map.json
@@ -0,0 +1,300 @@
+{
+  "id": "MAP_MAUVILLE_CITY",
+  "name": "MauvilleCity",
+  "layout": "LAYOUT_MAUVILLE_CITY",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE111"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE110"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE117"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE118"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 29,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF3B3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 24,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF3CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF3BC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 18,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF3C5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 17,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF3FB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLY",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF452",
+      "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF41D",
+      "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WATTSON",
+      "x": 29,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_1DF73A",
+      "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 28,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_2910CE",
+      "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_EventScript_2C7F7E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 12,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY_GYM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 35,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY_BIKE_SHOP",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 23,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 32,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY_GAME_CORNER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY_HOUSE2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_EventScript_1DF3E0"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_EventScript_1DF3D7"
+    },
+    {
+      "type": "sign",
+      "x": 33,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_EventScript_1DF3E9"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_EventScript_1DF3F2"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index 21f654888..61839d108 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -1,5 +1,5 @@
 MauvilleCity_MapScripts:: @ 81DF385
-	map_script 3, MauvilleCity_MapScript1_1DF38B
+	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B
 	.byte 0
 
 MauvilleCity_MapScript1_1DF38B: @ 81DF38B
@@ -8,7 +8,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B
 	clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_SYS_TV_START
 	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
-	setvar VAR_0x4093, 0
+	setvar VAR_MAUVILLE_GYM_STATE, 0
 	call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9
 	end
 
@@ -70,7 +70,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D
 	msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MauvilleCity_Movement_2725A2
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -78,7 +78,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D
 MauvilleCity_EventScript_1DF43D:: @ 81DF43D
 	msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MauvilleCity_Movement_2725A2
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -86,17 +86,17 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D
 MauvilleCity_EventScript_1DF452:: @ 81DF452
 	lockall
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
 	msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT
 	msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT
-	applymovement 6, MauvilleCity_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 6, MauvilleCity_Movement_272598
+	applymovement 6, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_27259A
+	applymovement 6, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO
 	goto MauvilleCity_EventScript_1DF4AD
@@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
 	applymovement 6, MauvilleCity_Movement_1DF6A8
 	applymovement 7, MauvilleCity_Movement_1DF6E2
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 30
 	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE
@@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D
 	applymovement 6, MauvilleCity_Movement_1DF6AE
 	applymovement 7, MauvilleCity_Movement_1DF6E8
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 30
 	applymovement 7, MauvilleCity_Movement_1DF6F7
@@ -158,17 +158,17 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
 	setflag FLAG_DEFEATED_WALLY_MAUVILLE
-	setvar VAR_0x40F2, 0
+	setvar VAR_WALLY_CALL_STEP_COUNTER, 0
 	setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
 	compare VAR_FACING, 2
 	call_if_eq MauvilleCity_EventScript_1DF5F3
 	compare VAR_FACING, 4
 	call_if_eq MauvilleCity_EventScript_1DF601
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
 	closemessage
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	compare VAR_FACING, 2
 	call_if_eq MauvilleCity_EventScript_1DF616
 	compare VAR_FACING, 4
@@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628
 MauvilleCity_EventScript_1DF63A:: @ 81DF63A
 	msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
-	applymovement 6, MauvilleCity_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT
 	return
@@ -223,7 +223,7 @@ MauvilleCity_EventScript_1DF683:: @ 81DF683
 	end
 
 MauvilleCity_EventScript_1DF690:: @ 81DF690
-	applymovement 6, MauvilleCity_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO
 	goto MauvilleCity_EventScript_1DF4AD
@@ -421,7 +421,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A
 	lock
 	faceplayer
 	goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_EventScript_1DF784
 	goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A
 	msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT
@@ -440,7 +440,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784
 	msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM24
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_GOT_TM24_FROM_WATTSON
 	msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc
deleted file mode 100644
index bae187003..000000000
--- a/data/maps/MauvilleCity_BikeShop/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_BikeShop_EventObjects: @ 852FE80
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0
-
-MauvilleCity_BikeShop_MapWarps: @ 852FEB0
-	warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY
-	warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY
-
-MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0
-	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A
-	bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE
-
-MauvilleCity_BikeShop_MapEvents:: @ 852FED8
-	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
deleted file mode 100644
index d4434e8ba..000000000
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_BikeShop: @ 8483280
-	.4byte MauvilleCity_BikeShop_Layout
-	.4byte MauvilleCity_BikeShop_MapEvents
-	.4byte MauvilleCity_BikeShop_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 90
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json
new file mode 100644
index 000000000..98c1fcee1
--- /dev/null
+++ b/data/maps/MauvilleCity_BikeShop/map.json
@@ -0,0 +1,79 @@
+{
+  "id": "MAP_MAUVILLE_CITY_BIKE_SHOP",
+  "name": "MauvilleCity_BikeShop",
+  "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_BikeShop_EventScript_20EBBC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_BikeShop_EventScript_20ED31",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_BikeShop_EventScript_20ED3A"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_BikeShop_EventScript_20EDAE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc
deleted file mode 100644
index 0fac26b5d..000000000
--- a/data/maps/MauvilleCity_GameCorner/events.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-MauvilleCity_GameCorner_EventObjects: @ 852FF28
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0
-	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0
-	object_event 6, EVENT_OBJ_GFX_POKEFAN_M, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0
-	object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0
-	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0
-	object_event 10, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0
-	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0
-	object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0
-
-MauvilleCity_GameCorner_MapWarps: @ 8530048
-	warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY
-	warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY
-
-MauvilleCity_GameCorner_MapBGEvents: @ 8530058
-	bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6
-	bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6
-	bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316
-	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210336
-	bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210356
-	bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210376
-	bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210396
-	bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103B6
-	bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103D6
-	bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_2103F6
-	bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210416
-	bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210436
-	bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
-
-MauvilleCity_GameCorner_MapEvents:: @ 8530178
-	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
deleted file mode 100644
index 5c7399ae6..000000000
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_GameCorner: @ 84832B8
-	.4byte MauvilleCity_GameCorner_Layout
-	.4byte MauvilleCity_GameCorner_MapEvents
-	.4byte MauvilleCity_GameCorner_MapScripts
-	.4byte 0x0
-	.2byte MUS_CASINO
-	.2byte 91
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json
new file mode 100644
index 000000000..07bfd3bb2
--- /dev/null
+++ b/data/maps/MauvilleCity_GameCorner/map.json
@@ -0,0 +1,385 @@
+{
+  "id": "MAP_MAUVILLE_CITY_GAME_CORNER",
+  "name": "MauvilleCity_GameCorner",
+  "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER",
+  "music": "MUS_CASINO",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_210125",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 16,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_21012E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_20FBB9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_20FCF1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_210137",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 19,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_21021D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 20,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_210279",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_COOK",
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_210289",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_20FE9F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_210299",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_2102B6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_GameCorner_EventScript_2102C6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
+      "script": "MauvilleCity_GameCorner_EventScript_2102D6"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
+      "script": "MauvilleCity_GameCorner_EventScript_2102F6"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
+      "script": "MauvilleCity_GameCorner_EventScript_210316"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
+      "script": "MauvilleCity_GameCorner_EventScript_210336"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
+      "script": "MauvilleCity_GameCorner_EventScript_210356"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
+      "script": "MauvilleCity_GameCorner_EventScript_210376"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
+      "script": "MauvilleCity_GameCorner_EventScript_210396"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
+      "script": "MauvilleCity_GameCorner_EventScript_2103B6"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
+      "script": "MauvilleCity_GameCorner_EventScript_2103D6"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
+      "script": "MauvilleCity_GameCorner_EventScript_2103F6"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
+      "script": "MauvilleCity_GameCorner_EventScript_210416"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
+      "script": "MauvilleCity_GameCorner_EventScript_210436"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 34125b421..88b1ded16 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -215,7 +215,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79
 	end
 
 MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87
-	call MauvilleCity_GameCorner_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	goto MauvilleCity_GameCorner_EventScript_20FD20
 	end
 
@@ -383,7 +383,7 @@ MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF
 	end
 
 MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D
-	call MauvilleCity_GameCorner_EventScript_27205E
+	call Common_EventScript_BagIsFull
 	goto MauvilleCity_GameCorner_EventScript_20FECE
 	end
 
@@ -448,7 +448,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0
 	end
 
 MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA
-	call MauvilleCity_GameCorner_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT
 	release
 	end
@@ -513,7 +513,7 @@ MauvilleCity_GameCorner_EventScript_210299:: @ 8210299
 
 MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9
 	closemessage
-	applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc
deleted file mode 100644
index 4a05acafb..000000000
--- a/data/maps/MauvilleCity_Gym/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-MauvilleCity_Gym_EventObjects: @ 852FD5C
-	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0
-	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0
-
-MauvilleCity_Gym_MapWarps: @ 852FE04
-	warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY
-	warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY
-
-MauvilleCity_Gym_MapCoordEvents: @ 852FE14
-	coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E
-	coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043
-	coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9
-	coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068
-
-MauvilleCity_Gym_MapBGEvents: @ 852FE54
-	bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B
-	bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B
-
-MauvilleCity_Gym_MapEvents:: @ 852FE6C
-	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
deleted file mode 100644
index cd38ec176..000000000
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_Gym: @ 8483264
-	.4byte MauvilleCity_Gym_Layout
-	.4byte MauvilleCity_Gym_MapEvents
-	.4byte MauvilleCity_Gym_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 89
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json
new file mode 100644
index 000000000..9de74941c
--- /dev/null
+++ b/data/maps/MauvilleCity_Gym/map.json
@@ -0,0 +1,181 @@
+{
+  "id": "MAP_MAUVILLE_CITY_GYM",
+  "name": "MauvilleCity_Gym",
+  "layout": "LAYOUT_MAUVILLE_CITY_GYM",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WATTSON",
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_Gym_EventScript_20DEEB",
+      "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MauvilleCity_Gym_EventScript_20E0D0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 1,
+      "y": 16,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MauvilleCity_Gym_EventScript_20E0FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MauvilleCity_Gym_EventScript_20E0E7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 1,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MauvilleCity_Gym_EventScript_20E0B9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 7,
+      "y": 20,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_Gym_EventScript_20E12C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MauvilleCity_Gym_EventScript_20E115",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "MauvilleCity_Gym_EventScript_20E01E"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "MauvilleCity_Gym_EventScript_20E043"
+    },
+    {
+      "type": "trigger",
+      "x": 0,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "MauvilleCity_Gym_EventScript_20DFF9"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "MauvilleCity_Gym_EventScript_20E068"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MauvilleCity_Gym_EventScript_20E14B"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MauvilleCity_Gym_EventScript_20E15B"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index 76bceae56..e23d48332 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -1,10 +1,10 @@
 MauvilleCity_Gym_MapScripts:: @ 820DD6E
-	map_script 1, MauvilleCity_Gym_MapScript1_20DD74
+	map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_20DD74
 	.byte 0
 
 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7
-	switch VAR_0x4093
+	switch VAR_MAUVILLE_GYM_STATE
 	case 0, MauvilleCity_Gym_EventScript_20DDBA
 	case 1, MauvilleCity_Gym_EventScript_20DEAF
 	case 2, MauvilleCity_Gym_EventScript_20DEBD
@@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_20DFDE
 	goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_20DFD4
 	msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT
 	release
@@ -88,14 +88,14 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
 MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 	message MauvilleCity_Gym_Text_20E77F
 	waitmessage
-	call MauvilleCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT
-	setvar VAR_0x40D2, 3
+	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
 	setflag FLAG_DEFEATED_MAUVILLE_GYM
 	setflag FLAG_BADGE03_GET
-	addvar VAR_0x4085, 1
-	compare VAR_0x4085, 6
+	addvar VAR_PETALBURG_GYM_STATE, 1
+	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq MauvilleCity_Gym_EventScript_271E84
 	setvar VAR_0x8008, 3
 	call MauvilleCity_Gym_EventScript_271F43
@@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D
 	giveitem_std ITEM_TM34
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM34
 	release
@@ -126,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D
 MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1
 	giveitem_std ITEM_TM34
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM34
 	return
@@ -144,9 +144,9 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE
 MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
-	compare VAR_0x4093, 1
+	compare VAR_MAUVILLE_GYM_STATE, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
-	setvar VAR_0x4093, 1
+	setvar VAR_MAUVILLE_GYM_STATE, 1
 	setvar VAR_0x8004, 0
 	goto MauvilleCity_Gym_EventScript_20E08D
 	end
@@ -154,9 +154,9 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9
 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
-	compare VAR_0x4093, 2
+	compare VAR_MAUVILLE_GYM_STATE, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
-	setvar VAR_0x4093, 2
+	setvar VAR_MAUVILLE_GYM_STATE, 2
 	setvar VAR_0x8004, 1
 	goto MauvilleCity_Gym_EventScript_20E08D
 	end
@@ -164,9 +164,9 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E
 MauvilleCity_Gym_EventScript_20E043:: @ 820E043
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
-	compare VAR_0x4093, 3
+	compare VAR_MAUVILLE_GYM_STATE, 3
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
-	setvar VAR_0x4093, 3
+	setvar VAR_MAUVILLE_GYM_STATE, 3
 	setvar VAR_0x8004, 2
 	goto MauvilleCity_Gym_EventScript_20E08D
 	end
@@ -174,9 +174,9 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043
 MauvilleCity_Gym_EventScript_20E068:: @ 820E068
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
-	compare VAR_0x4093, 4
+	compare VAR_MAUVILLE_GYM_STATE, 4
 	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
-	setvar VAR_0x4093, 4
+	setvar VAR_MAUVILLE_GYM_STATE, 4
 	setvar VAR_0x8004, 3
 	goto MauvilleCity_Gym_EventScript_20E08D
 	end
diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc
deleted file mode 100644
index 1d759b438..000000000
--- a/data/maps/MauvilleCity_House1/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MauvilleCity_House1_EventObjects: @ 852FEEC
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0
-
-MauvilleCity_House1_MapWarps: @ 852FF04
-	warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY
-	warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY
-
-MauvilleCity_House1_MapEvents:: @ 852FF14
-	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
deleted file mode 100644
index 261e0e45b..000000000
--- a/data/maps/MauvilleCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_House1: @ 848329C
-	.4byte House2_Layout
-	.4byte MauvilleCity_House1_MapEvents
-	.4byte MauvilleCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 60
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json
new file mode 100644
index 000000000..d7e148b31
--- /dev/null
+++ b/data/maps/MauvilleCity_House1/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_MAUVILLE_CITY_HOUSE1",
+  "name": "MauvilleCity_House1",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_House1_EventScript_20F976",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc
deleted file mode 100644
index fae511bb3..000000000
--- a/data/maps/MauvilleCity_House2/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MauvilleCity_House2_EventObjects: @ 853018C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0
-
-MauvilleCity_House2_MapWarps: @ 85301A4
-	warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY
-	warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY
-
-MauvilleCity_House2_MapEvents:: @ 85301B4
-	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
deleted file mode 100644
index 3a584fe41..000000000
--- a/data/maps/MauvilleCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_House2: @ 84832D4
-	.4byte House1_Layout
-	.4byte MauvilleCity_House2_MapEvents
-	.4byte MauvilleCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 59
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json
new file mode 100644
index 000000000..272b60f0f
--- /dev/null
+++ b/data/maps/MauvilleCity_House2/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_MAUVILLE_CITY_HOUSE2",
+  "name": "MauvilleCity_House2",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_House2_EventScript_210C5D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc
index c49052914..b683b8c15 100644
--- a/data/maps/MauvilleCity_House2/scripts.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
@@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D
 
 MauvilleCity_House2_EventScript_210C82:: @ 8210C82
 	playse SE_PIN
-	applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598
+	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A
+	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO
 	compare VAR_RESULT, 1
diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc
deleted file mode 100644
index 0d32a0e2c..000000000
--- a/data/maps/MauvilleCity_Mart/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MauvilleCity_Mart_EventObjects: @ 8530310
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0
-
-MauvilleCity_Mart_MapWarps: @ 8530358
-	warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY
-	warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY
-
-MauvilleCity_Mart_MapEvents:: @ 8530368
-	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
deleted file mode 100644
index b3d85a0c6..000000000
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_Mart: @ 8483328
-	.4byte Mart_Layout
-	.4byte MauvilleCity_Mart_MapEvents
-	.4byte MauvilleCity_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json
new file mode 100644
index 000000000..598ed6e52
--- /dev/null
+++ b/data/maps/MauvilleCity_Mart/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_MAUVILLE_CITY_MART",
+  "name": "MauvilleCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_Mart_EventScript_2110E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_Mart_EventScript_21111C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_Mart_EventScript_211125",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index daf747e0d..000000000
--- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0
-	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0
-
-MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240
-	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:: @ 8530258
-	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
deleted file mode 100644
index 207dfb526..000000000
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_1F: @ 84832F0
-	.4byte PokemonCenter_1F_Layout
-	.4byte MauvilleCity_PokemonCenter_1F_MapEvents
-	.4byte MauvilleCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..c024c2cba
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F",
+  "name": "MauvilleCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_MAUVILLE_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index 1eac0efc9..a866e6aa4 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
-	map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66
-	map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66
+	map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index 031dac213..000000000
--- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0
-
-MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4
-	warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC
-	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
deleted file mode 100644
index 00bf23b83..000000000
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_2F: @ 848330C
-	.4byte PokemonCenter_2F_Layout
-	.4byte MauvilleCity_PokemonCenter_2F_MapEvents
-	.4byte MauvilleCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_MAUVILLE_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..4afcc3882
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F",
+  "name": "MauvilleCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_MAUVILLE_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 8,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index 196d49a26..a289886a3 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
-	map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D
diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc
deleted file mode 100644
index 8f84327d2..000000000
--- a/data/maps/MeteorFalls_1F_1R/events.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-MeteorFalls_1F_1R_EventObjects: @ 8533F74
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA
-	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
-	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO
-
-MeteorFalls_1F_1R_MapWarps: @ 8534064
-	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
-	warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE
-
-MeteorFalls_1F_1R_MapCoordEvents: @ 8534094
-	coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F
-
-MeteorFalls_1F_1R_MapBGEvents: @ 85340A4
-	bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0
-
-MeteorFalls_1F_1R_MapEvents:: @ 85340B0
-	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
deleted file mode 100644
index 85ba8dd6b..000000000
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_1F_1R: @ 8483EC0
-	.4byte MeteorFalls_1F_1R_Layout
-	.4byte MeteorFalls_1F_1R_MapEvents
-	.4byte MeteorFalls_1F_1R_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 125
-	.byte MAPSEC_METEOR_FALLS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json
new file mode 100644
index 000000000..586de013f
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/map.json
@@ -0,0 +1,213 @@
+{
+  "id": "MAP_METEOR_FALLS_1F_1R",
+  "name": "MeteorFalls_1F_1R",
+  "layout": "LAYOUT_METEOR_FALLS_1F_1R",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_METEOR_FALLS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MeteorFalls_1F_1R_EventScript_2911AB",
+      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MeteorFalls_1F_1R_EventScript_2911C5",
+      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 27,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MeteorFalls_1F_1R_EventScript_2911B8",
+      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 26,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MeteorFalls_1F_1R_EventScript_2911D2",
+      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 12,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 14,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 6,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 6,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 6,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 13,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MeteorFalls_1F_1R_EventScript_22BF25",
+      "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 27,
+      "y": 18,
+      "elevation": 4,
+      "dest_map": "MAP_ROUTE114",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 39,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE115",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_1F_2R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_B1F_1R",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 26,
+      "y": 28,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_B1F_1R",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_METEOR_FALLS_STEVENS_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 18,
+      "elevation": 4,
+      "var": "VAR_METEOR_FALLS_STATE",
+      "var_value": "0",
+      "script": "MeteorFalls_1F_1R_EventScript_22BD5F"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 58,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "0x0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index ea161ba23..bd1b8d090 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -1,5 +1,5 @@
 MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
-	map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30
+	map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30
 	.byte 0
 
 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
@@ -16,20 +16,20 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
 MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	lockall
 	playbgm MUS_MGM0, 0
-	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown
 	waitmovement 0
 	delay 30
 	applymovement 5, MeteorFalls_1F_1R_Movement_2725B4
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A6
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A6
+	applymovement 5, Common_Movement_WalkInPlaceUp
+	applymovement 6, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 5, MeteorFalls_1F_1R_Movement_272598
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_27259A
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT
 	closemessage
@@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 6, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	addobject 7
 	addobject 8
@@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0
 	applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8
 	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 6, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT
 	closemessage
@@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	applymovement 9, MeteorFalls_1F_1R_Movement_22BF18
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT
-	applymovement 7, MeteorFalls_1F_1R_Movement_2725AA
+	applymovement 7, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT
-	applymovement 7, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement 7, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT
 	closemessage
@@ -86,7 +86,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
 	setflag FLAG_MET_ARCHIE_METEOR_FALLS
 	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
-	setvar VAR_0x40BF, 1
+	setvar VAR_METEOR_FALLS_STATE, 1
 	releaseall
 	end
 
diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc
deleted file mode 100644
index d9a15cbcb..000000000
--- a/data/maps/MeteorFalls_1F_2R/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MeteorFalls_1F_2R_EventObjects: @ 85340C4
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0
-
-MeteorFalls_1F_2R_MapWarps: @ 853410C
-	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: @ 853412C
-	bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0
-
-MeteorFalls_1F_2R_MapEvents:: @ 8534138
-	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
deleted file mode 100644
index 79b56a254..000000000
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_1F_2R: @ 8483EDC
-	.4byte MeteorFalls_1F_2R_Layout
-	.4byte MeteorFalls_1F_2R_MapEvents
-	.4byte MeteorFalls_1F_2R_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 126
-	.byte MAPSEC_METEOR_FALLS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json
new file mode 100644
index 000000000..be52085cd
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/map.json
@@ -0,0 +1,98 @@
+{
+  "id": "MAP_METEOR_FALLS_1F_2R",
+  "name": "MeteorFalls_1F_2R",
+  "layout": "LAYOUT_METEOR_FALLS_1F_2R",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_METEOR_FALLS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MeteorFalls_1F_2R_EventScript_22C4DE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MeteorFalls_1F_2R_EventScript_22C540",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MeteorFalls_1F_2R_EventScript_22C5A4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_1F_1R",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_B1F_1R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_B1F_1R",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 21,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_B1F_1R",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 58,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "0x0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc
deleted file mode 100644
index 039f316d9..000000000
--- a/data/maps/MeteorFalls_B1F_1R/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MeteorFalls_B1F_1R_MapWarps: @ 853414C
-	warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R
-	warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R
-	warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R
-	warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R
-	warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R
-	warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R
-
-MeteorFalls_B1F_1R_MapEvents:: @ 853417C
-	map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
deleted file mode 100644
index 0d1edf89e..000000000
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_B1F_1R: @ 8483EF8
-	.4byte MeteorFalls_B1F_1R_Layout
-	.4byte MeteorFalls_B1F_1R_MapEvents
-	.4byte MeteorFalls_B1F_1R_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 127
-	.byte MAPSEC_METEOR_FALLS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json
new file mode 100644
index 000000000..c234bd8b8
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_1R/map.json
@@ -0,0 +1,63 @@
+{
+  "id": "MAP_METEOR_FALLS_B1F_1R",
+  "name": "MeteorFalls_B1F_1R",
+  "layout": "LAYOUT_METEOR_FALLS_B1F_1R",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_METEOR_FALLS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_METEOR_FALLS_1F_2R",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 11,
+      "elevation": 5,
+      "dest_map": "MAP_METEOR_FALLS_1F_2R",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 18,
+      "y": 15,
+      "elevation": 4,
+      "dest_map": "MAP_METEOR_FALLS_1F_2R",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 17,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_B1F_2R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 23,
+      "elevation": 5,
+      "dest_map": "MAP_METEOR_FALLS_1F_1R",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 20,
+      "y": 36,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_1F_1R",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc
deleted file mode 100644
index 44b283d1e..000000000
--- a/data/maps/MeteorFalls_B1F_2R/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MeteorFalls_B1F_2R_EventObjects: @ 8534190
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02
-
-MeteorFalls_B1F_2R_MapWarps: @ 85341A8
-	warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R
-
-MeteorFalls_B1F_2R_MapEvents:: @ 85341B0
-	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
deleted file mode 100644
index ed9fe8beb..000000000
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_B1F_2R: @ 8483F14
-	.4byte MeteorFalls_B1F_2R_Layout
-	.4byte MeteorFalls_B1F_2R_MapEvents
-	.4byte MeteorFalls_B1F_2R_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 128
-	.byte MAPSEC_METEOR_FALLS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json
new file mode 100644
index 000000000..7c45bfdd0
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_2R/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_METEOR_FALLS_B1F_2R",
+  "name": "MeteorFalls_B1F_2R",
+  "layout": "LAYOUT_METEOR_FALLS_B1F_2R",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_METEOR_FALLS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MeteorFalls_B1F_2R_EventScript_2911DF",
+      "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_B1F_1R",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc
deleted file mode 100644
index 09225365d..000000000
--- a/data/maps/MeteorFalls_StevensCave/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MeteorFalls_StevensCave_EventObjects: @ 85378B0
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0
-
-MeteorFalls_StevensCave_MapWarps: @ 85378C8
-	warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R
-
-MeteorFalls_StevensCave_MapEvents:: @ 85378D0
-	map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc
deleted file mode 100644
index 28b265d44..000000000
--- a/data/maps/MeteorFalls_StevensCave/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MeteorFalls_StevensCave: @ 8484A74
-	.4byte MeteorFalls_StevensCave_Layout
-	.4byte MeteorFalls_StevensCave_MapEvents
-	.4byte MeteorFalls_StevensCave_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 431
-	.byte MAPSEC_METEOR_FALLS
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json
new file mode 100644
index 000000000..b23c3f952
--- /dev/null
+++ b/data/maps/MeteorFalls_StevensCave/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_METEOR_FALLS_STEVENS_CAVE",
+  "name": "MeteorFalls_StevensCave",
+  "layout": "LAYOUT_METEOR_FALLS_STEVENS_CAVE",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_METEOR_FALLS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 19,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MeteorFalls_StevensCave_EventScript_23B182",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_METEOR_FALLS_1F_1R",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc
index ba8d807c5..31baad43c 100644
--- a/data/maps/MeteorFalls_StevensCave/scripts.inc
+++ b/data/maps/MeteorFalls_StevensCave/scripts.inc
@@ -6,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD
 	waitse
 	playse SE_PIN
-	applymovement 1, MeteorFalls_StevensCave_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, MeteorFalls_StevensCave_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 1, MeteorFalls_StevensCave_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D
@@ -20,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	end
 
 MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD
-	applymovement 1, MeteorFalls_StevensCave_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc
deleted file mode 100644
index f35ce6d2a..000000000
--- a/data/maps/MirageTower_1F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-MirageTower_1F_MapWarps: @ 85375D4
-	warp_def 10, 14, 3, 3, MAP_ROUTE111
-	warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F
-
-MirageTower_1F_MapEvents:: @ 85375E4
-	map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc
deleted file mode 100644
index 59ce7edbf..000000000
--- a/data/maps/MirageTower_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_1F: @ 8484908
-	.4byte MirageTower_1F_Layout
-	.4byte MirageTower_1F_MapEvents
-	.4byte MirageTower_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 381
-	.byte MAPSEC_MIRAGE_TOWER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json
new file mode 100644
index 000000000..886e0bf88
--- /dev/null
+++ b/data/maps/MirageTower_1F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_MIRAGE_TOWER_1F",
+  "name": "MirageTower_1F",
+  "layout": "LAYOUT_MIRAGE_TOWER_1F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_MIRAGE_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_MIRAGE_TOWER_2F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc
index 94aed55d0..9f6c35a84 100644
--- a/data/maps/MirageTower_1F/scripts.inc
+++ b/data/maps/MirageTower_1F/scripts.inc
@@ -1,5 +1,5 @@
 MirageTower_1F_MapScripts:: @ 823AD01
-	map_script 3, MirageTower_1F_MapScript1_23AD07
+	map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07
 	.byte 0
 
 MirageTower_1F_MapScript1_23AD07: @ 823AD07
diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc
deleted file mode 100644
index fdbafbe06..000000000
--- a/data/maps/MirageTower_2F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-MirageTower_2F_MapWarps: @ 85375F8
-	warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F
-	warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F
-
-MirageTower_2F_MapEvents:: @ 8537608
-	map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc
deleted file mode 100644
index efb970538..000000000
--- a/data/maps/MirageTower_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_2F: @ 8484924
-	.4byte MirageTower_2F_Layout
-	.4byte MirageTower_2F_MapEvents
-	.4byte MirageTower_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 382
-	.byte MAPSEC_MIRAGE_TOWER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json
new file mode 100644
index 000000000..d8953d3da
--- /dev/null
+++ b/data/maps/MirageTower_2F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_MIRAGE_TOWER_2F",
+  "name": "MirageTower_2F",
+  "layout": "LAYOUT_MIRAGE_TOWER_2F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_MIRAGE_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MIRAGE_TOWER_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_MIRAGE_TOWER_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc
index 79f3cce2a..d22a7c6ff 100644
--- a/data/maps/MirageTower_2F/scripts.inc
+++ b/data/maps/MirageTower_2F/scripts.inc
@@ -1,7 +1,7 @@
 MirageTower_2F_MapScripts:: @ 823AD11
-	map_script 2, MirageTower_2F_MapScript2_2A8327
-	map_script 3, MirageTower_2F_MapScript1_2A8331
-	map_script 5, MirageTower_2F_MapScript1_23AD21
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327
+	map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331
+	map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21
 	.byte 0
 
 MirageTower_2F_MapScript1_23AD21: @ 823AD21
diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc
deleted file mode 100644
index 4f55d7485..000000000
--- a/data/maps/MirageTower_3F/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_3F_EventObjects: @ 853761C
-	object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11
-	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12
-
-MirageTower_3F_MapWarps: @ 853764C
-	warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F
-	warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F
-
-MirageTower_3F_MapEvents:: @ 853765C
-	map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc
deleted file mode 100644
index 7362c553e..000000000
--- a/data/maps/MirageTower_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_3F: @ 8484940
-	.4byte MirageTower_3F_Layout
-	.4byte MirageTower_3F_MapEvents
-	.4byte MirageTower_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 383
-	.byte MAPSEC_MIRAGE_TOWER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json
new file mode 100644
index 000000000..a653c6e52
--- /dev/null
+++ b/data/maps/MirageTower_3F/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_MIRAGE_TOWER_3F",
+  "name": "MirageTower_3F",
+  "layout": "LAYOUT_MIRAGE_TOWER_3F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_MIRAGE_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MirageTower_3F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MirageTower_3F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_12"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 18,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MIRAGE_TOWER_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_MIRAGE_TOWER_4F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc
index 1ec82de55..f29f542fc 100644
--- a/data/maps/MirageTower_3F/scripts.inc
+++ b/data/maps/MirageTower_3F/scripts.inc
@@ -1,7 +1,7 @@
 MirageTower_3F_MapScripts:: @ 823AD2C
-	map_script 2, MirageTower_3F_MapScript2_2A8327
-	map_script 3, MirageTower_3F_MapScript1_2A8331
-	map_script 5, MirageTower_3F_MapScript1_23AD3C
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327
+	map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331
+	map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C
 	.byte 0
 
 MirageTower_3F_MapScript1_23AD3C: @ 823AD3C
diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc
deleted file mode 100644
index 61c536c61..000000000
--- a/data/maps/MirageTower_4F/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_4F_EventObjects: @ 8537670
-	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
-	object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11
-
-MirageTower_4F_MapWarps: @ 85376B8
-	warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F
-
-MirageTower_4F_MapEvents:: @ 85376C0
-	map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc
deleted file mode 100644
index 842b12bb6..000000000
--- a/data/maps/MirageTower_4F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MirageTower_4F: @ 848495C
-	.4byte MirageTower_4F_Layout
-	.4byte MirageTower_4F_MapEvents
-	.4byte MirageTower_4F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 388
-	.byte MAPSEC_MIRAGE_TOWER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json
new file mode 100644
index 000000000..d6b69a14c
--- /dev/null
+++ b/data/maps/MirageTower_4F/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_MIRAGE_TOWER_4F",
+  "name": "MirageTower_4F",
+  "layout": "LAYOUT_MIRAGE_TOWER_4F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_MIRAGE_TOWER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FOSSIL",
+      "x": 5,
+      "y": 4,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MirageTower_4F_EventScript_23AD48",
+      "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FOSSIL",
+      "x": 7,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MirageTower_4F_EventScript_23AD89",
+      "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MirageTower_4F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_MIRAGE_TOWER_3F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc
index 312852586..3d8dd80d0 100644
--- a/data/maps/MirageTower_4F/scripts.inc
+++ b/data/maps/MirageTower_4F/scripts.inc
@@ -52,7 +52,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
 	waitstate
 	special DoMirageTowerCeilingCrumble
 	waitstate
-	setvar VAR_0x40CB, 1
+	setvar VAR_ROUTE_111_STATE, 1
 	clearflag FLAG_LANDMARK_MIRAGE_TOWER
 	warp MAP_ROUTE111, 255, 19, 59
 	waitstate
diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc
deleted file mode 100644
index a1845c04c..000000000
--- a/data/maps/MossdeepCity/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-MossdeepCity_MapConnectionsList: @ 84867C4
-	connection up, 0, MAP_ROUTE125
-	connection down, 0, MAP_ROUTE127
-	connection left, -40, MAP_ROUTE124
-
-MossdeepCity_MapConnections: @ 84867E8
-	.4byte 0x3
-	.4byte MossdeepCity_MapConnectionsList
diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc
deleted file mode 100644
index 5a653bc22..000000000
--- a/data/maps/MossdeepCity/events.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-MossdeepCity_EventObjects: @ 8527018
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
-	object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, FLAG_ITEM_MOSSDEEP_CITY_NET_BALL
-	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0
-	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0
-	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
-	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
-	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
-	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
-	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
-	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0
-	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT
-	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0
-
-MossdeepCity_MapWarps: @ 85271B0
-	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, 25, 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, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
-	warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
-
-MossdeepCity_MapCoordEvents: @ 8527200
-	coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 42, 21, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 22, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 23, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 24, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
-	coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
-	coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
-
-MossdeepCity_MapBGEvents: @ 85272A0
-	bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26
-	bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D
-	bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73
-	bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A
-	bg_event 66, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B2F
-	bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73
-	bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A
-	bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14
-
-MossdeepCity_MapEvents:: @ 8527300
-	map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
-
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
deleted file mode 100644
index 641faf0f7..000000000
--- a/data/maps/MossdeepCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity: @ 8482560
-	.4byte MossdeepCity_Layout
-	.4byte MossdeepCity_MapEvents
-	.4byte MossdeepCity_MapScripts
-	.4byte MossdeepCity_MapConnections
-	.2byte MUS_GOTOWN
-	.2byte 7
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
new file mode 100644
index 000000000..99d7ae01c
--- /dev/null
+++ b/data/maps/MossdeepCity/map.json
@@ -0,0 +1,485 @@
+{
+  "id": "MAP_MOSSDEEP_CITY",
+  "name": "MossdeepCity",
+  "layout": "LAYOUT_MOSSDEEP_CITY",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE125"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE127"
+    },
+    {
+      "direction": "left",
+      "offset": -40,
+      "map": "MAP_ROUTE124"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 38,
+      "y": 12,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4AD1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 50,
+      "y": 34,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4AF9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 32,
+      "y": 12,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4AB2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 26,
+      "y": 21,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4AF0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 45,
+      "y": 18,
+      "elevation": 7,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4B02",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 62,
+      "y": 35,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_2910F5",
+      "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 55,
+      "y": 5,
+      "elevation": 7,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4C10",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 56,
+      "y": 21,
+      "elevation": 7,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4B0B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 23,
+      "y": 13,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4C26",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 44,
+      "y": 23,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 44,
+      "y": 24,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 44,
+      "y": 25,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 44,
+      "y": 26,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 45,
+      "y": 25,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 19,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_2C81EE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 61,
+      "y": 29,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4C85",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 31,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_EventScript_1E4C7C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 28,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 38,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 28,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 67,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 37,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 49,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_HOUSE3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_HOUSE4",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 64,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 36,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 25,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_EventScript_1E4B38"
+    },
+    {
+      "type": "trigger",
+      "x": 26,
+      "y": 25,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_EventScript_1E4B38"
+    },
+    {
+      "type": "trigger",
+      "x": 32,
+      "y": 27,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_EventScript_1E4B38"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 27,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_EventScript_1E4B38"
+    },
+    {
+      "type": "trigger",
+      "x": 42,
+      "y": 21,
+      "elevation": 5,
+      "var": "VAR_MOSSDEEP_STATE",
+      "var_value": "1",
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 41,
+      "y": 22,
+      "elevation": 5,
+      "var": "VAR_MOSSDEEP_STATE",
+      "var_value": "1",
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 41,
+      "y": 23,
+      "elevation": 5,
+      "var": "VAR_MOSSDEEP_STATE",
+      "var_value": "1",
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 41,
+      "y": 24,
+      "elevation": 5,
+      "var": "VAR_MOSSDEEP_STATE",
+      "var_value": "1",
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 40,
+      "y": 25,
+      "elevation": 5,
+      "var": "VAR_MOSSDEEP_STATE",
+      "var_value": "1",
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 40,
+      "y": 26,
+      "elevation": 5,
+      "var": "VAR_MOSSDEEP_STATE",
+      "var_value": "1",
+      "script": "MossdeepCity_EventScript_1E4B41"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_EventScript_1E4B26"
+    },
+    {
+      "type": "sign",
+      "x": 34,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_EventScript_1E4B1D"
+    },
+    {
+      "type": "sign",
+      "x": 29,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 38,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 66,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_EventScript_1E4B2F"
+    },
+    {
+      "type": "sign",
+      "x": 30,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 39,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 57,
+      "y": 21,
+      "elevation": 7,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_EventScript_1E4B14"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index b504d7004..493cded0a 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -1,5 +1,5 @@
 MossdeepCity_MapScripts:: @ 81E4A96
-	map_script 3, MossdeepCity_MapScript1_1E4A9C
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C
 	.byte 0
 
 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
@@ -7,7 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	end
 
 MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
@@ -94,7 +94,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
 	removeobject 12
 	removeobject 13
 	delay 30
-	setvar VAR_0x405D, 2
+	setvar VAR_MOSSDEEP_STATE, 2
 	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
 	releaseall
 	end
@@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10
 	lock
 	faceplayer
 	msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -231,7 +231,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26
 	msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT
 	giveitem_std ITEM_KINGS_ROCK
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end
@@ -259,7 +259,7 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85
 	call_if_eq MossdeepCity_EventScript_1E4CB0
 	compare VAR_FACING, 4
 	call_if_eq MossdeepCity_EventScript_1E4CC2
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	removeobject 16
 	release
 	end
diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
deleted file mode 100644
index 2f96c458f..000000000
--- a/data/maps/MossdeepCity_GameCorner_1F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0
-
-MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70
-	warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY
-	warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY
-	warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F
-
-MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88
-	bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D
-	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D
-	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96
-
-MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC
-	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
deleted file mode 100644
index d32f3a306..000000000
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_GameCorner_1F: @ 84839F0
-	.4byte MossdeepCity_GameCorner_1F_Layout
-	.4byte MossdeepCity_GameCorner_1F_MapEvents
-	.4byte MossdeepCity_GameCorner_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 305
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json
new file mode 100644
index 000000000..8ea28a474
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_1F/map.json
@@ -0,0 +1,94 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F",
+  "name": "MossdeepCity_GameCorner_1F",
+  "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_GameCorner_1F_EventScript_224B54",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 4,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 2,
+      "y": 0,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 0,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_GameCorner_1F_EventScript_224B5D"
+    },
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_GameCorner_1F_EventScript_277E9D"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_GameCorner_1F_EventScript_277E96"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index ed10a8309..db9a1f854 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
@@ -1,15 +1,15 @@
 MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
-	map_script 2, MossdeepCity_GameCorner_1F_MapScript2_224B41
-	map_script 4, MossdeepCity_GameCorner_1F_MapScript2_224B37
-	map_script 1, MossdeepCity_GameCorner_1F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE
 	.byte 0
 
 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
-	map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE
 	.2byte 0
 
 MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
-	map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D
+	map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D
 	.2byte 0
 
 MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
deleted file mode 100644
index 0737cd7e0..000000000
--- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0
-	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
-
-MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8
-	warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
-
-MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0
-	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
deleted file mode 100644
index 856f76166..000000000
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_GameCorner_B1F: @ 8483A0C
-	.4byte MossdeepCity_GameCorner_B1F_Layout
-	.4byte MossdeepCity_GameCorner_B1F_MapEvents
-	.4byte MossdeepCity_GameCorner_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 306
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json
new file mode 100644
index 000000000..c86bf2b6e
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F",
+  "name": "MossdeepCity_GameCorner_B1F",
+  "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc
deleted file mode 100644
index a6511d2c1..000000000
--- a/data/maps/MossdeepCity_Gym/events.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-MossdeepCity_Gym_EventObjects: @ 85324EC
-	object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0
-	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0
-	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0
-	object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0
-	object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0
-	object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0
-	object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0
-	object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0
-	object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0
-	object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0
-	object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0
-	object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0
-	object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0
-	object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-
-MossdeepCity_Gym_MapWarps: @ 853284C
-	warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY
-	warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY
-	warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM
-	warp_def 1, 23, 3, 2, MAP_MOSSDEEP_CITY_GYM
-	warp_def 7, 18, 0, 5, MAP_MOSSDEEP_CITY_GYM
-	warp_def 8, 12, 0, 4, MAP_MOSSDEEP_CITY_GYM
-	warp_def 9, 18, 0, 7, MAP_MOSSDEEP_CITY_GYM
-	warp_def 23, 20, 0, 6, MAP_MOSSDEEP_CITY_GYM
-	warp_def 1, 33, 3, 9, MAP_MOSSDEEP_CITY_GYM
-	warp_def 20, 24, 0, 8, MAP_MOSSDEEP_CITY_GYM
-	warp_def 11, 3, 0, 11, MAP_MOSSDEEP_CITY_GYM
-	warp_def 11, 35, 3, 10, MAP_MOSSDEEP_CITY_GYM
-	warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM
-	warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM
-
-MossdeepCity_Gym_MapCoordEvents: @ 85328BC
-	coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67
-	coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D
-	coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D
-	coord_event 15, 34, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C93
-	coord_event 23, 24, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9
-	coord_event 23, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9
-	coord_event 8, 6, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CBF
-	coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1
-	coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67
-
-MossdeepCity_Gym_MapBGEvents: @ 853294C
-	bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33
-	bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43
-
-MossdeepCity_Gym_MapEvents:: @ 8532964
-	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
deleted file mode 100644
index 12421b787..000000000
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_Gym: @ 84838BC
-	.4byte MossdeepCity_Gym_Layout
-	.4byte MossdeepCity_Gym_MapEvents
-	.4byte MossdeepCity_Gym_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 108
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json
new file mode 100644
index 000000000..2d86ad9a8
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/map.json
@@ -0,0 +1,687 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_GYM",
+  "name": "MossdeepCity_Gym",
+  "layout": "LAYOUT_MOSSDEEP_CITY_GYM",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TATE",
+      "x": 23,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_Gym_EventScript_220898",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 1,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220AFD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 5,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220B2B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 4,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220B70",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 4,
+      "y": 23,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220B59",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220B14",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 6,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220B42",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 5,
+      "y": 33,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_Gym_EventScript_220C11",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LIZA",
+      "x": 24,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_Gym_EventScript_220898",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 2,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 1,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 4,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 5,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 5,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220B9E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220B87",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 11,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 12,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 12,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 22,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220BCC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 23,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 25,
+      "y": 25,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220BB5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 22,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220BFA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 21,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 21,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 22,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 25,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MossdeepCity_Gym_EventScript_220BE3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 24,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 24,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 23,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 35,
+      "elevation": 3,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 35,
+      "elevation": 3,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 8,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 9,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 23,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 1,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 20,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 11,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 11,
+      "y": 35,
+      "elevation": 3,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 13,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 13
+    },
+    {
+      "x": 21,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_GYM",
+      "dest_warp_id": 12
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 21,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220C67"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220C7D"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220C7D"
+    },
+    {
+      "type": "trigger",
+      "x": 15,
+      "y": 34,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220C93"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 24,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220CA9"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 21,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220CA9"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220CBF"
+    },
+    {
+      "type": "trigger",
+      "x": 21,
+      "y": 6,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220AF1"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 30,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "MossdeepCity_Gym_EventScript_220C67"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 34,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MossdeepCity_Gym_EventScript_220C33"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 34,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MossdeepCity_Gym_EventScript_220C43"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index fc1a73b4d..7fc98dc54 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -1,5 +1,5 @@
 MossdeepCity_Gym_MapScripts:: @ 8220800
-	map_script 1, MossdeepCity_Gym_MapScript1_220806
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806
 	.byte 0
 
 MossdeepCity_Gym_MapScript1_220806: @ 8220806
@@ -57,7 +57,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898
 MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 	message MossdeepCity_Gym_Text_22196A
 	waitmessage
-	call MossdeepCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_MOSSDEEP_GYM
 	setflag FLAG_BADGE07_GET
@@ -71,9 +71,9 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
-	setvar VAR_0x405D, 1
+	setvar VAR_MOSSDEEP_STATE, 1
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
-	setvar VAR_0x409F, 1
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1
 	call MossdeepCity_Gym_EventScript_22095B
 	closemessage
 	delay 30
@@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 MossdeepCity_Gym_EventScript_220937:: @ 8220937
 	giveitem_std ITEM_TM04
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM04
 	release
@@ -98,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937
 MossdeepCity_Gym_EventScript_22095B:: @ 822095B
 	giveitem_std ITEM_TM04
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM04
 	return
diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc
deleted file mode 100644
index 4ccf90558..000000000
--- a/data/maps/MossdeepCity_House1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MossdeepCity_House1_EventObjects: @ 8532978
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0
-
-MossdeepCity_House1_MapWarps: @ 85329A8
-	warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House1_MapEvents:: @ 85329B8
-	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
deleted file mode 100644
index 365120f52..000000000
--- a/data/maps/MossdeepCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_House1: @ 84838D8
-	.4byte House2_Layout
-	.4byte MossdeepCity_House1_MapEvents
-	.4byte MossdeepCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 60
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json
new file mode 100644
index 000000000..def086288
--- /dev/null
+++ b/data/maps/MossdeepCity_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_HOUSE1",
+  "name": "MossdeepCity_House1",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House1_EventScript_221FD6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House1_EventScript_222006",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc
deleted file mode 100644
index 8e169c3b0..000000000
--- a/data/maps/MossdeepCity_House2/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_House2_EventObjects: @ 85329CC
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0
-	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
-
-MossdeepCity_House2_MapWarps: @ 8532A14
-	warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY
-	warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House2_MapEvents:: @ 8532A24
-	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
deleted file mode 100644
index 76673969a..000000000
--- a/data/maps/MossdeepCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_House2: @ 84838F4
-	.4byte House1_Layout
-	.4byte MossdeepCity_House2_MapEvents
-	.4byte MossdeepCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 59
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json
new file mode 100644
index 000000000..e63a1aee6
--- /dev/null
+++ b/data/maps/MossdeepCity_House2/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_HOUSE2",
+  "name": "MossdeepCity_House2",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House2_EventScript_2220DF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House2_EventScript_2220E8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House2_EventScript_2220F1",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc
deleted file mode 100644
index 374808598..000000000
--- a/data/maps/MossdeepCity_House3/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MossdeepCity_House3_EventObjects: @ 8532BD4
-	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0
-
-MossdeepCity_House3_MapWarps: @ 8532BEC
-	warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House3_MapEvents:: @ 8532BFC
-	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
deleted file mode 100644
index 0d5be2fed..000000000
--- a/data/maps/MossdeepCity_House3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_House3: @ 8483964
-	.4byte House2_Layout
-	.4byte MossdeepCity_House3_MapEvents
-	.4byte MossdeepCity_House3_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 60
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json
new file mode 100644
index 000000000..237a315ff
--- /dev/null
+++ b/data/maps/MossdeepCity_House3/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_HOUSE3",
+  "name": "MossdeepCity_House3",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House3_EventScript_2225C3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc
deleted file mode 100644
index 5e33f871f..000000000
--- a/data/maps/MossdeepCity_House4/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_House4_EventObjects: @ 8532CAC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0
-	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0
-	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0
-
-MossdeepCity_House4_MapWarps: @ 8532CF4
-	warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY
-	warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House4_MapEvents:: @ 8532D04
-	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
deleted file mode 100644
index ba9059757..000000000
--- a/data/maps/MossdeepCity_House4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_House4: @ 848399C
-	.4byte HouseWithBed_Layout
-	.4byte MossdeepCity_House4_MapEvents
-	.4byte MossdeepCity_House4_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 80
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json
new file mode 100644
index 000000000..2d1b33335
--- /dev/null
+++ b/data/maps/MossdeepCity_House4/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_HOUSE4",
+  "name": "MossdeepCity_House4",
+  "layout": "LAYOUT_HOUSE_WITH_BED",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House4_EventScript_222DD8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House4_EventScript_222DF7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SKITTY",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_House4_EventScript_222E1E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc
deleted file mode 100644
index d452187d1..000000000
--- a/data/maps/MossdeepCity_Mart/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_Mart_EventObjects: @ 8532B50
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0
-	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0
-
-MossdeepCity_Mart_MapWarps: @ 8532BB0
-	warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY
-
-MossdeepCity_Mart_MapEvents:: @ 8532BC0
-	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
deleted file mode 100644
index 7de6cb5de..000000000
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_Mart: @ 8483948
-	.4byte Mart_Layout
-	.4byte MossdeepCity_Mart_MapEvents
-	.4byte MossdeepCity_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json
new file mode 100644
index 000000000..bd14a30c1
--- /dev/null
+++ b/data/maps/MossdeepCity_Mart/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_MART",
+  "name": "MossdeepCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_Mart_EventScript_2223C8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_Mart_EventScript_2223F6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_Mart_EventScript_2223FF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_Mart_EventScript_222408",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index 5e48096c9..000000000
--- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0
-
-MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80
-	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:: @ 8532A98
-	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
deleted file mode 100644
index b97b7108d..000000000
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_PokemonCenter_1F: @ 8483910
-	.4byte PokemonCenter_1F_Layout
-	.4byte MossdeepCity_PokemonCenter_1F_MapEvents
-	.4byte MossdeepCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..fc78cc967
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F",
+  "name": "MossdeepCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index 28573a3c1..9dbead25e 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
-	map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_22224A
-	map_script 5, MossdeepCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A
+	map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index c2158f4f4..000000000
--- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0
-
-MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
-	warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C
-	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
deleted file mode 100644
index 263511ce9..000000000
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_PokemonCenter_2F: @ 848392C
-	.4byte PokemonCenter_2F_Layout
-	.4byte MossdeepCity_PokemonCenter_2F_MapEvents
-	.4byte MossdeepCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..88bf3caf2
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F",
+  "name": "MossdeepCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index e8fbb6e02..922c9a064 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
-	map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
deleted file mode 100644
index dbb5a47eb..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0
-	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
-	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
-	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
-	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
-	object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
-	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
-
-MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
-	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:: @ 8532E38
-	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
deleted file mode 100644
index 5e99c584a..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_SpaceCenter_1F: @ 84839B8
-	.4byte MossdeepCity_SpaceCenter_1F_Layout
-	.4byte MossdeepCity_SpaceCenter_1F_MapEvents
-	.4byte MossdeepCity_SpaceCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 275
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
new file mode 100644
index 000000000..0d02d368a
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
@@ -0,0 +1,186 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F",
+  "name": "MossdeepCity_SpaceCenter_1F",
+  "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 2,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index e875be96f..13bf111ba 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -1,10 +1,10 @@
 MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
-	map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2
-	map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C
 	.byte 0
 
 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58
 	end
 
@@ -18,11 +18,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
 	setobjectxyperm 1, 3, 4
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
-	compare VAR_0x409E, 1
+	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA
-	compare VAR_0x409E, 2
+	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2
-	compare VAR_0x409E, 3
+	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA
 	end
 
@@ -39,7 +39,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA
 	end
 
 MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE
 	end
 
@@ -50,9 +50,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
 MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
 	lock
 	faceplayer
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
-	dodailyevents
+	dotimebasedevents
 	specialvar VAR_RESULT, GetWeekCount
 	buffernumberstring 0, VAR_RESULT
 	compare VAR_RESULT, 0
@@ -60,7 +60,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
 	compare VAR_RESULT, 1
 	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -74,7 +74,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B
 	return
 
 MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
-	dodailyevents
+	dotimebasedevents
 	specialvar VAR_RESULT, GetWeekCount
 	buffernumberstring 0, VAR_RESULT
 	compare VAR_RESULT, 0
@@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
 	compare VAR_RESULT, 1
 	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
@@ -98,7 +98,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A
 MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
 	lock
 	faceplayer
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT
 	release
@@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
 
 MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
@@ -114,13 +114,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
 MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
 	lock
 	faceplayer
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA
 	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT
 	release
@@ -136,17 +136,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
@@ -155,9 +155,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154
 	goto MossdeepCity_SpaceCenter_1F_EventScript_22315E
 	end
@@ -176,9 +176,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F
 	goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4
 	end
@@ -186,7 +186,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
 MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F
 	msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F
 MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -203,7 +203,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9
 	lock
 	faceplayer
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -242,7 +242,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
 	case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289
 	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2
 	waitmovement 0
-	setvar VAR_0x409E, 2
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
 	release
 	end
 
@@ -254,14 +254,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E
 MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278
 	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A
 	waitmovement 0
-	setvar VAR_0x409E, 1
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1
 	release
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289
 	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E
 	waitmovement 0
-	setvar VAR_0x409E, 3
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3
 	release
 	end
 
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
deleted file mode 100644
index 6c271b5de..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C
-	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0
-	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
-	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
-	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
-	object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
-
-MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24
-	warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
-
-MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C
-	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
deleted file mode 100644
index 3f4eab34e..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_SpaceCenter_2F: @ 84839D4
-	.4byte MossdeepCity_SpaceCenter_2F_Layout
-	.4byte MossdeepCity_SpaceCenter_2F_MapEvents
-	.4byte MossdeepCity_SpaceCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 276
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
new file mode 100644
index 000000000..5c758bf3e
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
@@ -0,0 +1,146 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F",
+  "name": "MossdeepCity_SpaceCenter_2F",
+  "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 0,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 0602c9dad..41f8af97c 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -1,12 +1,12 @@
 MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
-	map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63
-	map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5
 	.byte 0
 
 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A
-	compare VAR_0x409F, 2
+	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
 	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F
 	end
 
@@ -27,14 +27,14 @@ MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F
 	return
 
 MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5
-	map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF
+	map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF
 	.2byte 0
 
 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF
 	playse SE_PIN
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO
 	compare VAR_RESULT, 1
@@ -57,19 +57,19 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
 	trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461
 	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499
 	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1
 	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89
 	waitmovement 0
-	setvar VAR_0x409F, 2
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
 	moveobjectoffscreen 5
 	moveobjectoffscreen 7
 	moveobjectoffscreen 6
@@ -98,9 +98,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4
 	goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE
 	end
@@ -119,9 +119,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF
 	goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9
 	end
@@ -140,9 +140,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34
-	compare VAR_0x405D, 2
+	compare VAR_MOSSDEEP_STATE, 2
 	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A
 	goto MossdeepCity_SpaceCenter_2F_EventScript_223F34
 	end
@@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59
 	lock
 	faceplayer
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -231,24 +231,24 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
 	step_end
 
 MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C
 	msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	releaseall
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	special SavePlayerParty
 	fadescreen 1
-	special sub_80F9438
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
 	goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032
@@ -277,20 +277,20 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4
-	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	applymovement 9, Common_Movement_WalkInPlaceLeft
+	applymovement 8, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 60
-	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6
-	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8
+	applymovement 9, Common_Movement_WalkInPlaceUp
+	applymovement 8, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 20
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x405D, 3
+	setvar VAR_MOSSDEEP_STATE, 3
 	fadedefaultbgm
 	fadescreen 1
-	setvar VAR_0x409F, 3
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
@@ -315,7 +315,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	removeobject 4
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
-	setvar VAR_0x40C6, 1
+	setvar VAR_STEVENS_HOUSE_STATE, 1
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	removeobject 3
 	setobjectxyperm 3, 5, 6
diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
deleted file mode 100644
index dd8b3d1b4..000000000
--- a/data/maps/MossdeepCity_StevensHouse/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-MossdeepCity_StevensHouse_EventObjects: @ 8532C10
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
-	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
-
-MossdeepCity_StevensHouse_MapWarps: @ 8532C58
-	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY
-
-MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68
-	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909
-	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909
-	bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909
-	bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909
-
-MossdeepCity_StevensHouse_MapEvents:: @ 8532C98
-	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
deleted file mode 100644
index 693801b86..000000000
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_StevensHouse: @ 8483980
-	.4byte MossdeepCity_StevensHouse_Layout
-	.4byte MossdeepCity_StevensHouse_MapEvents
-	.4byte MossdeepCity_StevensHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 327
-	.byte MAPSEC_MOSSDEEP_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json
new file mode 100644
index 000000000..76844e258
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE",
+  "name": "MossdeepCity_StevensHouse",
+  "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_StevensHouse_EventScript_222912",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_StevensHouse_EventScript_222841",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MossdeepCity_StevensHouse_EventScript_22291B",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_MOSSDEEP_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 51f1ac16e..15b94133d 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -1,7 +1,7 @@
 MossdeepCity_StevensHouse_MapScripts:: @ 8222784
-	map_script 1, MossdeepCity_StevensHouse_MapScript1_222794
-	map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8
-	map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0
 	.byte 0
 
 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
@@ -13,7 +13,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
 	return
 
 MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
-	compare VAR_0x40C6, 2
+	compare VAR_STEVENS_HOUSE_STATE, 2
 	call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4
 	end
 
@@ -23,17 +23,17 @@ MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
 	return
 
 MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
-	map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA
+	map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA
 	.2byte 0
 
 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	lockall
-	applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, MossdeepCity_StevensHouse_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 1, MossdeepCity_StevensHouse_Movement_222833
 	waitmovement 0
@@ -48,7 +48,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	waitmovement 0
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
-	setvar VAR_0x40C6, 2
+	setvar VAR_STEVENS_HOUSE_STATE, 2
 	releaseall
 	end
 
@@ -99,7 +99,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
 	call MossdeepCity_StevensHouse_EventScript_27378B
-	call MossdeepCity_StevensHouse_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto MossdeepCity_StevensHouse_EventScript_222901
 	end
 
diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc
deleted file mode 100644
index d11ba584e..000000000
--- a/data/maps/MtChimney/events.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-MtChimney_EventObjects: @ 85347C8
-	object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
-	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
-	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, FLAG_HIDE_MT_CHIMNEY_TRAINERS
-	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, FLAG_HIDE_MT_CHIMNEY_TRAINERS
-	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, FLAG_HIDE_MT_CHIMNEY_TRAINERS
-	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, FLAG_HIDE_MT_CHIMNEY_TRAINERS
-	object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS
-
-MtChimney_MapWarps: @ 8534A98
-	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: @ 8534AB8
-	bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4
-	bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141
-
-MtChimney_MapEvents:: @ 8534AD0
-	map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
-
diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc
deleted file mode 100644
index 9cd065903..000000000
--- a/data/maps/MtChimney/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtChimney: @ 8484010
-	.4byte MtChimney_Layout
-	.4byte MtChimney_MapEvents
-	.4byte MtChimney_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 136
-	.byte MAPSEC_MT_CHIMNEY
-	.byte 0
-	.byte WEATHER_ASH
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json
new file mode 100644
index 000000000..2b19e7f8d
--- /dev/null
+++ b/data/maps/MtChimney/map.json
@@ -0,0 +1,457 @@
+{
+  "id": "MAP_MT_CHIMNEY",
+  "name": "MtChimney",
+  "layout": "LAYOUT_MT_CHIMNEY",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_MT_CHIMNEY",
+  "requires_flash": false,
+  "weather": "WEATHER_ASH",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 24,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22EDD5",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22EE0B",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 12,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MtChimney_EventScript_22F06E",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 32,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0C0",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 28,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0B7",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 19,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F05C",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 29,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F053",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 31,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F065",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 19,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22EEF3",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 22,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0C9",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 23,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_RUN_IN_PLACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0DB",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 23,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0D2",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 23,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0A5",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 23,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0D2",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 22,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0D2",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 23,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0AE",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 21,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F09C",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 30,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0DB",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 29,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0D2",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 30,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0DB",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 31,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0D2",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtChimney_EventScript_22F085",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 20,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0DB",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 21,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_EventScript_22F0D2",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 16,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtChimney_EventScript_22F14A",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "MtChimney_EventScript_22F1AC",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 29,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtChimney_EventScript_22F1C3",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 27,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtChimney_EventScript_22F1DA",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F",
+      "x": 13,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtChimney_EventScript_22F1F1",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "MtChimney_EventScript_22F208",
+      "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 36,
+      "elevation": 0,
+      "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 36,
+      "elevation": 0,
+      "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_JAGGED_PASS",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 21,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_JAGGED_PASS",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MtChimney_EventScript_22F0E4"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 37,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "MtChimney_EventScript_22F141"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 3bfc33f6a..db1fd59ef 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -1,10 +1,10 @@
 MtChimney_MapScripts:: @ 822EDC1
-	map_script 5, MtChimney_MapScript1_22EDD2
-	map_script 3, MtChimney_MapScript1_22EDCC
+	map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2
+	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC
 	.byte 0
 
 MtChimney_MapScript1_22EDCC: @ 822EDCC
-	setvar VAR_0x40BD, 1
+	setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
 	end
 
 MtChimney_MapScript1_22EDD2: @ 822EDD2
@@ -17,7 +17,7 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5
 	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9
 	call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02
 	closemessage
-	applymovement 1, MtChimney_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_EVIL_LEADER_PLEASE_STOP
 	release
@@ -35,12 +35,12 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	lockall
 	playbgm MUS_MGM0, 0
 	msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT
-	applymovement 2, MtChimney_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 2, MtChimney_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, MtChimney_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF
@@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	call_if_eq MtChimney_EventScript_22EEC7
 	compare VAR_FACING, 2
 	call_if_eq MtChimney_EventScript_22EED2
-	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT
 	closemessage
@@ -121,7 +121,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
 	end
 
 MtChimney_EventScript_22EF51:: @ 822EF51
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox
 	nop
 	nop
diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc
deleted file mode 100644
index 491ca7997..000000000
--- a/data/maps/MtChimney_CableCarStation/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MtChimney_CableCarStation_EventObjects: @ 8533CA8
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0
-	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
-
-MtChimney_CableCarStation_MapWarps: @ 8533CD8
-	warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY
-	warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY
-
-MtChimney_CableCarStation_MapEvents:: @ 8533CE8
-	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
deleted file mode 100644
index 0f858f9c1..000000000
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtChimney_CableCarStation: @ 8483DFC
-	.4byte CableCarStation_Layout
-	.4byte MtChimney_CableCarStation_MapEvents
-	.4byte MtChimney_CableCarStation_MapScripts
-	.4byte 0x0
-	.2byte MUS_DOORO_X1
-	.2byte 118
-	.byte MAPSEC_MT_CHIMNEY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json
new file mode 100644
index 000000000..1b0efd3d9
--- /dev/null
+++ b/data/maps/MtChimney_CableCarStation/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION",
+  "name": "MtChimney_CableCarStation",
+  "layout": "LAYOUT_CABLE_CAR_STATION",
+  "music": "MUS_DOORO_X1",
+  "region_map_section": "MAPSEC_MT_CHIMNEY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtChimney_CableCarStation_EventScript_22AC4B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_MT_CHIMNEY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_MT_CHIMNEY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index 6c389e2ad..057001111 100644
--- a/data/maps/MtChimney_CableCarStation/scripts.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -1,10 +1,10 @@
 MtChimney_CableCarStation_MapScripts:: @ 822ABFA
-	map_script 3, MtChimney_CableCarStation_MapScript1_22AC05
-	map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D
+	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D
 	.byte 0
 
 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
-	compare VAR_0x40A3, 1
+	compare VAR_CABLE_CAR_STATION_STATE, 1
 	call_if_eq MtChimney_CableCarStation_EventScript_22AC11
 	end
 
@@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
 	return
 
 MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
-	map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27
 	.2byte 0
 
 MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
@@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
 	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4
 	applymovement 1, MtChimney_CableCarStation_Movement_22ACAA
 	waitmovement 0
-	setvar VAR_0x40A3, 0
+	setvar VAR_CABLE_CAR_STATION_STATE, 0
 	setobjectxyperm 1, 6, 7
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	releaseall
@@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
 	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF
 	waitmovement 0
 	setvar VAR_0x8004, 1
-	setvar VAR_0x40A3, 2
+	setvar VAR_CABLE_CAR_STATION_STATE, 2
 	incrementgamestat 48
 	special CableCarWarp
 	special CableCar
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc
deleted file mode 100644
index 5fd821541..000000000
--- a/data/maps/MtPyre_1F/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-MtPyre_1F_EventObjects: @ 8534D64
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0
-
-MtPyre_1F_MapWarps: @ 8534DAC
-	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:: @ 8534DDC
-	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
deleted file mode 100644
index f60532fa2..000000000
--- a/data/maps/MtPyre_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_1F: @ 8484064
-	.4byte MtPyre_1F_Layout
-	.4byte MtPyre_1F_MapEvents
-	.4byte MtPyre_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 137
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json
new file mode 100644
index 000000000..8b2e146f5
--- /dev/null
+++ b/data/maps/MtPyre_1F/map.json
@@ -0,0 +1,103 @@
+{
+  "id": "MAP_MT_PYRE_1F",
+  "name": "MtPyre_1F",
+  "layout": "LAYOUT_MT_PYRE_1F",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 21,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_1F_EventScript_230F3F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 17,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_1F_EventScript_230F78",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_1F_EventScript_230F81",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE122",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_EXTERIOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE122",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_EXTERIOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 20,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_2F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc
index 676df4aee..a06f34a29 100644
--- a/data/maps/MtPyre_1F/scripts.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
@@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F
 	msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT
 	giveitem_std ITEM_CLEANSE_TAG
 	compare VAR_RESULT, 0
-	goto_if_eq MtPyre_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
deleted file mode 100644
index f9fad9f46..000000000
--- a/data/maps/MtPyre_2F/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-MtPyre_2F_EventObjects: @ 8534DF0
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL
-	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0
-	object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0
-	object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0
-	object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0
-
-MtPyre_2F_MapWarps: @ 8534EB0
-	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:: @ 8534ED8
-	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
deleted file mode 100644
index 1abca7143..000000000
--- a/data/maps/MtPyre_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_2F: @ 8484080
-	.4byte MtPyre_2F_Layout
-	.4byte MtPyre_2F_MapEvents
-	.4byte MtPyre_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 138
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json
new file mode 100644
index 000000000..7a5c4d639
--- /dev/null
+++ b/data/maps/MtPyre_2F/map.json
@@ -0,0 +1,161 @@
+{
+  "id": "MAP_MT_PYRE_2F",
+  "name": "MtPyre_2F",
+  "layout": "LAYOUT_MT_PYRE_2F",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MtPyre_2F_EventScript_231128",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_2F_EventScript_2912FD",
+      "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_2F_EventScript_231116",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_2F_EventScript_23111F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 2,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MtPyre_2F_EventScript_23115A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "MtPyre_2F_EventScript_23113F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MtPyre_2F_EventScript_23118C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MtPyre_2F_EventScript_231175",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_3F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_3F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_3F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_1F",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
index cdf2cb98b..150c08df4 100644
--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -1,7 +1,7 @@
 MtPyre_2F_MapScripts:: @ 82310FB
-	map_script 2, MtPyre_2F_MapScript2_2A8327
-	map_script 3, MtPyre_2F_MapScript1_2A8331
-	map_script 5, MtPyre_2F_MapScript1_23110B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_2A8327
+	map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_2A8331
+	map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_23110B
 	.byte 0
 
 MtPyre_2F_MapScript1_23110B: @ 823110B
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc
deleted file mode 100644
index f78373aca..000000000
--- a/data/maps/MtPyre_3F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MtPyre_3F_EventObjects: @ 8534EEC
-	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0
-	object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0
-
-MtPyre_3F_MapWarps: @ 8534F4C
-	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:: @ 8534F7C
-	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
deleted file mode 100644
index 3f54a3670..000000000
--- a/data/maps/MtPyre_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_3F: @ 848409C
-	.4byte MtPyre_3F_Layout
-	.4byte MtPyre_3F_MapEvents
-	.4byte MtPyre_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 139
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json
new file mode 100644
index 000000000..b8684cff9
--- /dev/null
+++ b/data/maps/MtPyre_3F/map.json
@@ -0,0 +1,116 @@
+{
+  "id": "MAP_MT_PYRE_3F",
+  "name": "MtPyre_3F",
+  "layout": "LAYOUT_MT_PYRE_3F",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "MtPyre_3F_EventScript_231753",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "MtPyre_3F_EventScript_23176A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_3F_EventScript_29130A",
+      "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "MtPyre_3F_EventScript_231781",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 1,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 10,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_2F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc
deleted file mode 100644
index ffe568880..000000000
--- a/data/maps/MtPyre_4F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_4F_EventObjects: @ 8534F90
-	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE
-
-MtPyre_4F_MapWarps: @ 8534FC0
-	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:: @ 8534FF0
-	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
deleted file mode 100644
index 1c41c3a6d..000000000
--- a/data/maps/MtPyre_4F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_4F: @ 84840B8
-	.4byte MtPyre_4F_Layout
-	.4byte MtPyre_4F_MapEvents
-	.4byte MtPyre_4F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 140
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json
new file mode 100644
index 000000000..59d4dd110
--- /dev/null
+++ b/data/maps/MtPyre_4F/map.json
@@ -0,0 +1,90 @@
+{
+  "id": "MAP_MT_PYRE_4F",
+  "name": "MtPyre_4F",
+  "layout": "LAYOUT_MT_PYRE_4F",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MtPyre_4F_EventScript_231C6E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_4F_EventScript_291317",
+      "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_5F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_5F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_5F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 2,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_3F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc
deleted file mode 100644
index afd3801e3..000000000
--- a/data/maps/MtPyre_5F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MtPyre_5F_EventObjects: @ 8535004
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE
-
-MtPyre_5F_MapWarps: @ 8535034
-	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:: @ 853505C
-	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
deleted file mode 100644
index 17c8eddcd..000000000
--- a/data/maps/MtPyre_5F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_5F: @ 84840D4
-	.4byte MtPyre_5F_Layout
-	.4byte MtPyre_5F_MapEvents
-	.4byte MtPyre_5F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 141
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json
new file mode 100644
index 000000000..1c035bd4d
--- /dev/null
+++ b/data/maps/MtPyre_5F/map.json
@@ -0,0 +1,83 @@
+{
+  "id": "MAP_MT_PYRE_5F",
+  "name": "MtPyre_5F",
+  "layout": "LAYOUT_MT_PYRE_5F",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "MtPyre_5F_EventScript_231BC9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_5F_EventScript_291324",
+      "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_6F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_6F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc
deleted file mode 100644
index 3ab5dcf70..000000000
--- a/data/maps/MtPyre_6F/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MtPyre_6F_EventObjects: @ 8535070
-	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30
-	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0
-
-MtPyre_6F_MapWarps: @ 85350B8
-	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
-	warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
-
-MtPyre_6F_MapEvents:: @ 85350C8
-	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
deleted file mode 100644
index 4e8082820..000000000
--- a/data/maps/MtPyre_6F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_6F: @ 84840F0
-	.4byte MtPyre_6F_Layout
-	.4byte MtPyre_6F_MapEvents
-	.4byte MtPyre_6F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 142
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json
new file mode 100644
index 000000000..8f7c4f30f
--- /dev/null
+++ b/data/maps/MtPyre_6F/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_MT_PYRE_6F",
+  "name": "MtPyre_6F",
+  "layout": "LAYOUT_MT_PYRE_6F",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtPyre_6F_EventScript_231D3B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_6F_EventScript_291331",
+      "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtPyre_6F_EventScript_231D9D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_5F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc
deleted file mode 100644
index 75c9489e4..000000000
--- a/data/maps/MtPyre_Exterior/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-MtPyre_Exterior_EventObjects: @ 85350DC
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48
-
-MtPyre_Exterior_MapWarps: @ 853510C
-	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: @ 8535124
-	coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED
-	coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED
-	coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2
-	coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2
-	coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED
-
-MtPyre_Exterior_MapBGEvents: @ 8535174
-	bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL
-	bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER
-
-MtPyre_Exterior_MapEvents:: @ 853518C
-	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
deleted file mode 100644
index 3b703a41e..000000000
--- a/data/maps/MtPyre_Exterior/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_Exterior: @ 848410C
-	.4byte MtPyre_Exterior_Layout
-	.4byte MtPyre_Exterior_MapEvents
-	.4byte MtPyre_Exterior_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHUPI
-	.2byte 302
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json
new file mode 100644
index 000000000..2a8a5eaff
--- /dev/null
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -0,0 +1,132 @@
+{
+  "id": "MAP_MT_PYRE_EXTERIOR",
+  "name": "MtPyre_Exterior",
+  "layout": "LAYOUT_MT_PYRE_EXTERIOR",
+  "music": "MUS_MACHUPI",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 27,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_Exterior_EventScript_29133E",
+      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 19,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_Exterior_EventScript_29134B",
+      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 42,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 19,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_SUMMIT",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_SUMMIT",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 21,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "MtPyre_Exterior_EventScript_231FED"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 21,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "MtPyre_Exterior_EventScript_231FED"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 27,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "MtPyre_Exterior_EventScript_231FF2"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 28,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "MtPyre_Exterior_EventScript_231FF2"
+    },
+    {
+      "type": "trigger",
+      "x": 26,
+      "y": 21,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "MtPyre_Exterior_EventScript_231FED"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_ULTRA_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 22,
+      "elevation": 0,
+      "item": "ITEM_MAX_ETHER",
+      "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc
index fe51946dc..e24f8ea68 100644
--- a/data/maps/MtPyre_Exterior/scripts.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
@@ -1,5 +1,5 @@
 MtPyre_Exterior_MapScripts:: @ 8231FCC
-	map_script 3, MtPyre_Exterior_MapScript1_231FD2
+	map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2
 	.byte 0
 
 MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2
diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc
deleted file mode 100644
index b112fbcfe..000000000
--- a/data/maps/MtPyre_Summit/events.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-MtPyre_Summit_EventObjects: @ 85351A0
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
-	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
-	object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
-
-MtPyre_Summit_MapWarps: @ 8535260
-	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: @ 8535278
-	coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018
-	coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024
-	coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030
-	coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC
-	coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8
-	coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204
-
-MtPyre_Summit_MapBGEvents: @ 85352D8
-	bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC
-	bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY
-
-MtPyre_Summit_MapEvents:: @ 85352F0
-	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
deleted file mode 100644
index 29a28e99b..000000000
--- a/data/maps/MtPyre_Summit/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_Summit: @ 8484128
-	.4byte MtPyre_Summit_Layout
-	.4byte MtPyre_Summit_MapEvents
-	.4byte MtPyre_Summit_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHUPI
-	.2byte 303
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json
new file mode 100644
index 000000000..78780ba19
--- /dev/null
+++ b/data/maps/MtPyre_Summit/map.json
@@ -0,0 +1,219 @@
+{
+  "id": "MAP_MT_PYRE_SUMMIT",
+  "name": "MtPyre_Summit",
+  "layout": "LAYOUT_MT_PYRE_SUMMIT",
+  "music": "MUS_MACHUPI",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 22,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_Summit_EventScript_23213C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 23,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 23,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "MtPyre_Summit_EventScript_2321A2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 21,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtPyre_Summit_EventScript_2323FD",
+      "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 25,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtPyre_Summit_EventScript_232414",
+      "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 21,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtPyre_Summit_EventScript_23242B",
+      "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 25,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "MtPyre_Summit_EventScript_232442",
+      "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 23,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 31,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_EXTERIOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 23,
+      "y": 31,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_EXTERIOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 24,
+      "y": 31,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_EXTERIOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_MT_PYRE_STATE",
+      "var_value": "0",
+      "script": "MtPyre_Summit_EventScript_232018"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_MT_PYRE_STATE",
+      "var_value": "0",
+      "script": "MtPyre_Summit_EventScript_232024"
+    },
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_MT_PYRE_STATE",
+      "var_value": "0",
+      "script": "MtPyre_Summit_EventScript_232030"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_MT_PYRE_STATE",
+      "var_value": "2",
+      "script": "MtPyre_Summit_EventScript_2321EC"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_MT_PYRE_STATE",
+      "var_value": "2",
+      "script": "MtPyre_Summit_EventScript_2321F8"
+    },
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_MT_PYRE_STATE",
+      "var_value": "2",
+      "script": "MtPyre_Summit_EventScript_232204"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 25,
+      "elevation": 0,
+      "item": "ITEM_ZINC",
+      "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC"
+    },
+    {
+      "type": "hidden_item",
+      "x": 37,
+      "y": 7,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 6eaf6265f..a0da7e907 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -1,9 +1,9 @@
 MtPyre_Summit_MapScripts:: @ 8231FF7
-	map_script 3, MtPyre_Summit_MapScript1_231FFD
+	map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD
 	.byte 0
 
 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
-	compare VAR_0x40B9, 2
+	compare VAR_MT_PYRE_STATE, 2
 	call_if_eq MtPyre_Summit_EventScript_232009
 	end
 
@@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030
 
 MtPyre_Summit_EventScript_23203C:: @ 823203C
 	playbgm MUS_AQA_0, 0
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725AA
+	applymovement 2, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 50
 	compare VAR_0x8008, 0
@@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	fadedefaultbgm
 	fadescreen 0
 	delay 20
-	setvar VAR_0x40B9, 1
+	setvar VAR_MT_PYRE_STATE, 1
 	compare VAR_0x8008, 0
 	call_if_eq MtPyre_Summit_EventScript_2320F7
 	compare VAR_0x8008, 1
@@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC
 MtPyre_Summit_EventScript_2320F7:: @ 82320F7
 	applymovement 3, MtPyre_Summit_Movement_23212C
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C
 MtPyre_Summit_EventScript_232117:: @ 8232117
 	applymovement 3, MtPyre_Summit_Movement_232132
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2
 	lock
 	faceplayer
 	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2
-	compare VAR_0x40B9, 3
+	compare VAR_MT_PYRE_STATE, 3
 	call_if_ge MtPyre_Summit_EventScript_2321CB
 	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8
 	msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
@@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204
 	end
 
 MtPyre_Summit_EventScript_232210:: @ 8232210
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 60
 	compare VAR_0x8008, 0
@@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
 	compare VAR_0x8008, 2
 	call_if_eq MtPyre_Summit_EventScript_2322F6
 	playse SE_PIN
-	applymovement 8, MtPyre_Summit_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, MtPyre_Summit_Movement_27259A
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
 	delay 30
 	compare VAR_0x8008, 0
@@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
 	waitmovement 0
 	removeobject 2
 	removeobject 8
-	setvar VAR_0x40B9, 3
+	setvar VAR_MT_PYRE_STATE, 3
 	releaseall
 	end
 
@@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A
 	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
 	applymovement 8, MtPyre_Summit_Movement_2323ED
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376
 	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
 	applymovement 8, MtPyre_Summit_Movement_2323F3
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392
 	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
 	applymovement 8, MtPyre_Summit_Movement_2323F8
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc
deleted file mode 100644
index e83d221dd..000000000
--- a/data/maps/NavelRock_B1F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_B1F_MapWarps: @ 853DA94
-	warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE
-	warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK
-
-NavelRock_B1F_MapEvents:: @ 853DAA4
-	map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc
deleted file mode 100644
index cf56d8fb4..000000000
--- a/data/maps/NavelRock_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_B1F: @ 84858C8
-	.4byte NavelRock_B1F_Layout
-	.4byte NavelRock_B1F_MapEvents
-	.4byte NavelRock_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 427
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json
new file mode 100644
index 000000000..6b5cd0089
--- /dev/null
+++ b/data/maps/NavelRock_B1F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_B1F",
+  "name": "NavelRock_B1F",
+  "layout": "LAYOUT_NAVEL_ROCK_B1F",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_FORK",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc
deleted file mode 100644
index d18565161..000000000
--- a/data/maps/NavelRock_Bottom/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-NavelRock_Bottom_EventObjects: @ 853DD50
-	object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA
-
-NavelRock_Bottom_MapWarps: @ 853DD68
-	warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11
-
-NavelRock_Bottom_MapEvents:: @ 853DD70
-	map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc
deleted file mode 100644
index d6f9b9d5a..000000000
--- a/data/maps/NavelRock_Bottom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Bottom: @ 8485AC0
-	.4byte NavelRock_Bottom_Layout
-	.4byte NavelRock_Bottom_MapEvents
-	.4byte NavelRock_Bottom_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 424
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json
new file mode 100644
index 000000000..ee324635b
--- /dev/null
+++ b/data/maps/NavelRock_Bottom/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_NAVEL_ROCK_BOTTOM",
+  "name": "NavelRock_Bottom",
+  "layout": "LAYOUT_NAVEL_ROCK_BOTTOM",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LUGIA",
+      "x": 11,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NavelRock_Bottom_EventScript_2692A2",
+      "flag": "FLAG_HIDE_LUGIA"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN11",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc
index cd26de91d..8a617236c 100644
--- a/data/maps/NavelRock_Bottom/scripts.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
@@ -1,6 +1,6 @@
 NavelRock_Bottom_MapScripts:: @ 8269255
-	map_script 3, NavelRock_Bottom_MapScript1_269260
-	map_script 5, NavelRock_Bottom_MapScript1_269284
+	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260
+	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284
 	.byte 0
 
 NavelRock_Bottom_MapScript1_269260: @ 8269260
@@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273
 	return
 
 NavelRock_Bottom_EventScript_269277:: @ 8269277
-	goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_LUGIA
 	return
 
@@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
 NavelRock_Bottom_EventScript_26928E:: @ 826928E
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne NavelRock_Bottom_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 
diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc
deleted file mode 100644
index 3a6045215..000000000
--- a/data/maps/NavelRock_Down01/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down01_MapWarps: @ 853DBC4
-	warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02
-
-NavelRock_Down01_MapEvents:: @ 853DBD4
-	map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc
deleted file mode 100644
index 2dc18c232..000000000
--- a/data/maps/NavelRock_Down01/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down01: @ 848598C
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Down01_MapEvents
-	.4byte NavelRock_Down01_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json
new file mode 100644
index 000000000..50f60b52e
--- /dev/null
+++ b/data/maps/NavelRock_Down01/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN01",
+  "name": "NavelRock_Down01",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_FORK",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN02",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc
deleted file mode 100644
index 7441539c9..000000000
--- a/data/maps/NavelRock_Down02/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down02_MapWarps: @ 853DBE8
-	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01
-	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03
-
-NavelRock_Down02_MapEvents:: @ 853DBF8
-	map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc
deleted file mode 100644
index 731e4e2fb..000000000
--- a/data/maps/NavelRock_Down02/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down02: @ 84859A8
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_Down02_MapEvents
-	.4byte NavelRock_Down02_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 426
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json
new file mode 100644
index 000000000..fb2d15145
--- /dev/null
+++ b/data/maps/NavelRock_Down02/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN02",
+  "name": "NavelRock_Down02",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN01",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN03",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc
deleted file mode 100644
index 20dabdfaf..000000000
--- a/data/maps/NavelRock_Down03/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down03_MapWarps: @ 853DC0C
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04
-
-NavelRock_Down03_MapEvents:: @ 853DC1C
-	map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc
deleted file mode 100644
index fdf22dbc3..000000000
--- a/data/maps/NavelRock_Down03/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down03: @ 84859C4
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Down03_MapEvents
-	.4byte NavelRock_Down03_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json
new file mode 100644
index 000000000..a82e03610
--- /dev/null
+++ b/data/maps/NavelRock_Down03/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN03",
+  "name": "NavelRock_Down03",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN02",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN04",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc
deleted file mode 100644
index e50f6fe23..000000000
--- a/data/maps/NavelRock_Down04/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down04_MapWarps: @ 853DC30
-	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03
-	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05
-
-NavelRock_Down04_MapEvents:: @ 853DC40
-	map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc
deleted file mode 100644
index 7f93253b1..000000000
--- a/data/maps/NavelRock_Down04/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down04: @ 84859E0
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_Down04_MapEvents
-	.4byte NavelRock_Down04_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 426
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json
new file mode 100644
index 000000000..58e81b709
--- /dev/null
+++ b/data/maps/NavelRock_Down04/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN04",
+  "name": "NavelRock_Down04",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN03",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN05",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc
deleted file mode 100644
index 500d38e9b..000000000
--- a/data/maps/NavelRock_Down05/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down05_MapWarps: @ 853DC54
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06
-
-NavelRock_Down05_MapEvents:: @ 853DC64
-	map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc
deleted file mode 100644
index 602f440e0..000000000
--- a/data/maps/NavelRock_Down05/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down05: @ 84859FC
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Down05_MapEvents
-	.4byte NavelRock_Down05_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json
new file mode 100644
index 000000000..a1fcef804
--- /dev/null
+++ b/data/maps/NavelRock_Down05/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN05",
+  "name": "NavelRock_Down05",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN04",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN06",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc
deleted file mode 100644
index 077367747..000000000
--- a/data/maps/NavelRock_Down06/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down06_MapWarps: @ 853DC78
-	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05
-	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07
-
-NavelRock_Down06_MapEvents:: @ 853DC88
-	map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc
deleted file mode 100644
index c3ec1fe55..000000000
--- a/data/maps/NavelRock_Down06/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down06: @ 8485A18
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_Down06_MapEvents
-	.4byte NavelRock_Down06_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 426
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json
new file mode 100644
index 000000000..204a2a2cf
--- /dev/null
+++ b/data/maps/NavelRock_Down06/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN06",
+  "name": "NavelRock_Down06",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN05",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN07",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc
deleted file mode 100644
index 83f7ce9a6..000000000
--- a/data/maps/NavelRock_Down07/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down07_MapWarps: @ 853DC9C
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08
-
-NavelRock_Down07_MapEvents:: @ 853DCAC
-	map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc
deleted file mode 100644
index f3a5ab3f3..000000000
--- a/data/maps/NavelRock_Down07/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down07: @ 8485A34
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Down07_MapEvents
-	.4byte NavelRock_Down07_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json
new file mode 100644
index 000000000..f48063d8a
--- /dev/null
+++ b/data/maps/NavelRock_Down07/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN07",
+  "name": "NavelRock_Down07",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN06",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN08",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc
deleted file mode 100644
index 38bef10e8..000000000
--- a/data/maps/NavelRock_Down08/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down08_MapWarps: @ 853DCC0
-	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07
-	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09
-
-NavelRock_Down08_MapEvents:: @ 853DCD0
-	map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc
deleted file mode 100644
index 3a6f28081..000000000
--- a/data/maps/NavelRock_Down08/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down08: @ 8485A50
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_Down08_MapEvents
-	.4byte NavelRock_Down08_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 426
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json
new file mode 100644
index 000000000..d5f7ea8fe
--- /dev/null
+++ b/data/maps/NavelRock_Down08/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN08",
+  "name": "NavelRock_Down08",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN07",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN09",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc
deleted file mode 100644
index e3843e759..000000000
--- a/data/maps/NavelRock_Down09/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down09_MapWarps: @ 853DCE4
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10
-
-NavelRock_Down09_MapEvents:: @ 853DCF4
-	map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc
deleted file mode 100644
index f132b9f66..000000000
--- a/data/maps/NavelRock_Down09/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down09: @ 8485A6C
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Down09_MapEvents
-	.4byte NavelRock_Down09_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json
new file mode 100644
index 000000000..348739b31
--- /dev/null
+++ b/data/maps/NavelRock_Down09/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN09",
+  "name": "NavelRock_Down09",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN08",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN10",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc
deleted file mode 100644
index 805e399b4..000000000
--- a/data/maps/NavelRock_Down10/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down10_MapWarps: @ 853DD08
-	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11
-
-NavelRock_Down10_MapEvents:: @ 853DD18
-	map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc
deleted file mode 100644
index 3ee4d62ce..000000000
--- a/data/maps/NavelRock_Down10/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down10: @ 8485A88
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_Down10_MapEvents
-	.4byte NavelRock_Down10_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 426
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json
new file mode 100644
index 000000000..3aa128fa0
--- /dev/null
+++ b/data/maps/NavelRock_Down10/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN10",
+  "name": "NavelRock_Down10",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN09",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN11",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc
deleted file mode 100644
index 505a6ed6d..000000000
--- a/data/maps/NavelRock_Down11/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down11_MapWarps: @ 853DD2C
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10
-
-NavelRock_Down11_MapEvents:: @ 853DD3C
-	map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc
deleted file mode 100644
index ef2ad00b7..000000000
--- a/data/maps/NavelRock_Down11/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Down11: @ 8485AA4
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Down11_MapEvents
-	.4byte NavelRock_Down11_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json
new file mode 100644
index 000000000..0ed44f0fc
--- /dev/null
+++ b/data/maps/NavelRock_Down11/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_DOWN11",
+  "name": "NavelRock_Down11",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_BOTTOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN10",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc
deleted file mode 100644
index ee45485a7..000000000
--- a/data/maps/NavelRock_Entrance/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Entrance_MapWarps: @ 853DA70
-	warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F
-	warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR
-
-NavelRock_Entrance_MapEvents:: @ 853DA80
-	map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc
deleted file mode 100644
index dbc28a781..000000000
--- a/data/maps/NavelRock_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Entrance: @ 84858AC
-	.4byte NavelRock_Entrance_Layout
-	.4byte NavelRock_Entrance_MapEvents
-	.4byte NavelRock_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 422
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json
new file mode 100644
index 000000000..983df45df
--- /dev/null
+++ b/data/maps/NavelRock_Entrance/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_ENTRANCE",
+  "name": "NavelRock_Entrance",
+  "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_EXTERIOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc
deleted file mode 100644
index 66bbf376f..000000000
--- a/data/maps/NavelRock_Exterior/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Exterior_MapWarps: @ 853DA00
-	warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR
-	warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE
-
-NavelRock_Exterior_MapEvents:: @ 853DA10
-	map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc
deleted file mode 100644
index e13422c26..000000000
--- a/data/maps/NavelRock_Exterior/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Exterior: @ 8485874
-	.4byte NavelRock_Exterior_Layout
-	.4byte NavelRock_Exterior_MapEvents
-	.4byte NavelRock_Exterior_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANASHIMA
-	.2byte 421
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json
new file mode 100644
index 000000000..b98f08d4e
--- /dev/null
+++ b/data/maps/NavelRock_Exterior/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_EXTERIOR",
+  "name": "NavelRock_Exterior",
+  "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR",
+  "music": "MUS_RG_NANASHIMA",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_NAVEL_ROCK_HARBOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_NAVEL_ROCK_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc
index 21034a4e0..33bbb6391 100644
--- a/data/maps/NavelRock_Exterior/scripts.inc
+++ b/data/maps/NavelRock_Exterior/scripts.inc
@@ -1,5 +1,5 @@
 NavelRock_Exterior_MapScripts:: @ 82690B2
-	map_script 3, NavelRock_Exterior_MapScript1_2690B8
+	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8
 	.byte 0
 
 NavelRock_Exterior_MapScript1_2690B8: @ 82690B8
diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc
deleted file mode 100644
index 869dc0f08..000000000
--- a/data/maps/NavelRock_Fork/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-NavelRock_Fork_MapWarps: @ 853DAB8
-	warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1
-	warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F
-	warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01
-
-NavelRock_Fork_MapEvents:: @ 853DAD0
-	map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc
deleted file mode 100644
index 49087db7e..000000000
--- a/data/maps/NavelRock_Fork/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Fork: @ 84858E4
-	.4byte NavelRock_Fork_Layout
-	.4byte NavelRock_Fork_MapEvents
-	.4byte NavelRock_Fork_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 428
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json
new file mode 100644
index 000000000..728b8a7aa
--- /dev/null
+++ b/data/maps/NavelRock_Fork/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_NAVEL_ROCK_FORK",
+  "name": "NavelRock_Fork",
+  "layout": "LAYOUT_NAVEL_ROCK_FORK",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 79,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 22,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_DOWN01",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc
deleted file mode 100644
index b5a299572..000000000
--- a/data/maps/NavelRock_Harbor/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-NavelRock_Harbor_EventObjects: @ 853DA24
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-
-NavelRock_Harbor_MapWarps: @ 853DA54
-	warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR
-
-NavelRock_Harbor_MapEvents:: @ 853DA5C
-	map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc
deleted file mode 100644
index 1df05a2bc..000000000
--- a/data/maps/NavelRock_Harbor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Harbor: @ 8485890
-	.4byte IslandHarbor_Layout
-	.4byte NavelRock_Harbor_MapEvents
-	.4byte NavelRock_Harbor_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANASHIMA
-	.2byte 405
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
new file mode 100644
index 000000000..7ea3ef0e7
--- /dev/null
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_NAVEL_ROCK_HARBOR",
+  "name": "NavelRock_Harbor",
+  "layout": "LAYOUT_ISLAND_HARBOR",
+  "music": "MUS_RG_NANASHIMA",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NavelRock_Harbor_EventScript_2690BD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
+      "x": 8,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_NAVEL_ROCK_EXTERIOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc
index 4df8343fb..332e6dbea 100644
--- a/data/maps/NavelRock_Harbor/scripts.inc
+++ b/data/maps/NavelRock_Harbor/scripts.inc
@@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
 	goto_if_eq NavelRock_Harbor_EventScript_269102
 	msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_NAVEL_ROCK_HARBOR
diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc
deleted file mode 100644
index 0952b0f67..000000000
--- a/data/maps/NavelRock_Top/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Top_EventObjects: @ 853DB74
-	object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH
-
-NavelRock_Top_MapWarps: @ 853DB8C
-	warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4
-
-NavelRock_Top_MapCoordEvents: @ 853DB94
-	coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F
-
-NavelRock_Top_MapBGEvents: @ 853DBA4
-	bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH
-
-NavelRock_Top_MapEvents:: @ 853DBB0
-	map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents
-
diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc
deleted file mode 100644
index e99a64054..000000000
--- a/data/maps/NavelRock_Top/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Top: @ 8485970
-	.4byte NavelRock_Top_Layout
-	.4byte NavelRock_Top_MapEvents
-	.4byte NavelRock_Top_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 423
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json
new file mode 100644
index 000000000..4b025ccae
--- /dev/null
+++ b/data/maps/NavelRock_Top/map.json
@@ -0,0 +1,61 @@
+{
+  "id": "MAP_NAVEL_ROCK_TOP",
+  "name": "NavelRock_Top",
+  "layout": "LAYOUT_NAVEL_ROCK_TOP",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HOOH",
+      "x": 12,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_HO_OH"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP4",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "NavelRock_Top_EventScript_26916F"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "item": "ITEM_SACRED_ASH",
+      "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc
index 423d998a7..af011e058 100644
--- a/data/maps/NavelRock_Top/scripts.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
@@ -1,6 +1,6 @@
 NavelRock_Top_MapScripts:: @ 8269113
-	map_script 3, NavelRock_Top_MapScript1_26911E
-	map_script 5, NavelRock_Top_MapScript1_269151
+	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E
+	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151
 	.byte 0
 
 NavelRock_Top_MapScript1_26911E: @ 826911E
@@ -15,7 +15,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131
 
 NavelRock_Top_EventScript_26913A:: @ 826913A
 	setvar VAR_TEMP_1, 1
-	goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn
 	setvar VAR_TEMP_1, 0
 	clearflag FLAG_HIDE_HO_OH
 	return
@@ -27,7 +27,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151
 NavelRock_Top_EventScript_26915B:: @ 826915B
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne NavelRock_Top_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 
diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc
deleted file mode 100644
index fd0741a6a..000000000
--- a/data/maps/NavelRock_Up1/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up1_MapWarps: @ 853DAE4
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK
-	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2
-
-NavelRock_Up1_MapEvents:: @ 853DAF4
-	map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc
deleted file mode 100644
index 33266d8f0..000000000
--- a/data/maps/NavelRock_Up1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Up1: @ 8485900
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Up1_MapEvents
-	.4byte NavelRock_Up1_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json
new file mode 100644
index 000000000..24d1b5a32
--- /dev/null
+++ b/data/maps/NavelRock_Up1/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_UP1",
+  "name": "NavelRock_Up1",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_FORK",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc
deleted file mode 100644
index bd142b997..000000000
--- a/data/maps/NavelRock_Up2/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up2_MapWarps: @ 853DB08
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3
-
-NavelRock_Up2_MapEvents:: @ 853DB18
-	map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc
deleted file mode 100644
index f93dc31ed..000000000
--- a/data/maps/NavelRock_Up2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Up2: @ 848591C
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_Up2_MapEvents
-	.4byte NavelRock_Up2_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 426
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json
new file mode 100644
index 000000000..2d16e798c
--- /dev/null
+++ b/data/maps/NavelRock_Up2/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_UP2",
+  "name": "NavelRock_Up2",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP3",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc
deleted file mode 100644
index 9491e5dac..000000000
--- a/data/maps/NavelRock_Up3/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up3_MapWarps: @ 853DB2C
-	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2
-	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4
-
-NavelRock_Up3_MapEvents:: @ 853DB3C
-	map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc
deleted file mode 100644
index d816e58f1..000000000
--- a/data/maps/NavelRock_Up3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Up3: @ 8485938
-	.4byte NavelRock_LadderRoom1_Layout
-	.4byte NavelRock_Up3_MapEvents
-	.4byte NavelRock_Up3_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 425
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json
new file mode 100644
index 000000000..2e984b379
--- /dev/null
+++ b/data/maps/NavelRock_Up3/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_UP3",
+  "name": "NavelRock_Up3",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP4",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc
deleted file mode 100644
index 3d81f1523..000000000
--- a/data/maps/NavelRock_Up4/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up4_MapWarps: @ 853DB50
-	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3
-	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP
-
-NavelRock_Up4_MapEvents:: @ 853DB60
-	map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc
deleted file mode 100644
index 583c672b4..000000000
--- a/data/maps/NavelRock_Up4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Up4: @ 8485954
-	.4byte NavelRock_LadderRoom2_Layout
-	.4byte NavelRock_Up4_MapEvents
-	.4byte NavelRock_Up4_MapScripts
-	.4byte 0x0
-	.2byte MUS_RG_NANADUNGEON
-	.2byte 426
-	.byte MAPSEC_NAVEL_ROCK2
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json
new file mode 100644
index 000000000..e448e6a9a
--- /dev/null
+++ b/data/maps/NavelRock_Up4/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_NAVEL_ROCK_UP4",
+  "name": "NavelRock_Up4",
+  "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
+  "music": "MUS_RG_NANADUNGEON",
+  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_UP3",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_NAVEL_ROCK_TOP",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc
deleted file mode 100644
index 4c333f6b3..000000000
--- a/data/maps/NewMauville_Entrance/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-NewMauville_Entrance_MapWarps: @ 8536474
-	warp_def 4, 6, 3, 0, MAP_ROUTE110
-	warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE
-
-NewMauville_Entrance_MapCoordEvents: @ 8536484
-	coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF
-
-NewMauville_Entrance_MapEvents:: @ 8536494
-	map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0
-
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
deleted file mode 100644
index a8a1df296..000000000
--- a/data/maps/NewMauville_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NewMauville_Entrance: @ 8484470
-	.4byte NewMauville_Entrance_Layout
-	.4byte NewMauville_Entrance_MapEvents
-	.4byte NewMauville_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 184
-	.byte MAPSEC_NEW_MAUVILLE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json
new file mode 100644
index 000000000..d36763350
--- /dev/null
+++ b/data/maps/NewMauville_Entrance/map.json
@@ -0,0 +1,45 @@
+{
+  "id": "MAP_NEW_MAUVILLE_ENTRANCE",
+  "name": "NewMauville_Entrance",
+  "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_NEW_MAUVILLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_NEW_MAUVILLE_INSIDE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_NEW_MAUVILLE_STATE",
+      "var_value": "0",
+      "script": "NewMauville_Entrance_EventScript_2372FF"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index d841f0374..c3ed930a5 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -1,10 +1,10 @@
 NewMauville_Entrance_MapScripts:: @ 82372AD
-	map_script 1, NewMauville_Entrance_MapScript1_2372B8
-	map_script 3, NewMauville_Entrance_MapScript1_2372FB
+	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
+	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB
 	.byte 0
 
 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
-	compare VAR_0x40BA, 0
+	compare VAR_NEW_MAUVILLE_STATE, 0
 	call_if_eq NewMauville_Entrance_EventScript_2372C4
 	end
 
@@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB
 
 NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT
 	checkitem ITEM_BASEMENT_KEY, 1
@@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
 	setmetatile 5, 1, 717, 1
 	special DrawWholeMapView
 	playse SE_BAN
-	setvar VAR_0x40BA, 1
+	setvar VAR_NEW_MAUVILLE_STATE, 1
 	releaseall
 	end
 
diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc
deleted file mode 100644
index 568f4b22e..000000000
--- a/data/maps/NewMauville_Inside/events.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-NewMauville_Inside_EventObjects: @ 85364A8
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3
-
-NewMauville_Inside_MapWarps: @ 8536568
-	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
-
-NewMauville_Inside_MapCoordEvents: @ 8536570
-	coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
-	coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
-	coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
-	coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
-	coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
-	coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
-	coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
-	coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
-	coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
-	coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725
-
-NewMauville_Inside_MapBGEvents: @ 8536610
-	bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-	bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-	bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-	bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-	bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-	bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-	bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-	bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
-
-NewMauville_Inside_MapEvents:: @ 8536670
-	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
deleted file mode 100644
index 57966d38f..000000000
--- a/data/maps/NewMauville_Inside/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NewMauville_Inside: @ 848448C
-	.4byte NewMauville_Inside_Layout
-	.4byte NewMauville_Inside_MapEvents
-	.4byte NewMauville_Inside_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 185
-	.byte MAPSEC_NEW_MAUVILLE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json
new file mode 100644
index 000000000..b13d6059d
--- /dev/null
+++ b/data/maps/NewMauville_Inside/map.json
@@ -0,0 +1,289 @@
+{
+  "id": "MAP_NEW_MAUVILLE_INSIDE",
+  "name": "NewMauville_Inside",
+  "layout": "LAYOUT_NEW_MAUVILLE_INSIDE",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_NEW_MAUVILLE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 32,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_2911EC",
+      "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_2911F9",
+      "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 39,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_291206",
+      "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 17,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_291213",
+      "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_291220",
+      "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 25,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_2377AF",
+      "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_2377FC",
+      "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NewMauville_Inside_EventScript_237849",
+      "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 32,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 38,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237459"
+    },
+    {
+      "type": "trigger",
+      "x": 18,
+      "y": 36,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237471"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237459"
+    },
+    {
+      "type": "trigger",
+      "x": 16,
+      "y": 22,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237459"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237471"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237471"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237459"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237459"
+    },
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "NewMauville_Inside_EventScript_237471"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_NEW_MAUVILLE_STATE",
+      "var_value": "1",
+      "script": "NewMauville_Inside_EventScript_237725"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 4,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    },
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 3,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    },
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    },
+    {
+      "type": "sign",
+      "x": 33,
+      "y": 4,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    },
+    {
+      "type": "sign",
+      "x": 34,
+      "y": 4,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    },
+    {
+      "type": "sign",
+      "x": 35,
+      "y": 4,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    },
+    {
+      "type": "sign",
+      "x": 35,
+      "y": 3,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    },
+    {
+      "type": "sign",
+      "x": 35,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "NewMauville_Inside_EventScript_23778F"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index b3d9d868f..15d2cb02a 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -1,7 +1,7 @@
 NewMauville_Inside_MapScripts:: @ 82373D7
-	map_script 5, NewMauville_Inside_MapScript1_2373E7
-	map_script 3, NewMauville_Inside_MapScript1_23741B
-	map_script 1, NewMauville_Inside_MapScript1_23744D
+	map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7
+	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B
+	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D
 	.byte 0
 
 NewMauville_Inside_MapScript1_2373E7: @ 82373E7
@@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7
 NewMauville_Inside_EventScript_237407:: @ 8237407
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne NewMauville_Inside_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
@@ -40,7 +40,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449
 	return
 
 NewMauville_Inside_MapScript1_23744D: @ 823744D
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	call_if_eq NewMauville_Inside_EventScript_23773A
 	end
 
@@ -148,7 +148,7 @@ NewMauville_Inside_EventScript_237725:: @ 8237725
 	lockall
 	msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT
 	call NewMauville_Inside_EventScript_23773A
-	setvar VAR_0x40BA, 2
+	setvar VAR_NEW_MAUVILLE_STATE, 2
 	releaseall
 	end
 
@@ -167,7 +167,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A
 
 NewMauville_Inside_EventScript_23778F:: @ 823778F
 	lockall
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq NewMauville_Inside_EventScript_2377A5
 	msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT
 	releaseall
diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc
deleted file mode 100644
index db0232f83..000000000
--- a/data/maps/OldaleTown/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-OldaleTown_MapConnectionsList: @ 8486614
-	connection up, 0, MAP_ROUTE103
-	connection down, 0, MAP_ROUTE101
-	connection left, 0, MAP_ROUTE102
-
-OldaleTown_MapConnections: @ 8486638
-	.4byte 0x3
-	.4byte OldaleTown_MapConnectionsList
-
diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc
deleted file mode 100644
index a3bc51483..000000000
--- a/data/maps/OldaleTown/events.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-OldaleTown_EventObjects: @ 8527854
-	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0
-	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0
-	object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL
-
-OldaleTown_MapWarps: @ 85278B4
-	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: @ 85278D4
-	coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F
-	coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086
-	coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6
-	coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6
-
-OldaleTown_MapBGEvents: @ 8527914
-	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA
-	bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73
-	bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A
-	bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73
-	bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A
-
-OldaleTown_MapEvents:: @ 8527950
-	map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
-
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
deleted file mode 100644
index 83f3624dc..000000000
--- a/data/maps/OldaleTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-OldaleTown: @ 84825D0
-	.4byte OldaleTown_Layout
-	.4byte OldaleTown_MapEvents
-	.4byte OldaleTown_MapScripts
-	.4byte OldaleTown_MapConnections
-	.2byte MUS_MACHI_S4
-	.2byte 11
-	.byte MAPSEC_OLDALE_TOWN
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_TOWN
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
new file mode 100644
index 000000000..37b6105f2
--- /dev/null
+++ b/data/maps/OldaleTown/map.json
@@ -0,0 +1,196 @@
+{
+  "id": "MAP_OLDALE_TOWN",
+  "name": "OldaleTown",
+  "layout": "LAYOUT_OLDALE_TOWN",
+  "music": "MUS_MACHI_S4",
+  "region_map_section": "MAPSEC_OLDALE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE103"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE101"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE102"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 16,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_EventScript_1E8EF3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_EventScript_1E8EFC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_EventScript_1E901F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 11,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_EventScript_1E9070",
+      "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN_MART",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 0,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_ROUTE102_ACCESSIBLE",
+      "var_value": "0",
+      "script": "OldaleTown_EventScript_1E903F"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_OLDALE_STATE",
+      "var_value": "1",
+      "script": "OldaleTown_EventScript_1E9086"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_OLDALE_STATE",
+      "var_value": "1",
+      "script": "OldaleTown_EventScript_1E90A6"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_OLDALE_STATE",
+      "var_value": "1",
+      "script": "OldaleTown_EventScript_1E90C6"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "OldaleTown_EventScript_1E8EEA"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 7431cbf2a..c68ecbd08 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -1,9 +1,9 @@
 OldaleTown_MapScripts:: @ 81E8EA2
-	map_script 3, OldaleTown_MapScript1_1E8EA8
+	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8
 	.byte 0
 
 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8
-	call OldaleTown_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	setflag FLAG_VISITED_OLDALE_TOWN
 	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2
 	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE
@@ -11,7 +11,7 @@ OldaleTown_MapScript1_1E8EA8: @ 81E8EA8
 	end
 
 OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
-	setvar VAR_0x4051, 1
+	setvar VAR_ROUTE102_ACCESSIBLE, 1
 	return
 
 OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
@@ -85,7 +85,7 @@ OldaleTown_EventScript_1E8FB9:: @ 81E8FB9
 	end
 
 OldaleTown_EventScript_1E8FC3:: @ 81E8FC3
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	fadedefaultbgm
 	release
 	end
@@ -193,7 +193,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F
 	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066
 	msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, OldaleTown_Movement_2725A2
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -217,7 +217,7 @@ OldaleTown_EventScript_1E9066:: @ 81E9066
 
 OldaleTown_EventScript_1E9070:: @ 81E9070
 	lockall
-	applymovement 4, OldaleTown_Movement_27259E
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	setvar VAR_0x8009, 0
 	goto OldaleTown_EventScript_1E90E6
@@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086
 	lockall
 	applymovement 4, OldaleTown_Movement_1E9170
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
 	goto OldaleTown_EventScript_1E90E6
@@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6
 	lockall
 	applymovement 4, OldaleTown_Movement_1E9173
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
 	goto OldaleTown_EventScript_1E90E6
@@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6
 	lockall
 	applymovement 4, OldaleTown_Movement_1E9175
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
 	goto OldaleTown_EventScript_1E90E6
@@ -280,7 +280,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
 	applymovement 4, OldaleTown_Movement_1E9177
 	waitmovement 0
 	removeobject 4
-	setvar VAR_0x40C7, 2
+	setvar VAR_OLDALE_STATE, 2
 	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	releaseall
 	end
diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc
deleted file mode 100644
index 7183f9293..000000000
--- a/data/maps/OldaleTown_House1/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-OldaleTown_House1_EventObjects: @ 852D7B4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0
-
-OldaleTown_House1_MapWarps: @ 852D7CC
-	warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN
-	warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN
-
-OldaleTown_House1_MapEvents:: @ 852D7DC
-	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
deleted file mode 100644
index 6444d83c4..000000000
--- a/data/maps/OldaleTown_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-OldaleTown_House1: @ 8482B80
-	.4byte House1_Layout
-	.4byte OldaleTown_House1_MapEvents
-	.4byte OldaleTown_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S4
-	.2byte 59
-	.byte MAPSEC_OLDALE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json
new file mode 100644
index 000000000..aa837378c
--- /dev/null
+++ b/data/maps/OldaleTown_House1/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_OLDALE_TOWN_HOUSE1",
+  "name": "OldaleTown_House1",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_MACHI_S4",
+  "region_map_section": "MAPSEC_OLDALE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_House1_EventScript_1FBE86",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc
deleted file mode 100644
index 7e94a2356..000000000
--- a/data/maps/OldaleTown_House2/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-OldaleTown_House2_EventObjects: @ 852D7F0
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0
-
-OldaleTown_House2_MapWarps: @ 852D820
-	warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN
-	warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN
-
-OldaleTown_House2_MapEvents:: @ 852D830
-	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
deleted file mode 100644
index 0df8e3c0e..000000000
--- a/data/maps/OldaleTown_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-OldaleTown_House2: @ 8482B9C
-	.4byte House2_Layout
-	.4byte OldaleTown_House2_MapEvents
-	.4byte OldaleTown_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S4
-	.2byte 60
-	.byte MAPSEC_OLDALE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json
new file mode 100644
index 000000000..fbcf968e7
--- /dev/null
+++ b/data/maps/OldaleTown_House2/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_OLDALE_TOWN_HOUSE2",
+  "name": "OldaleTown_House2",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_MACHI_S4",
+  "region_map_section": "MAPSEC_OLDALE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_House2_EventScript_1FBF5B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_House2_EventScript_1FBF64",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc
deleted file mode 100644
index 22b308364..000000000
--- a/data/maps/OldaleTown_Mart/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-OldaleTown_Mart_EventObjects: @ 852D95C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0
-
-OldaleTown_Mart_MapWarps: @ 852D9A4
-	warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN
-	warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN
-
-OldaleTown_Mart_MapEvents:: @ 852D9B4
-	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
deleted file mode 100644
index df506157b..000000000
--- a/data/maps/OldaleTown_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-OldaleTown_Mart: @ 8482BF0
-	.4byte Mart_Layout
-	.4byte OldaleTown_Mart_MapEvents
-	.4byte OldaleTown_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_OLDALE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json
new file mode 100644
index 000000000..9f1f894ce
--- /dev/null
+++ b/data/maps/OldaleTown_Mart/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_OLDALE_TOWN_MART",
+  "name": "OldaleTown_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_OLDALE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_Mart_EventScript_1FC240",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_Mart_EventScript_1FC28A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_Mart_EventScript_1FC2A9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
deleted file mode 100644
index ba50faea9..000000000
--- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0
-
-OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4
-	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:: @ 852D8BC
-	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
deleted file mode 100644
index 250f5d164..000000000
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-OldaleTown_PokemonCenter_1F: @ 8482BB8
-	.4byte PokemonCenter_1F_Layout
-	.4byte OldaleTown_PokemonCenter_1F_MapEvents
-	.4byte OldaleTown_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_OLDALE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..7c9ed89a0
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F",
+  "name": "OldaleTown_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_OLDALE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_OLDALE_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index 19f7d8f67..49452da71 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
-	map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_1FC011
-	map_script 5, OldaleTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011
+	map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
deleted file mode 100644
index 34f343eb4..000000000
--- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
-	warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948
-	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
deleted file mode 100644
index 1562c900f..000000000
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-OldaleTown_PokemonCenter_2F: @ 8482BD4
-	.4byte PokemonCenter_2F_Layout
-	.4byte OldaleTown_PokemonCenter_2F_MapEvents
-	.4byte OldaleTown_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_OLDALE_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..cddd0a5a3
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F",
+  "name": "OldaleTown_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_OLDALE_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index 788157beb..b6795876b 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
-	map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D
diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc
deleted file mode 100644
index 5c84301bf..000000000
--- a/data/maps/PacifidlogTown/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-PacifidlogTown_MapConnectionsList: @ 84866B4
-	connection left, 0, MAP_ROUTE132
-	connection right, 0, MAP_ROUTE131
-
-PacifidlogTown_MapConnections: @ 84866CC
-	.4byte 0x2
-	.4byte PacifidlogTown_MapConnectionsList
-
diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc
deleted file mode 100644
index f73c1d14a..000000000
--- a/data/maps/PacifidlogTown/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-PacifidlogTown_EventObjects: @ 8527DE8
-	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0
-	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0
-	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0
-
-PacifidlogTown_MapWarps: @ 8527E30
-	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: @ 8527E60
-	bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73
-	bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE
-	bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73
-
-PacifidlogTown_MapEvents:: @ 8527E84
-	map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
-
diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc
deleted file mode 100644
index 786fa9d71..000000000
--- a/data/maps/PacifidlogTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown: @ 848265C
-	.4byte PacifidlogTown_Layout
-	.4byte PacifidlogTown_MapEvents
-	.4byte PacifidlogTown_MapScripts
-	.4byte PacifidlogTown_MapConnections
-	.2byte MUS_MINAMO
-	.2byte 16
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_TOWN
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json
new file mode 100644
index 000000000..3070d9c07
--- /dev/null
+++ b/data/maps/PacifidlogTown/map.json
@@ -0,0 +1,139 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN",
+  "name": "PacifidlogTown",
+  "layout": "LAYOUT_PACIFIDLOG_TOWN",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE132"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE131"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 10,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_EventScript_1EBACC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 11,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_EventScript_1EBAD5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_EventScript_1EBAC3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 22,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 2,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE5",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PacifidlogTown_EventScript_1EBADE"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc
index 6125ed386..0ae0a53a8 100644
--- a/data/maps/PacifidlogTown/scripts.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_MapScripts:: @ 81EBAB1
-	map_script 3, PacifidlogTown_MapScript1_1EBABC
-	map_script 5, PacifidlogTown_MapScript1_1EBAC0
+	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC
+	map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0
 	.byte 0
 
 PacifidlogTown_MapScript1_1EBABC: @ 81EBABC
diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc
deleted file mode 100644
index ac082b74a..000000000
--- a/data/maps/PacifidlogTown_House1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House1_EventObjects: @ 852EBA0
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0
-
-PacifidlogTown_House1_MapWarps: @ 852EBD0
-	warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House1_MapEvents:: @ 852EBE0
-	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
deleted file mode 100644
index a4f350e06..000000000
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_House1: @ 8482F8C
-	.4byte PacifidlogTown_House1_Layout
-	.4byte PacifidlogTown_House1_MapEvents
-	.4byte PacifidlogTown_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 77
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json
new file mode 100644
index 000000000..1e48da85c
--- /dev/null
+++ b/data/maps/PacifidlogTown_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN_HOUSE1",
+  "name": "PacifidlogTown_House1",
+  "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House1_EventScript_20365D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House1_EventScript_203666",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc
deleted file mode 100644
index fae916c73..000000000
--- a/data/maps/PacifidlogTown_House2/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-PacifidlogTown_House2_EventObjects: @ 852EBF4
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0
-	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0
-	object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0
-
-PacifidlogTown_House2_MapWarps: @ 852EC3C
-	warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House2_MapEvents:: @ 852EC4C
-	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
deleted file mode 100644
index 8a3e0ada4..000000000
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_House2: @ 8482FA8
-	.4byte PacifidlogTown_House2_Layout
-	.4byte PacifidlogTown_House2_MapEvents
-	.4byte PacifidlogTown_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 78
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json
new file mode 100644
index 000000000..d57720795
--- /dev/null
+++ b/data/maps/PacifidlogTown_House2/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN_HOUSE2",
+  "name": "PacifidlogTown_House2",
+  "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House2_EventScript_203792",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZURILL",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House2_EventScript_203891",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZURILL",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House2_EventScript_2038AC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index b3078fa2d..4f646ff43 100644
--- a/data/maps/PacifidlogTown_House2/scripts.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
@@ -4,7 +4,7 @@ PacifidlogTown_House2_MapScripts:: @ 8203791
 PacifidlogTown_House2_EventScript_203792:: @ 8203792
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	call PacifidlogTown_House2_EventScript_2037DE
 	goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_20387E
 	call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_2037F8
@@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792
 	end
 
 PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE
-	goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_27374E
+	goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn
 	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	compare VAR_RESULT, 0
 	call_if_eq PacifidlogTown_House2_EventScript_203812
@@ -43,7 +43,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816
 	msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM27
 	compare VAR_RESULT, 0
-	goto_if_eq PacifidlogTown_House2_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special SetPacifidlogTMReceivedDay
 	msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT
@@ -59,7 +59,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F
 	msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM21
 	compare VAR_RESULT, 0
-	goto_if_eq PacifidlogTown_House2_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special SetPacifidlogTMReceivedDay
 	msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT
diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc
deleted file mode 100644
index 30460329a..000000000
--- a/data/maps/PacifidlogTown_House3/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House3_EventObjects: @ 852EC60
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0
-
-PacifidlogTown_House3_MapWarps: @ 852EC90
-	warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House3_MapEvents:: @ 852ECA0
-	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
deleted file mode 100644
index ed538fa8b..000000000
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_House3: @ 8482FC4
-	.4byte PacifidlogTown_House1_Layout
-	.4byte PacifidlogTown_House3_MapEvents
-	.4byte PacifidlogTown_House3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 77
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json
new file mode 100644
index 000000000..181d69a80
--- /dev/null
+++ b/data/maps/PacifidlogTown_House3/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN_HOUSE3",
+  "name": "PacifidlogTown_House3",
+  "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House3_EventScript_203CB5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House3_EventScript_203C11",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc
deleted file mode 100644
index 740cc4ba3..000000000
--- a/data/maps/PacifidlogTown_House4/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-PacifidlogTown_House4_EventObjects: @ 852ECB4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0
-
-PacifidlogTown_House4_MapWarps: @ 852ECFC
-	warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House4_MapEvents:: @ 852ED0C
-	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
deleted file mode 100644
index 7108a0104..000000000
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_House4: @ 8482FE0
-	.4byte PacifidlogTown_House2_Layout
-	.4byte PacifidlogTown_House4_MapEvents
-	.4byte PacifidlogTown_House4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 78
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json
new file mode 100644
index 000000000..d38384fc9
--- /dev/null
+++ b/data/maps/PacifidlogTown_House4/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN_HOUSE4",
+  "name": "PacifidlogTown_House4",
+  "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House4_EventScript_203F55",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House4_EventScript_203F4C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House4_EventScript_203F5E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc
deleted file mode 100644
index 8d7f0b0c0..000000000
--- a/data/maps/PacifidlogTown_House5/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House5_EventObjects: @ 852ED20
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0
-
-PacifidlogTown_House5_MapWarps: @ 852ED50
-	warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House5_MapEvents:: @ 852ED60
-	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
deleted file mode 100644
index 07da6a24d..000000000
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_House5: @ 8482FFC
-	.4byte PacifidlogTown_House1_Layout
-	.4byte PacifidlogTown_House5_MapEvents
-	.4byte PacifidlogTown_House5_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 77
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json
new file mode 100644
index 000000000..db7e51c46
--- /dev/null
+++ b/data/maps/PacifidlogTown_House5/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN_HOUSE5",
+  "name": "PacifidlogTown_House5",
+  "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House5_EventScript_204111",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_House5_EventScript_204137",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
deleted file mode 100644
index 80c8a8c71..000000000
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0
-
-PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8
-	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:: @ 852EB00
-	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
deleted file mode 100644
index 9db47a72b..000000000
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_PokemonCenter_1F: @ 8482F54
-	.4byte PokemonCenter_1F_Layout
-	.4byte PacifidlogTown_PokemonCenter_1F_MapEvents
-	.4byte PacifidlogTown_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..690243277
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F",
+  "name": "PacifidlogTown_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PACIFIDLOG_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index ddad843fb..89fec7f6b 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
-	map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2
-	map_script 5, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2
+	map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
deleted file mode 100644
index d41f1fa71..000000000
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74
-	warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C
-	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
deleted file mode 100644
index e16d7b5e5..000000000
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_PokemonCenter_2F: @ 8482F70
-	.4byte PokemonCenter_2F_Layout
-	.4byte PacifidlogTown_PokemonCenter_2F_MapEvents
-	.4byte PacifidlogTown_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_PACIFIDLOG_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..c5f7c9907
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F",
+  "name": "PacifidlogTown_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index 0199c2215..cb28d577e 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
-	map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A
diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc
deleted file mode 100644
index 96bd6cbce..000000000
--- a/data/maps/PetalburgCity/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-PetalburgCity_MapConnectionsList: @ 84866D4
-	connection left, -50, MAP_ROUTE104
-	connection right, 10, MAP_ROUTE102
-
-PetalburgCity_MapConnections: @ 84866EC
-	.4byte 0x2
-	.4byte PetalburgCity_MapConnectionsList
-
diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc
deleted file mode 100644
index 10d85c939..000000000
--- a/data/maps/PetalburgCity/events.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-PetalburgCity_EventObjects: @ 8525FD0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
-	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0
-	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0
-	object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, FLAG_ITEM_PETALBURG_CITY_ETHER
-	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0
-	object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT
-
-PetalburgCity_MapWarps: @ 85260A8
-	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: @ 85260D8
-	coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A
-	coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6
-	coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2
-	coord_event 8, 13, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4BE
-	coord_event 4, 10, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC691
-	coord_event 4, 11, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6A7
-	coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD
-	coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3
-
-PetalburgCity_MapBGEvents: @ 8526158
-	bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476
-	bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
-	bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
-	bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC47F
-	bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
-	bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
-	bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491
-	bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY
-
-PetalburgCity_MapEvents:: @ 85261B8
-	map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
-
diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc
deleted file mode 100644
index 5cf3cc6e1..000000000
--- a/data/maps/PetalburgCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity: @ 84824B8
-	.4byte PetalburgCity_Layout
-	.4byte PetalburgCity_MapEvents
-	.4byte PetalburgCity_MapScripts
-	.4byte PetalburgCity_MapConnections
-	.2byte MUS_MACHI_S2
-	.2byte 1
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
new file mode 100644
index 000000000..6a9a6b33d
--- /dev/null
+++ b/data/maps/PetalburgCity/map.json
@@ -0,0 +1,330 @@
+{
+  "id": "MAP_PETALBURG_CITY",
+  "name": "PetalburgCity",
+  "layout": "LAYOUT_PETALBURG_CITY",
+  "music": "MUS_MACHI_S2",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": -50,
+      "map": "MAP_ROUTE104"
+    },
+    {
+      "direction": "right",
+      "offset": 10,
+      "map": "MAP_ROUTE102"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 16,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_EventScript_1DC3FD",
+      "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLY",
+      "x": 15,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 8,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_EventScript_1DC3E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 20,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_EventScript_1DC488",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 15,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 19,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_EventScript_2910B4",
+      "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_EventScript_2910C1",
+      "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 12,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_EventScript_1DC82E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 13,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY_WALLYS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 20,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 20,
+      "y": 24,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 25,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY_MART",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_PETALBURG_STATE",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC49A"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_PETALBURG_STATE",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC4A6"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_PETALBURG_STATE",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC4B2"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_PETALBURG_STATE",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC4BE"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC691"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC6A7"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC6BD"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
+      "var_value": "0",
+      "script": "PetalburgCity_EventScript_1DC6D3"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_EventScript_1DC476"
+    },
+    {
+      "type": "sign",
+      "x": 26,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 21,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_EventScript_1DC47F"
+    },
+    {
+      "type": "sign",
+      "x": 22,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_EventScript_1DC491"
+    },
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 29,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index f69eb3a3a..c8b723383 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -1,17 +1,17 @@
 PetalburgCity_MapScripts::
-	map_script 3, PetalburgCity_MapScript1_1DC2D7
-	map_script 2, PetalburgCity_MapScript2_1DC31C
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_1DC2D7
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C
 	.byte 0
 
 PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
 	setflag FLAG_VISITED_PETALBURG_CITY
-	compare VAR_0x4057, 0
+	compare VAR_PETALBURG_STATE, 0
 	call_if_eq PetalburgCity_EventScript_1DC307
-	compare VAR_0x4057, 2
+	compare VAR_PETALBURG_STATE, 2
 	call_if_eq PetalburgCity_EventScript_1DC30F
-	compare VAR_0x4057, 4
+	compare VAR_PETALBURG_STATE, 4
 	call_if_eq PetalburgCity_EventScript_1DC30F
-	compare VAR_0x4085, 8
+	compare VAR_PETALBURG_GYM_STATE, 8
 	call_if_eq PetalburgCity_EventScript_1DC316
 	end
 
@@ -20,17 +20,17 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307
 	return
 
 PetalburgCity_EventScript_1DC30F:: @ 81DC30F
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_TSURETEK
 	return
 
 PetalburgCity_EventScript_1DC316:: @ 81DC316
-	setvar VAR_0x4085, 7
+	setvar VAR_PETALBURG_GYM_STATE, 7
 	return
 
 PetalburgCity_MapScript2_1DC31C: @ 81DC31C
-	map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E
-	map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390
+	map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_1DC32E
+	map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_EventScript_1DC390
 	.2byte 0
 
 PetalburgCity_EventScript_1DC32E:: @ 81DC32E
@@ -44,16 +44,16 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 	special StartWallyTutorialBattle
 	waitstate
 	msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT
-	applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY
+	applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY
 	waitmovement 2, MAP_PETALBURG_CITY
 	msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
 	closemessage
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x4057, 3
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
+	setvar VAR_PETALBURG_STATE, 3
 	fadedefaultbgm
 	clearflag FLAG_SPECIAL_FLAG_0x4001
 	special LoadPlayerParty
-	setvar VAR_0x4085, 1
+	setvar VAR_PETALBURG_GYM_STATE, 1
 	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
 	waitstate
 	releaseall
@@ -61,7 +61,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 
 PetalburgCity_EventScript_1DC390:: @ 81DC390
 	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	applymovement 5, PetalburgCity_Movement_1DC41B
 	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406
 	waitmovement 0
@@ -76,7 +76,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadedefaultbgm
 	clearflag FLAG_SPECIAL_FLAG_0x4001
 	warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
@@ -89,7 +89,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6
 	faceplayer
 	msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, PetalburgCity_Movement_2725A2
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -263,13 +263,13 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE
 	end
 
 PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
-	applymovement 8, PetalburgCity_Movement_27259E
+	applymovement 8, Common_Movement_FacePlayer
 	waitmovement 0
 	playbgm MUS_TSURETEK, 0
 	playse SE_PIN
-	applymovement 8, PetalburgCity_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, PetalburgCity_Movement_27259A
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_EventScript_1DC57F
@@ -290,8 +290,8 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_EventScript_1DC5FF
 	msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT
-	applymovement 8, PetalburgCity_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8
+	applymovement 8, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT
 	closemessage
@@ -304,7 +304,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
 PetalburgCity_EventScript_1DC57F:: @ 81DC57F
 	applymovement 8, PetalburgCity_Movement_1DC615
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
@@ -316,14 +316,14 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594
 PetalburgCity_EventScript_1DC59F:: @ 81DC59F
 	applymovement 8, PetalburgCity_Movement_1DC61D
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4
 	applymovement 8, PetalburgCity_Movement_1DC622
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
@@ -543,23 +543,23 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
 	applymovement 9, PetalburgCity_Movement_1DC7D6
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, PetalburgCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, PetalburgCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 9, PetalburgCity_Movement_1DC7DB
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
-	setvar VAR_0x40D1, 1
+	setvar VAR_SCOTT_STATE, 1
 	msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT
 	closemessage
-	applymovement 9, PetalburgCity_Movement_2725A8
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 30
 	msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT
 	closemessage
-	applymovement 9, PetalburgCity_Movement_2725A4
+	applymovement 9, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 30
 	msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT
@@ -572,7 +572,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
 	call_if_eq PetalburgCity_EventScript_1DC7B2
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_EventScript_1DC7C4
-	setvar VAR_0x40C9, 1
+	setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1
 	removeobject 9
 	releaseall
 	end
diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc
deleted file mode 100644
index 4c75dc7f6..000000000
--- a/data/maps/PetalburgCity_Gym/events.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-PetalburgCity_Gym_EventObjects: @ 852EDC8
-	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, FLAG_HIDE_PETALBURG_GYM_GREETER
-	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY
-	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
-
-PetalburgCity_Gym_MapWarps: @ 852EED0
-	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: @ 852F000
-	bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137
-	bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187
-	bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC
-	bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051EF
-	bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205222
-	bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205255
-	bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205288
-	bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052BB
-	bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052EE
-	bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205321
-	bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205354
-	bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205387
-	bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E
-	bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E
-
-PetalburgCity_Gym_MapEvents:: @ 852F0A8
-	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
deleted file mode 100644
index 626f37c3d..000000000
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_Gym: @ 8483034
-	.4byte PetalburgCity_Gym_Layout
-	.4byte PetalburgCity_Gym_MapEvents
-	.4byte PetalburgCity_Gym_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 79
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json
new file mode 100644
index 000000000..297c58a30
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/map.json
@@ -0,0 +1,544 @@
+{
+  "id": "MAP_PETALBURG_CITY_GYM",
+  "name": "PetalburgCity_Gym",
+  "layout": "LAYOUT_PETALBURG_CITY_GYM",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NORMAN",
+      "x": 4,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_2049F1",
+      "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 94,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_2054AA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 4,
+      "y": 81,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_2053BA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 4,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_2053F6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 55,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_2054E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 4,
+      "y": 68,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_205432",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_205522",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 4,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_20546E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 3,
+      "y": 109,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Gym_EventScript_20574F",
+      "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLY",
+      "x": 4,
+      "y": 111,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 111,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 111,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 105,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 7,
+      "y": 85,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 85,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 105,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 1,
+      "y": 98,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 2,
+      "y": 98,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 1,
+      "y": 79,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 7,
+      "y": 79,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 7,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 6,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 1,
+      "y": 59,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 2,
+      "y": 59,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 1,
+      "y": 92,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 16
+    },
+    {
+      "x": 7,
+      "y": 92,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 18
+    },
+    {
+      "x": 7,
+      "y": 59,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 14
+    },
+    {
+      "x": 6,
+      "y": 59,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 14
+    },
+    {
+      "x": 1,
+      "y": 72,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 15
+    },
+    {
+      "x": 2,
+      "y": 72,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 15
+    },
+    {
+      "x": 7,
+      "y": 40,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 24
+    },
+    {
+      "x": 1,
+      "y": 53,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 26
+    },
+    {
+      "x": 7,
+      "y": 53,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 28
+    },
+    {
+      "x": 1,
+      "y": 66,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 30
+    },
+    {
+      "x": 1,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 20
+    },
+    {
+      "x": 2,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 20
+    },
+    {
+      "x": 7,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 21
+    },
+    {
+      "x": 6,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 21
+    },
+    {
+      "x": 1,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 22
+    },
+    {
+      "x": 2,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 22
+    },
+    {
+      "x": 7,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 23
+    },
+    {
+      "x": 6,
+      "y": 33,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 23
+    },
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 34
+    },
+    {
+      "x": 1,
+      "y": 27,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 36
+    },
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 32
+    },
+    {
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 32
+    },
+    {
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 33
+    },
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY_GYM",
+      "dest_warp_id": 33
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 105,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205137"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 105,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205187"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 79,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_2051BC"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 79,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_2051EF"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 92,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205222"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 92,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205255"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 40,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205288"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 53,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_2052BB"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 53,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_2052EE"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 66,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205321"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205354"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 27,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgCity_Gym_EventScript_205387"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 110,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "PetalburgCity_Gym_EventScript_20576E"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 110,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "PetalburgCity_Gym_EventScript_20577E"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index 915cdc93e..a256a6547 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -1,14 +1,14 @@
 PetalburgCity_Gym_MapScripts:: @ 8204889
-	map_script 1, PetalburgCity_Gym_MapScript1_20489E
-	map_script 3, PetalburgCity_Gym_MapScript1_20492D
-	map_script 4, PetalburgCity_Gym_MapScript2_20498B
-	map_script 2, PetalburgCity_Gym_MapScript2_20499A
+	map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A
 	.byte 0
 
 PetalburgCity_Gym_MapScript1_20489E: @ 820489E
-	compare VAR_0x4085, 6
+	compare VAR_PETALBURG_GYM_STATE, 6
 	goto_if_eq PetalburgCity_Gym_EventScript_2048B5
-	compare VAR_0x4085, 7
+	compare VAR_PETALBURG_GYM_STATE, 7
 	call_if_ge PetalburgCity_Gym_EventScript_2048FF
 	end
 
@@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF
 	return
 
 PetalburgCity_Gym_MapScript1_20492D: @ 820492D
-	compare VAR_0x4085, 1
+	compare VAR_PETALBURG_GYM_STATE, 1
 	call_if_eq PetalburgCity_Gym_EventScript_20494D
-	compare VAR_0x4085, 6
+	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_lt PetalburgCity_Gym_EventScript_204955
 	call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D
 	end
@@ -60,21 +60,21 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955
 	return
 
 PetalburgCity_Gym_EventScript_20495D:: @ 820495D
-	setorcopyvar VAR_0x8015, 269
+	setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, 269
 	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare VAR_RESULT, 1
 	goto_if_eq PetalburgCity_Gym_EventScript_204985
-	compare VAR_0x4085, 8
+	compare VAR_PETALBURG_GYM_STATE, 8
 	goto_if_eq PetalburgCity_Gym_EventScript_204985
 	setobjectxyperm 1, 4, 107
 	return
 
 PetalburgCity_Gym_EventScript_204985:: @ 8204985
-	setvar VAR_0x4085, 8
+	setvar VAR_PETALBURG_GYM_STATE, 8
 	end
 
 PetalburgCity_Gym_MapScript2_20498B: @ 820498B
-	map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995
+	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_204995
 	.2byte 0
 
 PetalburgCity_Gym_EventScript_204995:: @ 8204995
@@ -82,7 +82,7 @@ PetalburgCity_Gym_EventScript_204995:: @ 8204995
 	end
 
 PetalburgCity_Gym_MapScript2_20499A: @ 820499A
-	map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4
+	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_2049A4
 	.2byte 0
 
 PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
@@ -90,17 +90,17 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
 	msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT
 	msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	applymovement 10, PetalburgCity_Gym_Movement_2049EC
 	waitmovement 0
 	playse SE_KAIDAN
 	removeobject 10
 	setflag FLAG_HIDE_PETALBURG_CITY_WALLY
 	delay 30
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT
-	setvar VAR_0x4085, 2
+	setvar VAR_PETALBURG_GYM_STATE, 2
 	releaseall
 	end
 
@@ -114,7 +114,7 @@ PetalburgCity_Gym_Movement_2049EC: @ 82049EC
 PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1
 	lock
 	faceplayer
-	switch VAR_0x4085
+	switch VAR_PETALBURG_GYM_STATE
 	case 2, PetalburgCity_Gym_EventScript_204D4A
 	case 3, PetalburgCity_Gym_EventScript_204D54
 	case 4, PetalburgCity_Gym_EventScript_204D5E
@@ -216,8 +216,8 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
 	call_if_eq PetalburgCity_Gym_EventScript_204CB5
 	removeobject 10
 	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
-	setvar VAR_0x4085, 1
-	setvar VAR_0x4057, 2
+	setvar VAR_PETALBURG_GYM_STATE, 1
+	setvar VAR_PETALBURG_STATE, 2
 	clearflag FLAG_HIDE_PETALBURG_CITY_WALLY
 	clearflag FLAG_HIDE_PETALBURG_GYM_WALLY
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
@@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
 	end
 
 PetalburgCity_Gym_EventScript_204C31:: @ 8204C31
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	applymovement 10, PetalburgCity_Gym_Movement_2050EB
 	waitmovement 0
 	return
@@ -236,20 +236,20 @@ PetalburgCity_Gym_EventScript_204C31:: @ 8204C31
 PetalburgCity_Gym_EventScript_204C43:: @ 8204C43
 	applymovement 10, PetalburgCity_Gym_Movement_2050E1
 	waitmovement 0
-	applymovement 1, PetalburgCity_Gym_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	applymovement 10, PetalburgCity_Gym_Movement_2050EB
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204C78:: @ 8204C78
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	applymovement 10, PetalburgCity_Gym_Movement_205102
 	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111
 	waitmovement 0
@@ -274,55 +274,55 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5
 	return
 
 PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7
-	applymovement 1, PetalburgCity_Gym_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4
-	applymovement 1, PetalburgCity_Gym_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6
-	applymovement 1, PetalburgCity_Gym_Movement_2725A4
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceLeft
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204D08:: @ 8204D08
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204D13:: @ 8204D13
-	applymovement 1, PetalburgCity_Gym_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204D29:: @ 8204D29
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204D34:: @ 8204D34
-	applymovement 10, PetalburgCity_Gym_Movement_27259E
+	applymovement 10, Common_Movement_FacePlayer
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F
-	applymovement 10, PetalburgCity_Gym_Movement_2725AA
+	applymovement 10, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
@@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72
 	return
 
 PetalburgCity_Gym_EventScript_204D73:: @ 8204D73
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
@@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17
 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D
 	giveitem_std ITEM_ENIGMA_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
 	release
 	end
@@ -413,10 +413,10 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
 	trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107
 	message PetalburgCity_Gym_Text_206162
 	waitmessage
-	call PetalburgCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_PETALBURG_GYM
-	setvar VAR_0x4085, 7
+	setvar VAR_PETALBURG_GYM_STATE, 7
 	setflag FLAG_BADGE05_GET
 	special sub_813B9A0
 	call PetalburgCity_Gym_EventScript_2721F8
@@ -444,7 +444,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
 PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2
 	giveitem_std ITEM_TM42
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	setflag FLAG_RECEIVED_TM42
 	msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT
 	return
@@ -465,9 +465,9 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
 	applymovement 11, PetalburgCity_Gym_Movement_2050BB
 	waitmovement 0
 	playse SE_PIN
-	applymovement 11, PetalburgCity_Gym_Movement_272598
+	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 11, PetalburgCity_Gym_Movement_27259A
+	applymovement 11, Common_Movement_Delay48
 	waitmovement 0
 	delay 10
 	compare VAR_0x8008, 1
@@ -496,7 +496,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_Gym_EventScript_20506C
 	removeobject 11
-	setvar VAR_0x4057, 4
+	setvar VAR_PETALBURG_STATE, 4
 	clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
 	warp MAP_PETALBURG_CITY, 255, 15, 8
 	waitstate
@@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
 	end
 
 PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC
-	applymovement 11, PetalburgCity_Gym_Movement_2725A6
+	applymovement 11, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7
-	applymovement 11, PetalburgCity_Gym_Movement_2725A8
+	applymovement 11, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2
-	applymovement 11, PetalburgCity_Gym_Movement_2725A4
+	applymovement 11, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_204FED:: @ 8204FED
 	applymovement 11, PetalburgCity_Gym_Movement_2050C3
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4
-	applymovement 1, PetalburgCity_Gym_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_205009:: @ 8205009
 	applymovement 11, PetalburgCity_Gym_Movement_2050CA
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_205025:: @ 8205025
 	applymovement 11, PetalburgCity_Gym_Movement_2050D0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_205041:: @ 8205041
 	applymovement 11, PetalburgCity_Gym_Movement_20507E
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1
 	waitmovement 0
 	return
@@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D
 
 PetalburgCity_Gym_EventScript_205137:: @ 8205137
 	lockall
-	compare VAR_0x4085, 6
+	compare VAR_PETALBURG_GYM_STATE, 6
 	goto_if_lt PetalburgCity_Gym_EventScript_20517D
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 85
@@ -813,7 +813,7 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D
 
 PetalburgCity_Gym_EventScript_205187:: @ 8205187
 	lockall
-	compare VAR_0x4085, 6
+	compare VAR_PETALBURG_GYM_STATE, 6
 	goto_if_lt PetalburgCity_Gym_EventScript_20517D
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 98
diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc
deleted file mode 100644
index bcb91e637..000000000
--- a/data/maps/PetalburgCity_House1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_House1_EventObjects: @ 852F0BC
-	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0
-
-PetalburgCity_House1_MapWarps: @ 852F0EC
-	warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY
-	warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY
-
-PetalburgCity_House1_MapEvents:: @ 852F0FC
-	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
deleted file mode 100644
index 058d2ae6b..000000000
--- a/data/maps/PetalburgCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_House1: @ 8483050
-	.4byte House1_Layout
-	.4byte PetalburgCity_House1_MapEvents
-	.4byte PetalburgCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S2
-	.2byte 59
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json
new file mode 100644
index 000000000..68e9a4dce
--- /dev/null
+++ b/data/maps/PetalburgCity_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_PETALBURG_CITY_HOUSE1",
+  "name": "PetalburgCity_House1",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_MACHI_S2",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_House1_EventScript_2077A3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_House1_EventScript_20779A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc
deleted file mode 100644
index 660f1efe3..000000000
--- a/data/maps/PetalburgCity_House2/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_House2_EventObjects: @ 852F110
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0
-
-PetalburgCity_House2_MapWarps: @ 852F140
-	warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY
-	warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY
-
-PetalburgCity_House2_MapEvents:: @ 852F150
-	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
deleted file mode 100644
index d8ceeafbe..000000000
--- a/data/maps/PetalburgCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_House2: @ 848306C
-	.4byte HouseWithBed_Layout
-	.4byte PetalburgCity_House2_MapEvents
-	.4byte PetalburgCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S2
-	.2byte 80
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json
new file mode 100644
index 000000000..b6c0107a0
--- /dev/null
+++ b/data/maps/PetalburgCity_House2/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_PETALBURG_CITY_HOUSE2",
+  "name": "PetalburgCity_House2",
+  "layout": "LAYOUT_HOUSE_WITH_BED",
+  "music": "MUS_MACHI_S2",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_House2_EventScript_2078F3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_House2_EventScript_2078FC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc
deleted file mode 100644
index b79aa5cb0..000000000
--- a/data/maps/PetalburgCity_Mart/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-PetalburgCity_Mart_EventObjects: @ 852F294
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0
-
-PetalburgCity_Mart_MapWarps: @ 852F2F4
-	warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY
-	warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY
-
-PetalburgCity_Mart_MapEvents:: @ 852F304
-	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
deleted file mode 100644
index 757430cab..000000000
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_Mart: @ 84830C0
-	.4byte Mart_Layout
-	.4byte PetalburgCity_Mart_MapEvents
-	.4byte PetalburgCity_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json
new file mode 100644
index 000000000..b08837e80
--- /dev/null
+++ b/data/maps/PetalburgCity_Mart/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_PETALBURG_CITY_MART",
+  "name": "PetalburgCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Mart_EventScript_207D69",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Mart_EventScript_207DE8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Mart_EventScript_207DDF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_Mart_EventScript_207DD6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index 8a1de856d..000000000
--- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0
-
-PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC
-	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:: @ 852F1F4
-	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
deleted file mode 100644
index 61b328753..000000000
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_PokemonCenter_1F: @ 8483088
-	.4byte PokemonCenter_1F_Layout
-	.4byte PetalburgCity_PokemonCenter_1F_MapEvents
-	.4byte PetalburgCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..eeb22dca4
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F",
+  "name": "PetalburgCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_1F_EventScript_291539",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 1bbeb8fad..382847bc7 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
-	map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3
-	map_script 5, PetalburgCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3
+	map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index 08bd8f524..000000000
--- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268
-	warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280
-	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
deleted file mode 100644
index c6cacfc3a..000000000
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_PokemonCenter_2F: @ 84830A4
-	.4byte PokemonCenter_2F_Layout
-	.4byte PetalburgCity_PokemonCenter_2F_MapEvents
-	.4byte PetalburgCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..279c5e44b
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F",
+  "name": "PetalburgCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index 38d01972a..7b5f5af55 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
-	map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56
diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc
deleted file mode 100644
index e30f3a487..000000000
--- a/data/maps/PetalburgCity_WallysHouse/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_WallysHouse_EventObjects: @ 852ED74
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0
-
-PetalburgCity_WallysHouse_MapWarps: @ 852EDA4
-	warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY
-	warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY
-
-PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4
-	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
deleted file mode 100644
index 04b723666..000000000
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_WallysHouse: @ 8483018
-	.4byte House2_Layout
-	.4byte PetalburgCity_WallysHouse_MapEvents
-	.4byte PetalburgCity_WallysHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S2
-	.2byte 60
-	.byte MAPSEC_PETALBURG_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json
new file mode 100644
index 000000000..c961d300c
--- /dev/null
+++ b/data/maps/PetalburgCity_WallysHouse/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE",
+  "name": "PetalburgCity_WallysHouse",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_MACHI_S2",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_WallysHouse_EventScript_204278",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgCity_WallysHouse_EventScript_2042C0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_CITY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index ac41aaa28..8b1421abb 100644
--- a/data/maps/PetalburgCity_WallysHouse/scripts.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
@@ -1,10 +1,10 @@
 PetalburgCity_WallysHouse_MapScripts:: @ 8204229
-	map_script 2, PetalburgCity_WallysHouse_MapScript2_204247
-	map_script 4, PetalburgCity_WallysHouse_MapScript2_204234
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_204247
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_204234
 	.byte 0
 
 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234
-	map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_20423E
+	map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E
 	.2byte 0
 
 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
@@ -13,7 +13,7 @@ PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
 	end
 
 PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247
-	map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_204251
+	map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251
 	.2byte 0
 
 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251
@@ -22,7 +22,7 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251
 	giveitem_std ITEM_HM03
 	setflag FLAG_RECEIVED_HM03
 	msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT
-	setvar VAR_0x4057, 5
+	setvar VAR_PETALBURG_STATE, 5
 	releaseall
 	end
 
diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc
deleted file mode 100644
index b64e38885..000000000
--- a/data/maps/PetalburgWoods/events.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-PetalburgWoods_EventObjects: @ 85345E4
-	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11
-	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT
-	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, FLAG_ITEM_PETALBURG_WOODS_X_ATTACK
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, FLAG_ITEM_PETALBURG_WOODS_ETHER
-	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0
-	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0
-	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0
-	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL
-	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0
-
-PetalburgWoods_MapWarps: @ 853471C
-	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: @ 853474C
-	coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7
-	coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079
-
-PetalburgWoods_MapBGEvents: @ 853476C
-	bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B
-	bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION
-	bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1
-	bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2
-	bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL
-	bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264
-
-PetalburgWoods_MapEvents:: @ 85347B4
-	map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
-
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
deleted file mode 100644
index e25f6f750..000000000
--- a/data/maps/PetalburgWoods/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgWoods: @ 8483FF4
-	.4byte PetalburgWoods_Layout
-	.4byte PetalburgWoods_MapEvents
-	.4byte PetalburgWoods_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 135
-	.byte MAPSEC_PETALBURG_WOODS
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
new file mode 100644
index 000000000..4bca7bb5e
--- /dev/null
+++ b/data/maps/PetalburgWoods/map.json
@@ -0,0 +1,301 @@
+{
+  "id": "MAP_PETALBURG_WOODS",
+  "name": "PetalburgWoods",
+  "layout": "LAYOUT_PETALBURG_WOODS",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_PETALBURG_WOODS",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 19,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 19,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_2906BB",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 26,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 26,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 45,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_29110F",
+      "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 35,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_291102",
+      "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_29111C",
+      "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 15,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_22E210",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 7,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "PetalburgWoods_EventScript_22E26D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 4,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "PetalburgWoods_EventScript_22E284",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 30,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_22E219",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_291129",
+      "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoods_EventScript_22E222",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 15,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 16,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 17,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 36,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 37,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 26,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_PETALBURG_WOODS_STATE",
+      "var_value": "0",
+      "script": "PetalburgWoods_EventScript_22DFD7"
+    },
+    {
+      "type": "trigger",
+      "x": 27,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_PETALBURG_WOODS_STATE",
+      "var_value": "0",
+      "script": "PetalburgWoods_EventScript_22E079"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 32,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgWoods_EventScript_22E25B"
+    },
+    {
+      "type": "hidden_item",
+      "x": 39,
+      "y": 35,
+      "elevation": 3,
+      "item": "ITEM_POTION",
+      "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION"
+    },
+    {
+      "type": "hidden_item",
+      "x": 26,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_TINY_MUSHROOM",
+      "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 40,
+      "y": 29,
+      "elevation": 3,
+      "item": "ITEM_TINY_MUSHROOM",
+      "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 4,
+      "y": 19,
+      "elevation": 3,
+      "item": "ITEM_POKE_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "PetalburgWoods_EventScript_22E264"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
index eec9100f1..423d4c432 100644
--- a/data/maps/PetalburgWoods/scripts.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -15,7 +15,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7
 	closemessage
 	applymovement 3, PetalburgWoods_Movement_22E1F6
 	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT
 	closemessage
@@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079
 	call PetalburgWoods_EventScript_22E124
 	applymovement 4, PetalburgWoods_Movement_22E1D0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT
 	closemessage
@@ -52,14 +52,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079
 	closemessage
 	applymovement 3, PetalburgWoods_Movement_22E205
 	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, PetalburgWoods_Movement_22E1EA
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542
@@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138
 	applymovement 3, PetalburgWoods_Movement_22E1FD
 	waitmovement 0
 	removeobject 3
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT
 	giveitem_std ITEM_GREAT_BALL
@@ -109,7 +109,7 @@ PetalburgWoods_EventScript_22E18B:: @ 822E18B
 
 PetalburgWoods_EventScript_22E1A7:: @ 822E1A7
 	removeobject 4
-	setvar VAR_0x4098, 1
+	setvar VAR_PETALBURG_WOODS_STATE, 1
 	releaseall
 	end
 
@@ -253,7 +253,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222
 	msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT
 	giveitem_std ITEM_MIRACLE_SEED
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgWoods_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MIRACLE_SEED
 	release
 	end
diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc
deleted file mode 100644
index 06c6588a9..000000000
--- a/data/maps/RecordCorner/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RecordCorner_EventObjects: @ 8539DFC
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0
-
-RecordCorner_MapWarps: @ 8539E14
-	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: @ 8539E34
-	coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D
-	coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447
-	coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432
-	coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C
-
-RecordCorner_MapEvents:: @ 8539E74
-	map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
-
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
deleted file mode 100644
index c0864092b..000000000
--- a/data/maps/RecordCorner/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RecordCorner: @ 8484D68
-	.4byte RecordCorner_Layout
-	.4byte RecordCorner_MapEvents
-	.4byte RecordCorner_MapScripts
-	.4byte 0x0
-	.2byte MUS_RAINBOW
-	.2byte 223
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json
new file mode 100644
index 000000000..d34ad4903
--- /dev/null
+++ b/data/maps/RecordCorner/map.json
@@ -0,0 +1,100 @@
+{
+  "id": "MAP_RECORD_CORNER",
+  "name": "RecordCorner",
+  "layout": "LAYOUT_RECORD_CORNER",
+  "music": "MUS_RAINBOW",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RecordCorner_EventScript_2774C6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_RecordCenter_Spot0"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_RecordCenter_Spot2"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_RecordCenter_Spot1"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_RecordCenter_Spot3"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc
deleted file mode 100644
index f5f35e974..000000000
--- a/data/maps/Route101/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route101_MapConnectionsList: @ 848680C
-	connection up, 0, MAP_OLDALE_TOWN
-	connection down, 0, MAP_LITTLEROOT_TOWN
-
-Route101_MapConnections: @ 8486824
-	.4byte 0x2
-	.4byte Route101_MapConnectionsList
-
diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc
deleted file mode 100644
index 77ee2848f..000000000
--- a/data/maps/Route101/events.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-Route101_EventObjects: @ 8527E98
-	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0
-	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
-	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
-	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON
-	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH
-	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY
-
-Route101_MapCoordEvents: @ 8527F28
-	coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE
-	coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE
-	coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E
-	coord_event 11, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E
-	coord_event 6, 16, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
-	coord_event 6, 15, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
-	coord_event 6, 17, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
-	coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
-	coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A
-
-Route101_MapBGEvents: @ 8527FB8
-	bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D
-
-Route101_MapEvents:: @ 8527FC4
-	map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
-
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
deleted file mode 100644
index 5a98f7e22..000000000
--- a/data/maps/Route101/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route101: @ 8482678
-	.4byte Route101_Layout
-	.4byte Route101_MapEvents
-	.4byte Route101_MapScripts
-	.4byte Route101_MapConnections
-	.2byte MUS_DOORO1
-	.2byte 17
-	.byte MAPSEC_ROUTE_101
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
new file mode 100644
index 000000000..44d8b2137
--- /dev/null
+++ b/data/maps/Route101/map.json
@@ -0,0 +1,201 @@
+{
+  "id": "MAP_ROUTE101",
+  "name": "Route101",
+  "layout": "LAYOUT_ROUTE101",
+  "music": "MUS_DOORO1",
+  "region_map_section": "MAPSEC_ROUTE_101",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_OLDALE_TOWN"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_LITTLEROOT_TOWN"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 16,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101_EventScript_1EBDFB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+      "x": 9,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG",
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101_EventScript_1EBE16",
+      "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1",
+      "x": 10,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101_EventScript_272141",
+      "flag": "FLAG_HIDE_ROUTE_101_BIRCH"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 2,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101_EventScript_1EBE04",
+      "flag": "FLAG_HIDE_ROUTE_101_BOY"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "1",
+      "script": "Route101_EventScript_1EBCDE"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "1",
+      "script": "Route101_EventScript_1EBCDE"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "2",
+      "script": "Route101_EventScript_1EBD4E"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "2",
+      "script": "Route101_EventScript_1EBD4E"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 16,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "2",
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "2",
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "2",
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "2",
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_ROUTE101_STATE",
+      "var_value": "2",
+      "script": "Route101_EventScript_1EBD7A"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route101_EventScript_1EBE0D"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 15722a3f3..47663e1dd 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -1,6 +1,6 @@
 Route101_MapScripts:: @ 81EBCBA
-	map_script 3, Route101_MapScript1_1EBCC5
-	map_script 2, Route101_MapScript2_1EBCCB
+	map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB
 	.byte 0
 
 Route101_MapScript1_1EBCC5: @ 81EBCC5
@@ -8,12 +8,12 @@ Route101_MapScript1_1EBCC5: @ 81EBCC5
 	end
 
 Route101_MapScript2_1EBCCB: @ 81EBCCB
-	map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5
+	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5
 	.2byte 0
 
 Route101_EventScript_1EBCD5:: @ 81EBCD5
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x4060, 1
+	setflag FLAG_HIDE_MAP_NAME_POPUP
+	setvar VAR_ROUTE101_STATE, 1
 	end
 
 Route101_EventScript_1EBCDE:: @ 81EBCDE
@@ -30,14 +30,14 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE
 	applymovement 4, Route101_Movement_1EBD96
 	applymovement 2, Route101_Movement_1EBDC8
 	waitmovement 0
-	applymovement 2, Route101_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, Route101_Movement_1EBDBD
 	applymovement 2, Route101_Movement_1EBDEF
 	waitmovement 0
 	msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x4060, 2
+	setvar VAR_ROUTE101_STATE, 2
 	releaseall
 	end
 
@@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	fadescreen 1
 	removeobject 4
 	setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13
-	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	special ChooseStarter
 	waitstate
@@ -234,9 +234,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
-	setvar VAR_0x4084, 2
-	setvar VAR_0x4060, 3
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_BIRCH_LAB_STATE, 2
+	setvar VAR_ROUTE101_STATE, 3
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq Route101_EventScript_1EBE85
diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc
deleted file mode 100644
index 419cfeec9..000000000
--- a/data/maps/Route102/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route102_MapConnectionsList: @ 848682C
-	connection left, -10, MAP_PETALBURG_CITY
-	connection right, 0, MAP_OLDALE_TOWN
-
-Route102_MapConnections: @ 8486844
-	.4byte 0x2
-	.4byte Route102_MapConnectionsList
-
diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc
deleted file mode 100644
index b2299feea..000000000
--- a/data/maps/Route102/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Route102_EventObjects: @ 8527FD8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0
-	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_ITEM_ROUTE_102_POTION
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0
-
-Route102_MapBGEvents: @ 85280B0
-	bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3
-	bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA
-
-Route102_MapEvents:: @ 85280C8
-	map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents
-
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
deleted file mode 100644
index 7a0fcacda..000000000
--- a/data/maps/Route102/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route102: @ 8482694
-	.4byte Route102_Layout
-	.4byte Route102_MapEvents
-	.4byte Route102_MapScripts
-	.4byte Route102_MapConnections
-	.2byte MUS_DOORO1
-	.2byte 18
-	.byte MAPSEC_ROUTE_102
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json
new file mode 100644
index 000000000..7a6c6d963
--- /dev/null
+++ b/data/maps/Route102/map.json
@@ -0,0 +1,166 @@
+{
+  "id": "MAP_ROUTE102",
+  "name": "Route102",
+  "layout": "LAYOUT_ROUTE102",
+  "music": "MUS_DOORO1",
+  "region_map_section": "MAPSEC_ROUTE_102",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": -10,
+      "map": "MAP_PETALBURG_CITY"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_OLDALE_TOWN"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 18,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route102_EventScript_1EC0E1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 33,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route102_EventScript_1EC105",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 25,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route102_EventScript_1EC1B3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route102_EventScript_1EC1CA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 37,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route102_EventScript_1EC0FC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route102_EventScript_290CD8",
+      "flag": "FLAG_ITEM_ROUTE_102_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 24,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 25,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 19,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route102_EventScript_1EC1E1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route102_EventScript_1EC0F3"
+    },
+    {
+      "type": "sign",
+      "x": 40,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route102_EventScript_1EC0EA"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc
deleted file mode 100644
index 0759d872f..000000000
--- a/data/maps/Route103/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route103_MapConnectionsList: @ 848684C
-	connection down, 0, MAP_OLDALE_TOWN
-	connection right, -60, MAP_ROUTE110
-
-Route103_MapConnections: @ 8486864
-	.4byte 0x2
-	.4byte Route103_MapConnectionsList
-
diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
deleted file mode 100644
index 5a6cc8866..000000000
--- a/data/maps/Route103/events.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-Route103_EventObjects: @ 85280DC
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
-	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
-	object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
-	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
-	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH
-	object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13
-	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
-	object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
-	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
-	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP
-
-Route103_MapWarps: @ 85282BC
-	warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE
-
-Route103_MapBGEvents: @ 85282C4
-	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB
-
-Route103_MapEvents:: @ 85282D0
-	map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
-
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
deleted file mode 100644
index b614f32eb..000000000
--- a/data/maps/Route103/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route103: @ 84826B0
-	.4byte Route103_Layout
-	.4byte Route103_MapEvents
-	.4byte Route103_MapScripts
-	.4byte Route103_MapConnections
-	.2byte MUS_DOORO1
-	.2byte 19
-	.byte MAPSEC_ROUTE_103
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
new file mode 100644
index 000000000..6516e99dc
--- /dev/null
+++ b/data/maps/Route103/map.json
@@ -0,0 +1,309 @@
+{
+  "id": "MAP_ROUTE103",
+  "name": "Route103",
+  "layout": "LAYOUT_ROUTE103",
+  "music": "MUS_DOORO1",
+  "region_map_section": "MAPSEC_ROUTE_103",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_OLDALE_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": -60,
+      "map": "MAP_ROUTE110"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 49,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_1EC5E2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_1EC3C1",
+      "flag": "FLAG_HIDE_ROUTE_103_RIVAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 71,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route103_EventScript_1EC5F4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 65,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route103_EventScript_1EC66E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 64,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route103_EventScript_1EC60B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 50,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route103_EventScript_1EC6D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 58,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 59,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 60,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 20,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_1EC5D9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_272141",
+      "flag": "FLAG_HIDE_ROUTE_103_BIRCH"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 56,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route103_EventScript_1EC6E8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 50,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_290CE5",
+      "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 67,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_2906BB",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 72,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_2906BB",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 67,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route103_EventScript_1EC761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 67,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route103_EventScript_1EC74A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 36,
+      "y": 6,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route103_EventScript_1EC78F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 36,
+      "y": 13,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route103_EventScript_1EC778",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 64,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_290CF2",
+      "flag": "FLAG_ITEM_ROUTE_103_PP_UP"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 45,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_ALTERING_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route103_EventScript_1EC5EB"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index e13bad76d..f711416fd 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -1,10 +1,10 @@
 Route103_MapScripts:: @ 81EC38E
-	map_script 3, Route103_MapScript1_1EC399
-	map_script 1, Route103_MapScript1_1EC3A4
+	map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399
+	map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4
 	.byte 0
 
 Route103_MapScript1_1EC399: @ 81EC399
-	call Route103_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	call Route103_EventScript_2720AD
 	end
 
@@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
 	msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_GIRL_SUP, 1
-	applymovement 2, Route103_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement 2, Route103_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Route103_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
@@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434
 	msgbox Route103_Text_1EC989, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_BOY_SUP, 1
-	applymovement 2, Route103_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement 2, Route103_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Route103_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
@@ -140,10 +140,10 @@ Route103_EventScript_1EC585:: @ 81EC585
 
 Route103_EventScript_1EC5A2:: @ 81EC5A2
 	removeobject 2
-	setvar VAR_0x4084, 4
+	setvar VAR_BIRCH_LAB_STATE, 4
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
 	setflag FLAG_DEFEATED_RIVAL_ROUTE103
-	setvar VAR_0x40C7, 1
+	setvar VAR_OLDALE_STATE, 1
 	clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	savebgm MUS_DUMMY
 	fadedefaultbgm
diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc
deleted file mode 100644
index ce605c828..000000000
--- a/data/maps/Route104/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route104_MapConnectionsList: @ 848686C
-	connection up, 0, MAP_RUSTBORO_CITY
-	connection down, 0, MAP_ROUTE105
-	connection right, 50, MAP_PETALBURG_CITY
-
-Route104_MapConnections: @ 8486890
-	.4byte 0x3
-	.4byte Route104_MapConnectionsList
-
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc
deleted file mode 100644
index 53e868559..000000000
--- a/data/maps/Route104/events.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-Route104_EventObjects: @ 85282E4
-	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0
-	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0
-	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
-	object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY
-	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0
-	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, BerryTreeScript, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0
-	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0
-	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0
-	object_event 16, EVENT_OBJ_GFX_EXPERT_F, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0
-	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0
-	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0
-	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0
-	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, FLAG_ITEM_ROUTE_104_PP_UP
-	object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
-	object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0
-	object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0
-	object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0
-	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, FLAG_ITEM_ROUTE_104_POKE_BALL
-	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, FLAG_ITEM_ROUTE_104_X_ACCURACY
-	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, FLAG_TEMP_11
-	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION
-	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0
-	object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0
-	object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL
-
-Route104_MapWarps: @ 8528614
-	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_MapCoordEvents: @ 8528654
-	coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3
-
-Route104_MapBGEvents: @ 8528664
-	bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018
-	bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021
-	bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A
-	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033
-	bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C
-	bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION
-	bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL
-	bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION
-	bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE
-	bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE
-
-Route104_MapEvents:: @ 85286DC
-	map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents
-
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
deleted file mode 100644
index 101e690d5..000000000
--- a/data/maps/Route104/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104: @ 84826CC
-	.4byte Route104_Layout
-	.4byte Route104_MapEvents
-	.4byte Route104_MapScripts
-	.4byte Route104_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 20
-	.byte MAPSEC_ROUTE_104
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
new file mode 100644
index 000000000..e14a73c29
--- /dev/null
+++ b/data/maps/Route104/map.json
@@ -0,0 +1,627 @@
+{
+  "id": "MAP_ROUTE104",
+  "name": "Route104",
+  "layout": "LAYOUT_ROUTE104",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_104",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_RUSTBORO_CITY"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE105"
+    },
+    {
+      "direction": "right",
+      "offset": 50,
+      "map": "MAP_PETALBURG_CITY"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 15,
+      "y": 60,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED00F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 25,
+      "y": 49,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED006",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 31,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route104_EventScript_1ED38D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 27,
+      "y": 63,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED045",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 30,
+      "y": 50,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED04E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 28,
+      "y": 74,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED090",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT",
+      "x": 12,
+      "y": 54,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 12,
+      "y": 51,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 29,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED35F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 34,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "8",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 35,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "9",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 36,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "10",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 22,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "11",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 23,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "12",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 24,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "13",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 37,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ECF8C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 3,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 3,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 3,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "75",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 3,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "76",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 39,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_290CFF",
+      "flag": "FLAG_ITEM_ROUTE_104_PP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 8,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ECFCD",
+      "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 27,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route104_EventScript_1ED597",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 28,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route104_EventScript_1ED5B6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 21,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route104_EventScript_1ED43B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 11,
+      "y": 44,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route104_EventScript_1ED4E9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 29,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_290D0C",
+      "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 18,
+      "y": 67,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT",
+      "movement_range_x": 5,
+      "movement_range_y": 6,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route104_EventScript_1ED376",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 37,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_290D19",
+      "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 35,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_290D26",
+      "flag": "FLAG_ITEM_ROUTE_104_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 5,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED057",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 15,
+      "y": 59,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ED5D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 17,
+      "y": 50,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_EventScript_1ECC9E",
+      "flag": "FLAG_HIDE_ROUTE_104_RIVAL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 50,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104_MR_BRINEYS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_WOODS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_WOODS",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 10,
+      "y": 38,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_WOODS",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 11,
+      "y": 38,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_WOODS",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 32,
+      "y": 42,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_WOODS",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 33,
+      "y": 42,
+      "elevation": 3,
+      "dest_map": "MAP_PETALBURG_WOODS",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 51,
+      "elevation": 3,
+      "var": "VAR_0x4063",
+      "var_value": "1",
+      "script": "Route104_EventScript_1ECCB3"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 20,
+      "y": 50,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route104_EventScript_1ED018"
+    },
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 66,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route104_EventScript_1ED021"
+    },
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route104_EventScript_1ED02A"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route104_EventScript_1ED033"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 23,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route104_EventScript_1ED03C"
+    },
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_SUPER_POTION",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION"
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "item": "ITEM_POKE_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 55,
+      "elevation": 3,
+      "item": "ITEM_POTION",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POTION"
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 72,
+      "elevation": 3,
+      "item": "ITEM_ANTIDOTE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 64,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index e904f69b7..1daa9e52c 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -1,10 +1,10 @@
 Route104_MapScripts:: @ 81ECC32
-	map_script 2, Route104_MapScript2_1ECC3D
-	map_script 3, Route104_MapScript1_1ECC4E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D
+	map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E
 	.byte 0
 
 Route104_MapScript2_1ECC3D: @ 81ECC3D
-	map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47
+	map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47
 	.2byte 0
 
 Route104_EventScript_1ECC47:: @ 81ECC47
@@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47
 	end
 
 Route104_MapScript1_1ECC4E: @ 81ECC4E
-	call Route104_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	call Route104_EventScript_1ECC78
 	call Route104_EventScript_1ECC5E
 	end
@@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74
 	return
 
 Route104_EventScript_1ECC78:: @ 81ECC78
-	compare VAR_0x408E, 1
+	compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
 	goto_if_ge Route104_EventScript_1ECC9D
 	goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D
 	goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D
@@ -42,16 +42,16 @@ Route104_EventScript_1ECC9D:: @ 81ECC9D
 Route104_EventScript_1ECC9E:: @ 81ECC9E
 	lockall
 	setvar VAR_0x8008, 1
-	applymovement 34, Route104_Movement_27259E
+	applymovement 34, Common_Movement_FacePlayer
 	waitmovement 0
 	goto Route104_EventScript_1ECD33
 
 Route104_EventScript_1ECCB3:: @ 81ECCB3
 	lockall
 	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
-	setvar VAR_0x405A, 8
+	setvar VAR_RUSTBORO_STATE, 8
 	setvar VAR_0x4063, 2
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 10
 	addobject 34
@@ -64,9 +64,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
 	setvar VAR_0x8008, 0
 	call Route104_EventScript_1E0DD1
 	playse SE_PIN
-	applymovement 34, Route104_Movement_272598
+	applymovement 34, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 34, Route104_Movement_27259A
+	applymovement 34, Common_Movement_Delay48
 	waitmovement 0
 	goto Route104_EventScript_1ECD33
 
@@ -270,7 +270,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C
 	msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT
 	giveitem_std ITEM_CHESTO_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104
 	msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT
 	release
@@ -288,7 +288,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD
 	msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT
 	giveitem_std ITEM_WHITE_HERB
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WHITE_HERB
 	release
 	end
@@ -341,7 +341,7 @@ Route104_EventScript_1ED057:: @ 81ED057
 	msgbox Route104_Text_1ED838, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM09
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM09
 	release
 	end
@@ -413,11 +413,11 @@ Route104_EventScript_1ED139:: @ 81ED139
 	call Route104_EventScript_2720A8
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	hideobjectat 7, MAP_ROUTE104
-	copyvar VAR_0x4096, VAR_0x8008
+	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
 	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
-	setvar VAR_0x408E, 0
+	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
 	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4
 	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE
 	end
diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc
deleted file mode 100644
index daee7759a..000000000
--- a/data/maps/Route104_MrBrineysHouse/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route104_MrBrineysHouse_EventObjects: @ 8533AD4
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
-	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO
-
-Route104_MrBrineysHouse_MapWarps: @ 8533B04
-	warp_def 5, 8, 0, 0, MAP_ROUTE104
-	warp_def 6, 8, 0, 0, MAP_ROUTE104
-
-Route104_MrBrineysHouse_MapEvents:: @ 8533B14
-	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
deleted file mode 100644
index c52a076de..000000000
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_MrBrineysHouse: @ 8483D70
-	.4byte Route104_MrBrineysHouse_Layout
-	.4byte Route104_MrBrineysHouse_MapEvents
-	.4byte Route104_MrBrineysHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S2
-	.2byte 102
-	.byte MAPSEC_ROUTE_104
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json
new file mode 100644
index 000000000..438d56b30
--- /dev/null
+++ b/data/maps/Route104_MrBrineysHouse/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE",
+  "name": "Route104_MrBrineysHouse",
+  "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE",
+  "music": "MUS_MACHI_S2",
+  "region_map_section": "MAPSEC_ROUTE_104",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_MrBrineysHouse_EventScript_229D67",
+      "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_MrBrineysHouse_EventScript_229E5D",
+      "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 17ed47206..8a4af48cd 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -1,10 +1,10 @@
 Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
-	map_script 3, Route104_MrBrineysHouse_MapScript1_229D34
+	map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34
 	.byte 0
 
 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
 	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
-	compare VAR_0x4090, 1
+	compare VAR_BRINEY_HOUSE_STATE, 1
 	call_if_eq Route104_MrBrineysHouse_EventScript_229D50
 	call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C
 	end
@@ -75,11 +75,11 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
 Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
 	msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT
 	call Route104_MrBrineysHouse_EventScript_271E95
-	setvar VAR_0x408E, 1
+	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
 	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
-	setvar VAR_0x405A, 8
+	setvar VAR_RUSTBORO_STATE, 8
 	setvar VAR_0x4063, 2
 	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
 	setflag FLAG_HIDE_ROUTE_104_RIVAL
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
deleted file mode 100644
index 52e57efc7..000000000
--- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0
-
-Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70
-	warp_def 2, 8, 0, 1, MAP_ROUTE104
-	warp_def 3, 8, 0, 1, MAP_ROUTE104
-
-Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80
-	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
deleted file mode 100644
index eaf073550..000000000
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_PrettyPetalFlowerShop: @ 8483D8C
-	.4byte Route104_PrettyPetalFlowerShop_Layout
-	.4byte Route104_PrettyPetalFlowerShop_MapEvents
-	.4byte Route104_PrettyPetalFlowerShop_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S2
-	.2byte 117
-	.byte MAPSEC_ROUTE_104
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json
new file mode 100644
index 000000000..9d3d30794
--- /dev/null
+++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
+  "name": "Route104_PrettyPetalFlowerShop",
+  "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
+  "music": "MUS_MACHI_S2",
+  "region_map_section": "MAPSEC_ROUTE_104",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 11,
+      "y": 6,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE104",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index e9af43d73..26dfe7f8a 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -1,5 +1,5 @@
 Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
-	map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_22A352
+	map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352
 	.byte 0
 
 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352
@@ -84,14 +84,14 @@ Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421
 Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482
 	msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT
 	random 8
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY
 	msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc
deleted file mode 100644
index 08976e5a8..000000000
--- a/data/maps/Route104_Prototype/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-Route104_Prototype_MapEvents:: @ 853DDC0
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
deleted file mode 100644
index 0de3a4b47..000000000
--- a/data/maps/Route104_Prototype/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_Prototype: @ 8485AF8
-	.4byte Route104_Prototype_Layout
-	.4byte Route104_Prototype_MapEvents
-	.4byte Route104_Prototype_MapScripts
-	.4byte 0x0
-	.2byte MUS_NEXTROAD
-	.2byte 287
-	.byte MAPSEC_ROUTE_104
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json
new file mode 100644
index 000000000..168cee142
--- /dev/null
+++ b/data/maps/Route104_Prototype/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_ROUTE104_PROTOTYPE",
+  "name": "Route104_Prototype",
+  "layout": "LAYOUT_ROUTE104_PROTOTYPE",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_104",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
deleted file mode 100644
index e66b3c841..000000000
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 853DDD4
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
deleted file mode 100644
index e72f9a606..000000000
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_PrototypePrettyPetalFlowerShop: @ 8485B14
-	.4byte Route104_PrettyPetalFlowerShop_Layout
-	.4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents
-	.4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts
-	.4byte 0x0
-	.2byte MUS_NEXTROAD
-	.2byte 117
-	.byte MAPSEC_ROUTE_104
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
new file mode 100644
index 000000000..f50dced01
--- /dev/null
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP",
+  "name": "Route104_PrototypePrettyPetalFlowerShop",
+  "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_104",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc
deleted file mode 100644
index ac03944b7..000000000
--- a/data/maps/Route105/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route105_MapConnectionsList: @ 8486898
-	connection up, 0, MAP_ROUTE104
-	connection down, 0, MAP_ROUTE106
-	connection dive, 0, MAP_UNDERWATER6
-
-Route105_MapConnections: @ 84868BC
-	.4byte 0x3
-	.4byte Route105_MapConnectionsList
-
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
deleted file mode 100644
index e22aa668c..000000000
--- a/data/maps/Route105/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route105_EventObjects: @ 85286F0
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON
-	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
-	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
-
-Route105_MapWarps: @ 85287B0
-	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
-
-Route105_MapBGEvents: @ 85287B8
-	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE
-	bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL
-
-Route105_MapEvents:: @ 85287D0
-	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
-
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
deleted file mode 100644
index 5c6b2fc15..000000000
--- a/data/maps/Route105/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route105: @ 84826E8
-	.4byte Route105_Layout
-	.4byte Route105_MapEvents
-	.4byte Route105_MapScripts
-	.4byte Route105_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 21
-	.byte MAPSEC_ROUTE_105
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
new file mode 100644
index 000000000..b42965229
--- /dev/null
+++ b/data/maps/Route105/map.json
@@ -0,0 +1,166 @@
+{
+  "id": "MAP_ROUTE105",
+  "name": "Route105",
+  "layout": "LAYOUT_ROUTE105",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_105",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE104"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE106"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER6"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 19,
+      "y": 60,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route105_EventScript_1EE261",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 27,
+      "y": 36,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+      "movement_range_x": 7,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route105_EventScript_1EE278",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 8,
+      "y": 45,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 7,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route105_EventScript_1EE28F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 19,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route105_EventScript_1EE2A6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 8,
+      "y": 73,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route105_EventScript_290D33",
+      "flag": "FLAG_ITEM_ROUTE_105_IRON"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 17,
+      "y": 48,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 7,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route105_EventScript_1EE24A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 4,
+      "y": 54,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route105_EventScript_1EE2BD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 4,
+      "y": 58,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route105_EventScript_1EE2D4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 20,
+      "elevation": 0,
+      "dest_map": "MAP_ISLAND_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 68,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 56,
+      "elevation": 3,
+      "item": "ITEM_BIG_PEARL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index b4213af5b..2b8ebe305 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -1,15 +1,15 @@
 Route105_MapScripts:: @ 81EE1DB
-	map_script 1, Route105_MapScript1_1EE1EB
-	map_script 3, Route105_MapScript1_1EE21E
-	map_script 2, Route105_MapScript2_1EE240
+	map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB
+	map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240
 	.byte 0
 
 Route105_MapScript1_1EE1EB: @ 81EE1EB
 	call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B
-	compare VAR_0x4037, 9
-	call_if_eq Route105_EventScript_2739AB
-	compare VAR_0x4037, 10
-	call_if_eq Route105_EventScript_273A18
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South
 	end
 
 Route105_EventScript_1EE20B:: @ 81EE20B
@@ -18,16 +18,16 @@ Route105_EventScript_1EE20B:: @ 81EE20B
 	return
 
 Route105_MapScript1_1EE21E: @ 81EE21E
-	compare VAR_0x4039, 1
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route105_EventScript_273D13
-	compare VAR_0x4037, 9
-	call_if_eq Route105_EventScript_273D17
-	compare VAR_0x4037, 10
-	call_if_eq Route105_EventScript_273D17
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
+	call_if_eq UnusualWeather_StartKyogreWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route105_MapScript2_1EE240: @ 81EE240
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route105_EventScript_1EE24A:: @ 81EE24A
diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc
deleted file mode 100644
index 18f181d2b..000000000
--- a/data/maps/Route106/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route106_MapConnectionsList: @ 84868C4
-	connection up, 0, MAP_ROUTE105
-	connection down, 60, MAP_DEWFORD_TOWN
-
-Route106_MapConnections: @ 84868DC
-	.4byte 0x2
-	.4byte Route106_MapConnectionsList
-
diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc
deleted file mode 100644
index 9ff0f41dd..000000000
--- a/data/maps/Route106/events.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-Route106_EventObjects: @ 85287E4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0
-	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0
-	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN
-
-Route106_MapWarps: @ 852885C
-	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
-
-Route106_MapBGEvents: @ 8528864
-	bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL
-	bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST
-	bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE
-	bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A
-
-Route106_MapEvents:: @ 8528894
-	map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
-
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
deleted file mode 100644
index f0f032b8b..000000000
--- a/data/maps/Route106/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route106: @ 8482704
-	.4byte Route106_Layout
-	.4byte Route106_MapEvents
-	.4byte Route106_MapScripts
-	.4byte Route106_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 22
-	.byte MAPSEC_ROUTE_106
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
new file mode 100644
index 000000000..93e98078b
--- /dev/null
+++ b/data/maps/Route106/map.json
@@ -0,0 +1,138 @@
+{
+  "id": "MAP_ROUTE106",
+  "name": "Route106",
+  "layout": "LAYOUT_ROUTE106",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_106",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE105"
+    },
+    {
+      "direction": "down",
+      "offset": 60,
+      "map": "MAP_DEWFORD_TOWN"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 18,
+      "y": 5,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+      "movement_range_x": 4,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route106_EventScript_1EE493",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 29,
+      "y": 10,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route106_EventScript_1EE4AA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 51,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route106_EventScript_1EE4C1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 65,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route106_EventScript_1EE523",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 29,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route106_EventScript_290D40",
+      "flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 48,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 41,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_POKE_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 53,
+      "y": 12,
+      "elevation": 0,
+      "item": "ITEM_STARDUST",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST"
+    },
+    {
+      "type": "hidden_item",
+      "x": 68,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE"
+    },
+    {
+      "type": "sign",
+      "x": 59,
+      "y": 13,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route106_EventScript_1EE48A"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc
deleted file mode 100644
index 04ad13b07..000000000
--- a/data/maps/Route107/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route107_MapConnectionsList: @ 84868E4
-	connection left, 0, MAP_DEWFORD_TOWN
-	connection right, 0, MAP_ROUTE108
-
-Route107_MapConnections: @ 84868FC
-	.4byte 0x2
-	.4byte Route107_MapConnectionsList
-
diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc
deleted file mode 100644
index b67e98384..000000000
--- a/data/maps/Route107/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route107_EventObjects: @ 85288A8
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route107_EventScript_1EE625, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0
-	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0
-
-Route107_MapEvents:: @ 8528950
-	map_events Route107_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
deleted file mode 100644
index a4ec264ea..000000000
--- a/data/maps/Route107/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route107: @ 8482720
-	.4byte Route107_Layout
-	.4byte Route107_MapEvents
-	.4byte Route107_MapScripts
-	.4byte Route107_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 23
-	.byte MAPSEC_ROUTE_107
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
new file mode 100644
index 000000000..3813f4795
--- /dev/null
+++ b/data/maps/Route107/map.json
@@ -0,0 +1,123 @@
+{
+  "id": "MAP_ROUTE107",
+  "name": "Route107",
+  "layout": "LAYOUT_ROUTE107",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_107",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_DEWFORD_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE108"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 41,
+      "y": 10,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route107_EventScript_1EE595",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 23,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP",
+      "movement_range_x": 6,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route107_EventScript_1EE5AC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 16,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route107_EventScript_1EE60E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 50,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route107_EventScript_1EE625",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 33,
+      "y": 4,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route107_EventScript_1EE63C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING",
+      "x": 32,
+      "y": 4,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route107_EventScript_1EE657",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 50,
+      "y": 5,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route107_EventScript_1EE672",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc
deleted file mode 100644
index f80d0ade2..000000000
--- a/data/maps/Route108/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route108_MapConnectionsList: @ 8486904
-	connection left, 0, MAP_ROUTE107
-	connection right, -40, MAP_ROUTE109
-
-Route108_MapConnections: @ 848691C
-	.4byte 0x2
-	.4byte Route108_MapConnectionsList
-
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc
deleted file mode 100644
index 094eb0bc7..000000000
--- a/data/maps/Route108/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Route108_EventObjects: @ 8528964
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
-	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE
-
-Route108_MapWarps: @ 8528A0C
-	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
-
-Route108_MapBGEvents: @ 8528A14
-	bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY
-
-Route108_MapEvents:: @ 8528A20
-	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
-
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
deleted file mode 100644
index 106fe3135..000000000
--- a/data/maps/Route108/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route108: @ 848273C
-	.4byte Route108_Layout
-	.4byte Route108_MapEvents
-	.4byte Route108_MapScripts
-	.4byte Route108_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 24
-	.byte MAPSEC_ROUTE_108
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
new file mode 100644
index 000000000..bb22c01e3
--- /dev/null
+++ b/data/maps/Route108/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_ROUTE108",
+  "name": "Route108",
+  "layout": "LAYOUT_ROUTE108",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_108",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE107"
+    },
+    {
+      "direction": "right",
+      "offset": -40,
+      "map": "MAP_ROUTE109"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 52,
+      "y": 13,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route108_EventScript_1EE68A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 35,
+      "y": 12,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route108_EventScript_1EE6B8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 13,
+      "y": 13,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route108_EventScript_1EE6A1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 8,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT",
+      "movement_range_x": 6,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route108_EventScript_1EE6CF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 41,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route108_EventScript_1EE6E6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 43,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route108_EventScript_1EE6FD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 42,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route108_EventScript_290D4D",
+      "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 29,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ABANDONED_SHIP_DECK",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 38,
+      "y": 14,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc
deleted file mode 100644
index 25a7a0e91..000000000
--- a/data/maps/Route109/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route109_MapConnectionsList: @ 8486924
-	connection up, 0, MAP_SLATEPORT_CITY
-	connection left, 40, MAP_ROUTE108
-
-Route109_MapConnections: @ 848693C
-	.4byte 0x2
-	.4byte Route109_MapConnectionsList
-
diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc
deleted file mode 100644
index 89ee11bb3..000000000
--- a/data/maps/Route109/events.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-Route109_EventObjects: @ 8528A34
-	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0
-	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0
-	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0
-	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0
-	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0
-	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, FLAG_ITEM_ROUTE_109_PP_UP
-	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0
-	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0
-	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0
-	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0
-	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0
-	object_event 16, EVENT_OBJ_GFX_POKEFAN_F, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0
-	object_event 17, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0
-	object_event 19, EVENT_OBJ_GFX_OLD_MAN, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0
-	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0
-	object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0
-	object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0
-	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION
-	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0
-
-Route109_MapWarps: @ 8528C74
-	warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE
-
-Route109_MapBGEvents: @ 8528C7C
-	bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B
-	bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34
-	bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE
-	bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1
-	bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL
-	bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER
-	bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2
-	bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3
-
-Route109_MapEvents:: @ 8528CDC
-	map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
deleted file mode 100644
index 045f42256..000000000
--- a/data/maps/Route109/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route109: @ 8482758
-	.4byte Route109_Layout
-	.4byte Route109_MapEvents
-	.4byte Route109_MapScripts
-	.4byte Route109_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 25
-	.byte MAPSEC_ROUTE_109
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
new file mode 100644
index 000000000..9bb4d21de
--- /dev/null
+++ b/data/maps/Route109/map.json
@@ -0,0 +1,417 @@
+{
+  "id": "MAP_ROUTE109",
+  "name": "Route109",
+  "layout": "LAYOUT_ROUTE109",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_109",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_SLATEPORT_CITY"
+    },
+    {
+      "direction": "left",
+      "offset": 40,
+      "map": "MAP_ROUTE108"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT",
+      "x": 21,
+      "y": 26,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 21,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_1EE910",
+      "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 12,
+      "y": 36,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route109_EventScript_1EEA3D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 25,
+      "y": 39,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route109_EventScript_1EEA54",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 15,
+      "y": 17,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route109_EventScript_1EEA6B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 24,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route109_EventScript_1EEA82",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M",
+      "x": 19,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route109_EventScript_1EEA99",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_F",
+      "x": 22,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route109_EventScript_1EEAFB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_1EE995",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 27,
+      "y": 46,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_290D5A",
+      "flag": "FLAG_ITEM_ROUTE_109_PP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_F",
+      "x": 29,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route109_EventScript_1EEB74",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_F",
+      "x": 28,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route109_EventScript_1EEB5D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 21,
+      "y": 56,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route109_EventScript_1EEB8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M",
+      "x": 24,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_1EE99E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_F",
+      "x": 25,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_1EE9B5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 30,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_1EEA06",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 8,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route109_EventScript_1EEBBD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 9,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route109_EventScript_1EEBA2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 33,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_1EEA0F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 32,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_1EEA18",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_F",
+      "x": 17,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route109_EventScript_1EEBEF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M",
+      "x": 27,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route109_EventScript_1EEBD8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 25,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_EventScript_290D67",
+      "flag": "FLAG_ITEM_ROUTE_109_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 17,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route109_EventScript_1EEC06",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE109_SEASHORE_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route109_EventScript_1EEA2B"
+    },
+    {
+      "type": "sign",
+      "x": 29,
+      "y": 10,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route109_EventScript_1EEA34"
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 23,
+      "elevation": 3,
+      "item": "ITEM_REVIVE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "item": "ITEM_GREAT_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 28,
+      "y": 20,
+      "elevation": 3,
+      "item": "ITEM_ETHER",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_ETHER"
+    },
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 16,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 8,
+      "y": 42,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index ebf9398d1..a036296e3 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -55,7 +55,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
 	hideobjectat 1, MAP_ROUTE109
 	msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT
 	closemessage
-	copyvar VAR_0x4096, VAR_0x8008
+	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
 	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
@@ -319,7 +319,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E
 	faceplayer
 	msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -332,9 +332,9 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
 	msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOFT_SAND
 	compare VAR_RESULT, 0
-	goto_if_eq Route109_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	closemessage
-	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_RECEIVED_SOFT_SAND
 	release
@@ -342,7 +342,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
 
 Route109_EventScript_1EE9F2:: @ 81EE9F2
 	msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc
deleted file mode 100644
index 0632596a9..000000000
--- a/data/maps/Route109_SeashoreHouse/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route109_SeashoreHouse_EventObjects: @ 853DDE8
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0
-	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0
-
-Route109_SeashoreHouse_MapWarps: @ 853DE48
-	warp_def 6, 9, 0, 0, MAP_ROUTE109
-	warp_def 7, 9, 0, 0, MAP_ROUTE109
-
-Route109_SeashoreHouse_MapEvents:: @ 853DE58
-	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
deleted file mode 100644
index 68dc54b77..000000000
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route109_SeashoreHouse: @ 8485B30
-	.4byte Route109_SeashoreHouse_Layout
-	.4byte Route109_SeashoreHouse_MapEvents
-	.4byte Route109_SeashoreHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_HIGHTOWN
-	.2byte 243
-	.byte MAPSEC_ROUTE_109
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json
new file mode 100644
index 000000000..3f293b291
--- /dev/null
+++ b/data/maps/Route109_SeashoreHouse/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_ROUTE109_SEASHORE_HOUSE",
+  "name": "Route109_SeashoreHouse",
+  "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE",
+  "music": "MUS_HIGHTOWN",
+  "region_map_section": "MAPSEC_ROUTE_109",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route109_SeashoreHouse_EventScript_2693FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route109_SeashoreHouse_EventScript_2694E2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route109_SeashoreHouse_EventScript_269518",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route109_SeashoreHouse_EventScript_2694FD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE109",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE109",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index 951356409..ed27e32ff 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route109_SeashoreHouse_MapScripts:: @ 82693F4
-	map_script 3, Route109_SeashoreHouse_MapScript1_2693FA
+	map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA
 	.byte 0
 
 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA
@@ -75,7 +75,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8
 	end
 
 Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox
 	nop
 	nop
diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc
deleted file mode 100644
index 22000354f..000000000
--- a/data/maps/Route110/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route110_MapConnectionsList: @ 8486944
-	connection up, 0, MAP_MAUVILLE_CITY
-	connection down, 0, MAP_SLATEPORT_CITY
-	connection left, 60, MAP_ROUTE103
-
-Route110_MapConnections: @ 8486968
-	.4byte 0x3
-	.4byte Route110_MapConnectionsList
-
diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc
deleted file mode 100644
index b50e5eec6..000000000
--- a/data/maps/Route110/events.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-Route110_EventObjects: @ 8528CF0
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0
-	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0
-	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF314, 0
-	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0
-	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0
-	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF302, 0
-	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_1EF529, 0
-	object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0
-	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_1EF540, 0
-	object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0
-	object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0
-	object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_1EF409, 0
-	object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 1, 4, Route110_EventScript_1EF420, 0
-	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_1EF482, 0
-	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0
-	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0
-	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, FLAG_ITEM_ROUTE_110_DIRE_HIT
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, FLAG_ITEM_ROUTE_109_RARE_CANDY
-	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0
-	object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, FLAG_HIDE_ROUTE_110_TEAM_AQUA
-	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, FLAG_HIDE_ROUTE_110_TEAM_AQUA
-	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, FLAG_HIDE_ROUTE_110_TEAM_AQUA
-	object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, FLAG_HIDE_ROUTE_110_TEAM_AQUA
-	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_TEAM_AQUA
-	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0
-	object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_1
-	object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_2
-	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0
-	object_event 31, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0
-	object_event 32, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0
-	object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0
-	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0
-	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR
-	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH
-
-Route110_MapWarps: @ 8529050
-	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_SOUTH_ENTRANCE
-	warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
-	warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
-	warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
-
-Route110_MapCoordEvents: @ 8529080
-	coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
-	coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
-	coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D
-	coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758
-	coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763
-	coord_event 7, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9CB
-	coord_event 8, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9D6
-	coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1
-	coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC
-
-Route110_MapBGEvents: @ 8529110
-	bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353
-	bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365
-	bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A
-	bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF341
-	bg_event 7, 79, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF35C
-	bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF36E
-	bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1
-	bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1
-	bg_event 33, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF377
-	bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380
-	bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389
-	bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392
-	bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE
-	bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL
-	bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL
-	bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL
-	bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A
-
-Route110_MapEvents:: @ 85291DC
-	map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
-
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
deleted file mode 100644
index 14194cd37..000000000
--- a/data/maps/Route110/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110: @ 8482774
-	.4byte Route110_Layout
-	.4byte Route110_MapEvents
-	.4byte Route110_MapScripts
-	.4byte Route110_MapConnections
-	.2byte MUS_DOORO_X1
-	.2byte 26
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
new file mode 100644
index 000000000..a9ac7796a
--- /dev/null
+++ b/data/maps/Route110/map.json
@@ -0,0 +1,765 @@
+{
+  "id": "MAP_ROUTE110",
+  "name": "Route110",
+  "layout": "LAYOUT_ROUTE110",
+  "music": "MUS_DOORO_X1",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_MAUVILLE_CITY"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_SLATEPORT_CITY"
+    },
+    {
+      "direction": "left",
+      "offset": 60,
+      "map": "MAP_ROUTE103"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 17,
+      "y": 90,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF338",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 29,
+      "y": 79,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF32F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 14,
+      "y": 69,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF326",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 9,
+      "y": 57,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF314",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF31D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F",
+      "x": 27,
+      "y": 24,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF30B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 15,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF302",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F",
+      "x": 16,
+      "y": 73,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT",
+      "movement_range_x": 2,
+      "movement_range_y": 14,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route110_EventScript_1EF529",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 19,
+      "y": 31,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN",
+      "movement_range_x": 10,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route110_EventScript_1EF4B0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F",
+      "x": 30,
+      "y": 31,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route110_EventScript_1EF540",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 16,
+      "y": 55,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT",
+      "movement_range_x": 4,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route110_EventScript_1EF4C7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 3,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route110_EventScript_1EF3F2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 33,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_EventScript_1EF409",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 34,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route110_EventScript_1EF420",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_EventScript_1EF482",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "16",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 6,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "17",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 7,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "18",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 30,
+      "y": 69,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_290D81",
+      "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 26,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_290D74",
+      "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 27,
+      "y": 92,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF3B7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 7,
+      "y": 83,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF2AA",
+      "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 8,
+      "y": 83,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF2C0",
+      "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 9,
+      "y": 83,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF2D6",
+      "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 10,
+      "y": 83,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_1EF2EC",
+      "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 8,
+      "y": 82,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 21,
+      "y": 78,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN",
+      "movement_range_x": 7,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_EventScript_1EF499",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 34,
+      "y": 54,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 34,
+      "y": 54,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 33,
+      "y": 69,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route110_EventScript_1EF604",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 10,
+      "y": 76,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_EventScript_1EF5A2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 7,
+      "y": 76,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_EventScript_1EF61C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F",
+      "x": 10,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route110_EventScript_1EF64A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 36,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route110_EventScript_1EF633",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_EventScript_290D8E",
+      "flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+      "x": 9,
+      "y": 79,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_110_BIRCH"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 35,
+      "y": 24,
+      "elevation": 3,
+      "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 66,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 18,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 16,
+      "y": 88,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 88,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 28,
+      "y": 92,
+      "elevation": 3,
+      "var": "VAR_CYCLING_CHALLENGE_STATE",
+      "var_value": "2",
+      "script": "Route110_EventScript_1EF661"
+    },
+    {
+      "type": "trigger",
+      "x": 29,
+      "y": 92,
+      "elevation": 3,
+      "var": "VAR_CYCLING_CHALLENGE_STATE",
+      "var_value": "2",
+      "script": "Route110_EventScript_1EF661"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 56,
+      "elevation": 3,
+      "var": "VAR_ROUTE110_STATE",
+      "var_value": "0",
+      "script": "Route110_EventScript_1EF74D"
+    },
+    {
+      "type": "trigger",
+      "x": 34,
+      "y": 56,
+      "elevation": 3,
+      "var": "VAR_ROUTE110_STATE",
+      "var_value": "0",
+      "script": "Route110_EventScript_1EF758"
+    },
+    {
+      "type": "trigger",
+      "x": 35,
+      "y": 56,
+      "elevation": 3,
+      "var": "VAR_ROUTE110_STATE",
+      "var_value": "0",
+      "script": "Route110_EventScript_1EF763"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 85,
+      "elevation": 3,
+      "var": "VAR_0x40DA",
+      "var_value": "1",
+      "script": "Route110_EventScript_1EF9CB"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 85,
+      "elevation": 3,
+      "var": "VAR_0x40DA",
+      "var_value": "1",
+      "script": "Route110_EventScript_1EF9D6"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 85,
+      "elevation": 3,
+      "var": "VAR_0x40DA",
+      "var_value": "1",
+      "script": "Route110_EventScript_1EF9E1"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 85,
+      "elevation": 3,
+      "var": "VAR_0x40DA",
+      "var_value": "1",
+      "script": "Route110_EventScript_1EF9EC"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 25,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF353"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF365"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 88,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF34A"
+    },
+    {
+      "type": "sign",
+      "x": 20,
+      "y": 94,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF341"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 79,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF35C"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 17,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF36E"
+    },
+    {
+      "type": "secret_base",
+      "x": 16,
+      "y": 25,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE3_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 17,
+      "y": 25,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE4_1"
+    },
+    {
+      "type": "sign",
+      "x": 33,
+      "y": 39,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF377"
+    },
+    {
+      "type": "sign",
+      "x": 37,
+      "y": 70,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF380"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 67,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF389"
+    },
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 93,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF392"
+    },
+    {
+      "type": "hidden_item",
+      "x": 35,
+      "y": 39,
+      "elevation": 3,
+      "item": "ITEM_REVIVE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 33,
+      "y": 45,
+      "elevation": 3,
+      "item": "ITEM_GREAT_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 4,
+      "y": 35,
+      "elevation": 3,
+      "item": "ITEM_POKE_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 37,
+      "y": 67,
+      "elevation": 3,
+      "item": "ITEM_FULL_HEAL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_EventScript_1EF34A"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index 7c98cc603..cddfbebcc 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -1,7 +1,7 @@
 Route110_MapScripts:: @ 81EF269
-	map_script 5, Route110_MapScript1_1EF279
-	map_script 3, Route110_MapScript1_1EF27D
-	map_script 2, Route110_MapScript2_1EF297
+	map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_1EF27D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297
 	.byte 0
 
 Route110_MapScript1_1EF279: @ 81EF279
@@ -9,8 +9,8 @@ Route110_MapScript1_1EF279: @ 81EF279
 	end
 
 Route110_MapScript1_1EF27D: @ 81EF27D
-	call Route110_EventScript_271ED7
-	call Route110_EventScript_271EFB
+	call Common_EventScript_SetupRivalGender
+	call Common_EventScript_SetupRivalOnBikeGender
 	compare VAR_CYCLING_CHALLENGE_STATE, 1
 	call_if_eq Route110_EventScript_1EF293
 	end
@@ -32,7 +32,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA
 	lock
 	faceplayer
 	msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -41,7 +41,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0
 	lock
 	faceplayer
 	msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -50,7 +50,7 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6
 	lock
 	faceplayer
 	msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -59,7 +59,7 @@ Route110_EventScript_1EF2EC:: @ 81EF2EC
 	lock
 	faceplayer
 	msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A
 
 Route110_EventScript_1EF661:: @ 81EF661
 	lockall
-	applymovement 21, Route110_Movement_2725A8
+	applymovement 21, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	call Route110_EventScript_1EF673
 	releaseall
@@ -383,11 +383,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E
 	call_if_eq Route110_EventScript_1EF7E1
 	compare VAR_RESULT, FEMALE
 	call_if_eq Route110_EventScript_1EF7E6
-	applymovement 28, Route110_Movement_2725AA
+	applymovement 28, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	applymovement 28, Route110_Movement_272598
+	applymovement 28, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 28, Route110_Movement_27259A
+	applymovement 28, Common_Movement_Delay48
 	waitmovement 0
 	delay 30
 	compare VAR_0x8008, 1
@@ -496,7 +496,7 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC
 	compare VAR_0x8008, 3
 	call_if_eq Route110_EventScript_1EF985
 	removeobject 29
-	setvar VAR_0x4069, 1
+	setvar VAR_ROUTE110_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
@@ -616,9 +616,9 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
 	applymovement 36, Route110_Movement_1EFB30
 	waitmovement 0
 	playse SE_PIN
-	applymovement 36, Route110_Movement_272598
+	applymovement 36, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 36, Route110_Movement_27259A
+	applymovement 36, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
 	call_if_eq Route110_EventScript_1EFAD8
@@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
 	msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	applymovement 36, Route110_Movement_2725A4
+	applymovement 36, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 10
-	applymovement 36, Route110_Movement_2725A8
+	applymovement 36, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 20
-	applymovement 36, Route110_Movement_2725AA
+	applymovement 36, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
deleted file mode 100644
index ee7f5ef17..000000000
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0
-
-Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8
-	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_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8
-	coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84
-	coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6
-
-Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8
-	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
deleted file mode 100644
index 50f4b763f..000000000
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80
-	.4byte Route110_SeasideCyclingRoadEntrance_Layout
-	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents
-	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 256
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
new file mode 100644
index 000000000..b692426fd
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+  "name": "Route110_SeasideCyclingRoadNorthEntrance",
+  "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "1",
+      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
deleted file mode 100644
index 8d10ce499..000000000
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0
-
-Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24
-	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_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44
-	coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0
-	coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13
-
-Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64
-	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
deleted file mode 100644
index 4e09eeef3..000000000
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C
-	.4byte Route110_SeasideCyclingRoadEntrance_Layout
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 256
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
new file mode 100644
index 000000000..dcc9029e5
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+  "name": "Route110_SeasideCyclingRoadSouthEntrance",
+  "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "1",
+      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
index a993364e6..1d353dcdd 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
@@ -1,5 +1,5 @@
 Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
-	map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7
 	.byte 0
 
 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7
diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc
deleted file mode 100644
index e9d84d56b..000000000
--- a/data/maps/Route110_TrickHouseCorridor/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route110_TrickHouseCorridor_MapWarps: @ 853DF54
-	warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END
-	warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END
-	warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-
-Route110_TrickHouseCorridor_MapEvents:: @ 853DF74
-	map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
deleted file mode 100644
index 6657162b7..000000000
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHouseCorridor: @ 8485B84
-	.4byte Route110_TrickHouseCorridor_Layout
-	.4byte Route110_TrickHouseCorridor_MapEvents
-	.4byte Route110_TrickHouseCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 246
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json
new file mode 100644
index 000000000..a488e9661
--- /dev/null
+++ b/data/maps/Route110_TrickHouseCorridor/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR",
+  "name": "Route110_TrickHouseCorridor",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index cf520c81f..996f9d605 100644
--- a/data/maps/Route110_TrickHouseCorridor/scripts.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
@@ -1,8 +1,8 @@
 Route110_TrickHouseCorridor_MapScripts:: @ 826B903
-	map_script 3, Route110_TrickHouseCorridor_MapScript1_26B909
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_26B909
 	.byte 0
 
 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909
-	setvar VAR_0x40B5, 1
+	setvar VAR_TRICK_HOUSE_STATE, 1
 	end
 
diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc
deleted file mode 100644
index 1e371bbbe..000000000
--- a/data/maps/Route110_TrickHouseEnd/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_TrickHouseEnd_EventObjects: @ 853DEFC
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN
-
-Route110_TrickHouseEnd_MapWarps: @ 853DF14
-	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: @ 853DF24
-	coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041
-
-Route110_TrickHouseEnd_MapBGEvents: @ 853DF34
-	bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET
-
-Route110_TrickHouseEnd_MapEvents:: @ 853DF40
-	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
deleted file mode 100644
index 52a39914f..000000000
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHouseEnd: @ 8485B68
-	.4byte Route110_TrickHouseEnd_Layout
-	.4byte Route110_TrickHouseEnd_MapEvents
-	.4byte Route110_TrickHouseEnd_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 245
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json
new file mode 100644
index 000000000..62548fe8b
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_END",
+  "name": "Route110_TrickHouseEnd",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHouseEnd_EventScript_26AD17",
+      "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHouseEnd_EventScript_26B041"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_NUGGET",
+      "flag": "FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 8326a7c02..7902cb95d 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -1,8 +1,8 @@
 Route110_TrickHouseEnd_MapScripts:: @ 826ACAF
-	map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4
-	map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0
-	map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5
-	map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_26ACD0
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE
 	.byte 0
 
 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4
@@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
 Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
 	msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_RARE_CANDY
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
 Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
 	msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TIMER_BALL
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
 Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
 	msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_HARD_STONE
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
 Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
 	msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_SMOKE_BALL
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
 Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
 	msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TM12
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
 Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
 	msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_MAGNET
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
 Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
 	msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_PP_MAX
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -161,11 +161,11 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
 	delay 30
 	msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route110_TrickHouseEnd_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 30
 	msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	call Route110_TrickHouseEnd_EventScript_26AFA5
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26B002
@@ -200,34 +200,34 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
 	return
 
 Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
-	call Route110_TrickHouseEnd_EventScript_27205E
+	call Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 1
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
-	call Route110_TrickHouseEnd_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 1
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -235,13 +235,13 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
 	lockall
 	turnobject 1, 3
 	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEnd_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 20
 	applymovement 1, Route110_TrickHouseEnd_Movement_26B08B
 	waitmovement 0
 	playse SE_W153
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc
deleted file mode 100644
index ff83f0bdb..000000000
--- a/data/maps/Route110_TrickHouseEntrance/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route110_TrickHouseEntrance_EventObjects: @ 853DE6C
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
-
-Route110_TrickHouseEntrance_MapWarps: @ 853DE84
-	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: @ 853DE9C
-	coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-	coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-	coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-	coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-
-Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC
-	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3
-
-Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8
-	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
deleted file mode 100644
index 4e651e5f9..000000000
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHouseEntrance: @ 8485B4C
-	.4byte Route110_TrickHouseEntrance_Layout
-	.4byte Route110_TrickHouseEntrance_MapEvents
-	.4byte Route110_TrickHouseEntrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 244
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json
new file mode 100644
index 000000000..ce188feec
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+  "name": "Route110_TrickHouseEntrance",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHouseEntrance_EventScript_269D3B",
+      "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var_value": "0",
+      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var_value": "0",
+      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var_value": "0",
+      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var_value": "0",
+      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Route110_TrickHouseEntrance_EventScript_26A0D3"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index b2aa22f6c..a83d50dc3 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -1,24 +1,24 @@
 Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
-	map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60
-	map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE
-	map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3
 	.byte 0
 
 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
 	setflag FLAG_LANDMARK_TRICK_HOUSE
-	compare VAR_0x40B5, 1
+	compare VAR_TRICK_HOUSE_STATE, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
-	compare VAR_0x40C1, 1
+	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7
-	compare VAR_0x40A6, 1
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3
-	compare VAR_0x40A7, 5
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_0x40A7, 3
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_0x40A7, 0
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	switch VAR_0x40A7
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
 	case 0, Route110_TrickHouseEntrance_EventScript_269BBB
 	case 1, Route110_TrickHouseEntrance_EventScript_269BC1
 	case 3, Route110_TrickHouseEntrance_EventScript_269BC7
@@ -26,24 +26,24 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
 	end
 
 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	compare VAR_0x4044, 8
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
-	setvar VAR_0x40A7, 2
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
 	end
 
 Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED
-	setvar VAR_0x40A7, 6
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
 	end
 
 Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
-	setvar VAR_0x40B5, 0
-	setvar VAR_0x40A7, 5
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_STATE, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
-	setvar VAR_0x40A7, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
 	compare VAR_0x4044, 1
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
 	compare VAR_0x4044, 2
@@ -91,11 +91,11 @@ Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D
 	return
 
 Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7
-	setvar VAR_0x40A7, 4
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
 	return
 
 Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD
-	setvar VAR_0x40A7, 3
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
 	return
 
 Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
@@ -103,30 +103,30 @@ Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB
-	setvar VAR_0x40A5, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
-	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15
-	map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26
-	map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF
 	.2byte 0
 
 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
@@ -199,7 +199,7 @@ Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
 	end
 
 Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
-	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8
 	.2byte 0
 
 Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
@@ -216,8 +216,8 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
 	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
 	waitmovement 0
 	removeobject 1
-	setvar VAR_0x40A7, 1
-	setvar VAR_0x40A6, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
 	releaseall
 	end
 
@@ -227,7 +227,7 @@ Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
 
 Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
 	lockall
-	switch VAR_0x40A7
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
 	case 0, Route110_TrickHouseEntrance_EventScript_269D6E
 	case 2, Route110_TrickHouseEntrance_EventScript_269E8F
 	case 3, Route110_TrickHouseEntrance_EventScript_269E51
@@ -236,9 +236,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
 
 Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
 	playse SE_PIN
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x4044, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE
@@ -257,7 +257,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
 	compare VAR_0x4044, 7
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
 	closemessage
-	setvar VAR_0x40A6, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
 	warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
 	waitstate
 	releaseall
@@ -326,21 +326,21 @@ Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
 Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
 	msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEntrance_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT
-	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT
 	compare VAR_0x4044, 1
@@ -364,7 +364,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
+	call_if_eq Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -374,7 +374,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
+	call_if_eq Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -384,7 +384,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
+	call_if_eq Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -394,7 +394,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
+	call_if_eq Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -404,7 +404,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
+	call_if_eq Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -414,7 +414,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
+	call_if_eq Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -424,28 +424,28 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_27205E
+	call_if_eq Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
-	setvar VAR_0x40C1, 0
-	setvar VAR_0x40A7, 3
-	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT
 	call Route110_TrickHouseEntrance_EventScript_26A070
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_272071
+	call_if_eq Common_EventScript_NoRoomLeftForAnother
 	msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -475,14 +475,14 @@ Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
 	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
 	waitmovement 0
 	removeobject 1
-	setvar VAR_0x40C1, 0
-	setvar VAR_0x40A7, 5
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
 	lockall
-	switch VAR_0x40A7
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
 	case 0, Route110_TrickHouseEntrance_EventScript_26A106
 	case 1, Route110_TrickHouseEntrance_EventScript_26A110
 	case 4, Route110_TrickHouseEntrance_EventScript_26A201
@@ -604,88 +604,88 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
-	compare VAR_0x40AB, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AB, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
-	compare VAR_0x40AC, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AC, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
-	compare VAR_0x40AD, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AD, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
-	compare VAR_0x40AE, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AE, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
-	compare VAR_0x40AF, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AF, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
-	compare VAR_0x40B0, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40B0, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
-	compare VAR_0x40B1, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40B1, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
-	compare VAR_0x40B2, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40B2, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
@@ -733,7 +733,7 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
 	call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
 	compare VAR_0x4044, 2
 	call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429
diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc
deleted file mode 100644
index 02dfa58bc..000000000
--- a/data/maps/Route110_TrickHousePuzzle1/events.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-Route110_TrickHousePuzzle1_EventObjects: @ 853DF88
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0
-	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_13
-	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_12
-	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_14
-	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_17
-	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_16
-	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_15
-	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_19
-	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_18
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1B
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E
-
-Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0
-	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: @ 853E108
-	bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B
-
-Route110_TrickHousePuzzle1_MapEvents:: @ 853E114
-	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
deleted file mode 100644
index de4ff3ed2..000000000
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle1: @ 8485BA0
-	.4byte Route110_TrickHousePuzzle1_Layout
-	.4byte Route110_TrickHousePuzzle1_MapEvents
-	.4byte Route110_TrickHousePuzzle1_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 247
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json
new file mode 100644
index 000000000..849e74b62
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle1/map.json
@@ -0,0 +1,247 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1",
+  "name": "Route110_TrickHousePuzzle1",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 14,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route110_TrickHousePuzzle1_EventScript_26B948",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 14,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_TrickHousePuzzle1_EventScript_26B95F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 2,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_TrickHousePuzzle1_EventScript_26B976",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 11,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 13,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 14,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_17"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 11,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_19"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_18"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_1B"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_29140E",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_1C"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 2,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "flag": "FLAG_TEMP_1E"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle1_EventScript_26B92B"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index b34a9d555..73526d3ee 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F
-	map_script 1, Route110_TrickHousePuzzle1_MapScript1_26B915
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915
 	.byte 0
 
 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915
-	compare VAR_0x40AB, 2
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921
 	end
 
@@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921
 
 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B
 	lockall
-	compare VAR_0x40AB, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D
 	goto Route110_TrickHousePuzzle1_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D
-	setvar VAR_0x40AB, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1
 	goto Route110_TrickHousePuzzle1_EventScript_26A3E5
 	end
 
diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc
deleted file mode 100644
index e49d391e6..000000000
--- a/data/maps/Route110_TrickHousePuzzle2/events.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route110_TrickHousePuzzle2_EventObjects: @ 853E128
-	object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL
-
-Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0
-	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: @ 853E1B8
-	coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD
-	coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0
-	coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03
-	coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16
-
-Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8
-	bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0
-
-Route110_TrickHousePuzzle2_MapEvents:: @ 853E204
-	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
deleted file mode 100644
index 8a2b708ea..000000000
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle2: @ 8485BBC
-	.4byte Route110_TrickHousePuzzle2_Layout
-	.4byte Route110_TrickHousePuzzle2_MapEvents
-	.4byte Route110_TrickHousePuzzle2_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 248
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json
new file mode 100644
index 000000000..9903231e7
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle2/map.json
@@ -0,0 +1,154 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2",
+  "name": "Route110_TrickHousePuzzle2",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BC75",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 10,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 8,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle2_EventScript_291428",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle2_EventScript_29141B",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD"
+    },
+    {
+      "type": "trigger",
+      "x": 0,
+      "y": 4,
+      "elevation": 0,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BC03"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_TEMP_4",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BC16"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle2_EventScript_26BBC0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index 560d10060..2c8ef8cb0 100644
--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -1,6 +1,6 @@
 Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73
-	map_script 5, Route110_TrickHousePuzzle2_MapScript1_26BB7E
-	map_script 3, Route110_TrickHousePuzzle2_MapScript1_26BBAB
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_26BBAB
 	.byte 0
 
 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E
@@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB
 
 Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0
 	lockall
-	compare VAR_0x40AC, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2
 	goto Route110_TrickHousePuzzle2_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2
-	setvar VAR_0x40AC, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1
 	goto Route110_TrickHousePuzzle2_EventScript_26A3E5
 	end
 
diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc
deleted file mode 100644
index 118667076..000000000
--- a/data/maps/Route110_TrickHousePuzzle3/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-Route110_TrickHousePuzzle3_EventObjects: @ 853E218
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0
-	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0
-	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16
-
-Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0
-	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: @ 853E2D8
-	coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD
-	coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9
-	coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5
-	coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1
-
-Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318
-	bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7
-
-Route110_TrickHousePuzzle3_MapEvents:: @ 853E324
-	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
deleted file mode 100644
index 37a517f72..000000000
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle3: @ 8485BD8
-	.4byte Route110_TrickHousePuzzle3_Layout
-	.4byte Route110_TrickHousePuzzle3_MapEvents
-	.4byte Route110_TrickHousePuzzle3_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 249
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json
new file mode 100644
index 000000000..22807b80b
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -0,0 +1,180 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3",
+  "name": "Route110_TrickHousePuzzle3",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 7,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_291442",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_291435",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 1,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 2,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
+      "flag": "FLAG_TEMP_16"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 14,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_TEMP_4",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle3_EventScript_26C5A7"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index b26c5473d..d93ef95e8 100644
--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -1,6 +1,6 @@
 Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8
-	map_script 5, Route110_TrickHousePuzzle3_MapScript1_26BEE3
-	map_script 3, Route110_TrickHousePuzzle3_MapScript1_26BEFF
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_26BEFF
 	.byte 0
 
 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3
@@ -291,13 +291,13 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0
 
 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7
 	lockall
-	compare VAR_0x40AD, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9
 	goto Route110_TrickHousePuzzle3_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9
-	setvar VAR_0x40AD, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1
 	goto Route110_TrickHousePuzzle3_EventScript_26A3E5
 	end
 
diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc
deleted file mode 100644
index 4bad58814..000000000
--- a/data/maps/Route110_TrickHousePuzzle4/events.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-Route110_TrickHousePuzzle4_EventObjects: @ 853E338
-	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_11
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_12
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_13
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_14
-	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_15
-	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_16
-	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_17
-	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_18
-	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19
-	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A
-
-Route110_TrickHousePuzzle4_MapWarps: @ 853E488
-	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: @ 853E4A0
-	bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861
-
-Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC
-	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
deleted file mode 100644
index 993f002d7..000000000
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle4: @ 8485BF4
-	.4byte Route110_TrickHousePuzzle4_Layout
-	.4byte Route110_TrickHousePuzzle4_MapEvents
-	.4byte Route110_TrickHousePuzzle4_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 250
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json
new file mode 100644
index 000000000..542a67aec
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle4/map.json
@@ -0,0 +1,234 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4",
+  "name": "Route110_TrickHousePuzzle4",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle4_EventScript_26C87E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 2,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route110_TrickHousePuzzle4_EventScript_26C895",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_29144F",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 5,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_17"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 10,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_18"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_19"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "flag": "FLAG_TEMP_1A"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 13,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle4_EventScript_26C861"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index 71bb32db8..fcb10b3ab 100644
--- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
@@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860
 
 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861
 	lockall
-	compare VAR_0x40AE, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873
 	goto Route110_TrickHousePuzzle4_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873
-	setvar VAR_0x40AE, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1
 	goto Route110_TrickHousePuzzle4_EventScript_26A3E5
 	end
 
diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc
deleted file mode 100644
index f91d26f4d..000000000
--- a/data/maps/Route110_TrickHousePuzzle5/events.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0
-
-Route110_TrickHousePuzzle5_MapWarps: @ 853E538
-	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: @ 853E550
-	coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7
-	coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3
-	coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF
-	coord_event 2, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB
-	coord_event 1, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC13
-	coord_event 2, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F
-	coord_event 13, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B
-	coord_event 12, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC67
-	coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC73
-	coord_event 13, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CC97
-	coord_event 12, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3
-	coord_event 11, 4, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF
-	coord_event 1, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CC07
-	coord_event 3, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B
-	coord_event 4, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC37
-	coord_event 5, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC43
-	coord_event 6, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F
-	coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F
-	coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B
-	coord_event 11, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF
-	coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB
-	coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7
-
-Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0
-	bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15
-
-Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC
-	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
deleted file mode 100644
index b22b21bce..000000000
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle5: @ 8485C10
-	.4byte Route110_TrickHousePuzzle5_Layout
-	.4byte Route110_TrickHousePuzzle5_MapEvents
-	.4byte Route110_TrickHousePuzzle5_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 251
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json
new file mode 100644
index 000000000..ae94ed240
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/map.json
@@ -0,0 +1,316 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5",
+  "name": "Route110_TrickHousePuzzle5",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 6,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CB32",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 0,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CB53",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 14,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CB74",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 14,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CB95",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC13"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC67"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC73"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_4",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC97"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_4",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_5",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC07"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC37"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC43"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_4",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_4",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_TEMP_4",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 21,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle5_EventScript_26CB15"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index 4c199a993..86b950e8a 100644
--- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0
-	map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_26CAF6
 	.byte 0
 
 Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6
@@ -13,19 +13,19 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6
 
 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15
 	lockall
-	compare VAR_0x40AF, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27
 	goto Route110_TrickHousePuzzle5_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27
-	setvar VAR_0x40AF, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
 	goto Route110_TrickHousePuzzle5_EventScript_26A3E5
 	end
 
 Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32
 	lockall
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_1, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
@@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32
 
 Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53
 	lockall
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_2, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
@@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53
 
 Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74
 	lockall
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E
+	applymovement 3, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_3, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
@@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74
 
 Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95
 	lockall
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_4, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
@@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95
 
 Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6
 	lockall
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_5, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
@@ -215,9 +215,9 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_8, 1
 	playse SE_PIN
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
@@ -239,9 +239,9 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A
 	setvar VAR_TEMP_2, 1
 	setvar VAR_TEMP_8, 2
 	playse SE_PIN
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC
@@ -265,9 +265,9 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_8, 3
 	playse SE_PIN
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_272598
+	applymovement 3, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A
+	applymovement 3, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
@@ -289,9 +289,9 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73
 	setvar VAR_TEMP_4, 1
 	setvar VAR_TEMP_8, 4
 	playse SE_PIN
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
@@ -313,9 +313,9 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
 	setvar VAR_TEMP_5, 1
 	setvar VAR_TEMP_8, 5
 	playse SE_PIN
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_272598
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT
 	random 3
diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
deleted file mode 100644
index f172622ea..000000000
--- a/data/maps/Route110_TrickHousePuzzle6/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0
-	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL
-
-Route110_TrickHousePuzzle6_MapWarps: @ 853E730
-	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: @ 853E748
-	bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4
-
-Route110_TrickHousePuzzle6_MapEvents:: @ 853E754
-	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
deleted file mode 100644
index e10fd78b2..000000000
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle6: @ 8485C2C
-	.4byte Route110_TrickHousePuzzle6_Layout
-	.4byte Route110_TrickHousePuzzle6_MapEvents
-	.4byte Route110_TrickHousePuzzle6_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 252
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json
new file mode 100644
index 000000000..144916353
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle6/map.json
@@ -0,0 +1,104 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6",
+  "name": "Route110_TrickHousePuzzle6",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 11,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle6_EventScript_29145C",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 10,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle6_EventScript_26DDC4"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 2cb784b50..a5b433d13 100644
--- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
@@ -1,6 +1,6 @@
 Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7
-	map_script 3, Route110_TrickHousePuzzle6_MapScript1_26DDB2
-	map_script 4, Route110_TrickHousePuzzle6_MapScript2_26DDB6
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_26DDB2
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6
 	.byte 0
 
 Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2
@@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0
 
 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4
 	lockall
-	compare VAR_0x40B0, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6
 	goto Route110_TrickHousePuzzle6_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6
-	setvar VAR_0x40B0, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1
 	goto Route110_TrickHousePuzzle6_EventScript_26A3E5
 	end
 
diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc
deleted file mode 100644
index d29c76263..000000000
--- a/data/maps/Route110_TrickHousePuzzle7/events.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-Route110_TrickHousePuzzle7_EventObjects: @ 853E768
-	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0
-	object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0
-	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL
-	object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0
-	object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0
-	object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0
-	object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-
-Route110_TrickHousePuzzle7_MapWarps: @ 853E840
-	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
-	warp_def 13, 4, 0, 4, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 7, 3, 0, 3, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 13, 11, 0, 6, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 4, 3, 0, 5, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 1, 17, 0, 8, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 0, 11, 0, 7, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 2, 3, 0, 10, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 4, 13, 0, 9, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-	warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
-
-Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8
-	coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B
-	coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331
-	coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347
-	coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D
-
-Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8
-	bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0
-
-Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4
-	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
deleted file mode 100644
index 40f43f9d8..000000000
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle7: @ 8485C48
-	.4byte Route110_TrickHousePuzzle7_Layout
-	.4byte Route110_TrickHousePuzzle7_MapEvents
-	.4byte Route110_TrickHousePuzzle7_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 253
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json
new file mode 100644
index 000000000..0263e0848
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle7/map.json
@@ -0,0 +1,276 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+  "name": "Route110_TrickHousePuzzle7",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 9,
+      "y": 20,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E389",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 8,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle7_EventScript_291469",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 4,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 7,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 13,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 1,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 0,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 4,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 1,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 8,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 19,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E31B"
+    },
+    {
+      "type": "trigger",
+      "x": 0,
+      "y": 14,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E331"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E347"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 7,
+      "elevation": 0,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E35D"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 17,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle7_EventScript_26E1D0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index 3babdbd45..b4bd782cf 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -1,8 +1,8 @@
 Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
-	map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6
-	map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198
-	map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4
-	map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_26E198
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0
 	.byte 0
 
 Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6
@@ -68,7 +68,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
 	return
 
 Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198
-	compare VAR_0x40B6, 1
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
@@ -81,33 +81,33 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3
 	end
 
 Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4
-	compare VAR_0x40B6, 1
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC
 	end
 
 Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0
-	map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
+	map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
 	.2byte 0
 
 Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
-	setvar VAR_0x40B6, 0
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0
 	end
 
 Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
 	lockall
-	compare VAR_0x40B1, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
 	goto Route110_TrickHousePuzzle7_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
-	setvar VAR_0x40B1, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1
 	goto Route110_TrickHousePuzzle7_EventScript_26A3E5
 	end
 
 Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
 	lockall
-	setvar VAR_0x40B6, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
 	waitstate
 	releaseall
diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
deleted file mode 100644
index 909c8cbfd..000000000
--- a/data/maps/Route110_TrickHousePuzzle8/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route110_TrickHousePuzzle8_EventObjects: @ 853E908
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL
-
-Route110_TrickHousePuzzle8_MapWarps: @ 853E968
-	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: @ 853E980
-	bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802
-
-Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C
-	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
deleted file mode 100644
index 175515292..000000000
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHousePuzzle8: @ 8485C64
-	.4byte Route110_TrickHousePuzzle8_Layout
-	.4byte Route110_TrickHousePuzzle8_MapEvents
-	.4byte Route110_TrickHousePuzzle8_MapScripts
-	.4byte 0x0
-	.2byte MUS_KARAKURI
-	.2byte 254
-	.byte MAPSEC_ROUTE_110
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json
new file mode 100644
index 000000000..f73e60337
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle8/map.json
@@ -0,0 +1,104 @@
+{
+  "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8",
+  "name": "Route110_TrickHousePuzzle8",
+  "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8",
+  "music": "MUS_KARAKURI",
+  "region_map_section": "MAPSEC_ROUTE_110",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle8_EventScript_26E81F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle8_EventScript_26E84D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 8,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route110_TrickHousePuzzle8_EventScript_26E836",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route110_TrickHousePuzzle8_EventScript_291476",
+      "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 21,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route110_TrickHousePuzzle8_EventScript_26E802"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index 7efb9f67b..dcb12e366 100644
--- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
@@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801
 
 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802
 	lockall
-	compare VAR_0x40B2, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814
 	goto Route110_TrickHousePuzzle8_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814
-	setvar VAR_0x40B2, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1
 	goto Route110_TrickHousePuzzle8_EventScript_26A3E5
 	end
 
diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc
deleted file mode 100644
index 6a57d275e..000000000
--- a/data/maps/Route111/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route111_MapConnectionsList: @ 8486970
-	connection down, 0, MAP_MAUVILLE_CITY
-	connection left, 0, MAP_ROUTE113
-	connection left, 20, MAP_ROUTE112
-
-Route111_MapConnections: @ 8486994
-	.4byte 0x3
-	.4byte Route111_MapConnectionsList
-
diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc
deleted file mode 100644
index 975141b73..000000000
--- a/data/maps/Route111/events.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-Route111_EventObjects: @ 85291F0
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
-	object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
-	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0
-	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1204, 0
-	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0
-	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0
-	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0
-	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
-	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
-	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_11
-	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_12
-	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, FLAG_ITEM_ROUTE_111_TM_37
-	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0
-	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0
-	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
-	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
-	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
-	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
-	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, FLAG_ITEM_ROUTE_111_STARDUST
-	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, FLAG_ITEM_ROUTE_111_HP_UP
-	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, FLAG_TEMP_13
-	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0
-	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0
-	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0
-	object_event 31, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0
-	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0
-	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN
-	object_event 34, EVENT_OBJ_GFX_MAN_4, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0
-	object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0
-	object_event 36, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0
-	object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0
-	object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0
-	object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0
-	object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0
-	object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0
-	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR
-	object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0
-	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
-	object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT
-	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
-
-Route111_MapWarps: @ 8529640
-	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
-	warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F
-	warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE
-
-Route111_MapCoordEvents: @ 8529668
-	coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
-	coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
-	coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
-	coord_event 7, 63, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
-	coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
-	coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
-	coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
-	coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
-	coord_event 18, 32, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 17, 31, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 9, 37, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 10, 36, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
-	coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
-	coord_event 8, 64, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 9, 65, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 10, 65, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 11, 66, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 12, 67, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 13, 68, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 14, 69, 3, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 10, 61, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 11, 62, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 13, 62, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 14, 62, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 17, 38, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 16, 39, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 15, 40, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 14, 41, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 13, 42, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD
-
-Route111_MapBGEvents: @ 8529888
-	bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C
-	bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153
-	bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165
-	bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F116E
-	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, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177
-	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_ROUTE_111_STARDUST
-	bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3
-	bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180
-	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_ROUTE_111_PROTEIN
-	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY
-	bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C
-
-Route111_MapEvents:: @ 8529960
-	map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
-
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
deleted file mode 100644
index cb975e74a..000000000
--- a/data/maps/Route111/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route111: @ 8482790
-	.4byte Route111_Layout
-	.4byte Route111_MapEvents
-	.4byte Route111_MapScripts
-	.4byte Route111_MapConnections
-	.2byte MUS_DOORO_X1
-	.2byte 27
-	.byte MAPSEC_ROUTE_111
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
new file mode 100644
index 000000000..ef981272a
--- /dev/null
+++ b/data/maps/Route111/map.json
@@ -0,0 +1,1115 @@
+{
+  "id": "MAP_ROUTE111",
+  "name": "Route111",
+  "layout": "LAYOUT_ROUTE111",
+  "music": "MUS_DOORO_X1",
+  "region_map_section": "MAPSEC_ROUTE_111",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_MAUVILLE_CITY"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE113"
+    },
+    {
+      "direction": "left",
+      "offset": 20,
+      "map": "MAP_ROUTE112"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 13,
+      "y": 114,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_1F0FC5",
+      "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 13,
+      "y": 113,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 13,
+      "y": 113,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 13,
+      "y": 113,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 28,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route111_EventScript_1F121B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 22,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "19",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 23,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "20",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 8,
+      "y": 91,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_1F1189",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 29,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route111_EventScript_1F1204",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 27,
+      "y": 69,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route111_EventScript_1F1260",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 21,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route111_EventScript_1F1232",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 32,
+      "y": 66,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route111_EventScript_1F1249",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 14,
+      "y": 86,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_28CDF6",
+      "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 13,
+      "y": 86,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_28CDD6",
+      "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 18,
+      "y": 101,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 19,
+      "y": 100,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_2907A6",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 23,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_1F0EB9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 33,
+      "y": 104,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_290D9B",
+      "flag": "FLAG_ITEM_ROUTE_111_TM_37"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 18,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "80",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 19,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "81",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 13,
+      "y": 86,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_28CE96",
+      "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 14,
+      "y": 86,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_28CEB6",
+      "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 13,
+      "y": 86,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_28CF16",
+      "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 14,
+      "y": 86,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_28CF36",
+      "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 12,
+      "y": 54,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_290DA8",
+      "flag": "FLAG_ITEM_ROUTE_111_STARDUST"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 114,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_290DB5",
+      "flag": "FLAG_ITEM_ROUTE_111_HP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 22,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_2906BB",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 10,
+      "y": 82,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route111_EventScript_1F12D9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 11,
+      "y": 71,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route111_EventScript_1F12C2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 32,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route111_EventScript_1F12F0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 4,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route111_EventScript_1F1369",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 9,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route111_EventScript_1F1307",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 13,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_2765FF",
+      "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 20,
+      "y": 114,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_1F1192",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 26,
+      "y": 132,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route111_EventScript_1F13F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 20,
+      "y": 132,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route111_EventScript_1F1410",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 19,
+      "y": 121,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route111_EventScript_1F13E2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 16,
+      "y": 119,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route111_EventScript_1F13CB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 29,
+      "y": 77,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route111_EventScript_1F143E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 22,
+      "y": 77,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route111_EventScript_1F1427",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 37,
+      "y": 77,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route111_EventScript_1F1455",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 19,
+      "y": 118,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_290DC2",
+      "flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 14,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_1F119B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FOSSIL",
+      "x": 20,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 19,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 19,
+      "y": 101,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_EventScript_1F11E4",
+      "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 113,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 29,
+      "y": 87,
+      "elevation": 0,
+      "dest_map": "MAP_DESERT_RUINS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE111_OLD_LADYS_REST_STOP",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 58,
+      "elevation": 0,
+      "dest_map": "MAP_MIRAGE_TOWER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 113,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_HILL_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 62,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 61,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F0A"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 61,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F0A"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 61,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F0A"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 63,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 44,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F16"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 43,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F16"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 42,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F16"
+    },
+    {
+      "type": "trigger",
+      "x": 16,
+      "y": 40,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F16"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 61,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F0A"
+    },
+    {
+      "type": "trigger",
+      "x": 18,
+      "y": 32,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 31,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 37,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 36,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 39,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F16"
+    },
+    {
+      "type": "trigger",
+      "x": 18,
+      "y": 38,
+      "elevation": 3,
+      "var": "VAR_TEMP_3",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0F16"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 64,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 65,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 65,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 66,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 67,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 68,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 69,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FB0"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 61,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 62,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 62,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 62,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 38,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 16,
+      "y": 39,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 15,
+      "y": 40,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 41,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 42,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 43,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 44,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "Route111_EventScript_1F0FBD"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 114,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route111_EventScript_1F115C"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 126,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route111_EventScript_1F1153"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 66,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route111_EventScript_1F1165"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route111_EventScript_1F116E"
+    },
+    {
+      "type": "secret_base",
+      "x": 24,
+      "y": 36,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 34,
+      "y": 50,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 33,
+      "y": 34,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_1"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 19,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route111_EventScript_1F1177"
+    },
+    {
+      "type": "secret_base",
+      "x": 35,
+      "y": 1,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE2_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 35,
+      "y": 31,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_3"
+    },
+    {
+      "type": "hidden_item",
+      "x": 26,
+      "y": 70,
+      "elevation": 0,
+      "item": "ITEM_STARDUST",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST"
+    },
+    {
+      "type": "secret_base",
+      "x": 27,
+      "y": 27,
+      "elevation": 3,
+      "secret_base_id": "SECRET_BASE_RED_CAVE4_3"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 84,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route111_EventScript_1F1180"
+    },
+    {
+      "type": "secret_base",
+      "x": 14,
+      "y": 19,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE1_4"
+    },
+    {
+      "type": "secret_base",
+      "x": 13,
+      "y": 19,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE1_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 55,
+      "elevation": 0,
+      "item": "ITEM_PROTEIN",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN"
+    },
+    {
+      "type": "hidden_item",
+      "x": 35,
+      "y": 66,
+      "elevation": 0,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 116,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route111_EventScript_1F146C"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index c89fcb3dc..3755ee5e4 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -1,13 +1,13 @@
 Route111_MapScripts:: @ 81F0CA7
-	map_script 1, Route111_MapScript1_1F0CBC
-	map_script 3, Route111_MapScript1_1F0D87
-	map_script 4, Route111_MapScript2_1F0E46
-	map_script 2, Route111_MapScript2_1F0E56
+	map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC
+	map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_1F0D87
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56
 	.byte 0
 
 Route111_MapScript1_1F0CBC: @ 81F0CBC
 	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1
-	compare VAR_0x40CB, 1
+	compare VAR_ROUTE_111_STATE, 1
 	call_if_eq Route111_EventScript_1F0CE4
 	end
 
@@ -38,12 +38,12 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4
 	return
 
 Route111_MapScript1_1F0D87: @ 81F0D87
-	setvar VAR_0x40D6, 0
+	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special SetMirageTowerVisibility
 	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
-	compare VAR_0x40CB, 1
+	compare VAR_ROUTE_111_STATE, 1
 	call_if_eq Route111_EventScript_1F0DC2
-	compare VAR_0x40CB, 2
+	compare VAR_ROUTE_111_STATE, 2
 	call_if_eq Route111_EventScript_1F0E40
 	call Route111_EventScript_1F0DE6
 	call Route111_EventScript_28CCC7
@@ -97,15 +97,15 @@ Route111_EventScript_1F0E26:: @ 81F0E26
 	end
 
 Route111_EventScript_1F0E3C:: @ 81F0E3C
-	setmaplayoutindex 392
+	setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER
 	return
 
 Route111_EventScript_1F0E40:: @ 81F0E40
-	setvar VAR_0x40CB, 3
+	setvar VAR_ROUTE_111_STATE, 3
 	return
 
 Route111_MapScript2_1F0E46: @ 81F0E46
-	map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50
+	map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E50
 	.2byte 0
 
 Route111_EventScript_1F0E50:: @ 81F0E50
@@ -113,7 +113,7 @@ Route111_EventScript_1F0E50:: @ 81F0E50
 	end
 
 Route111_MapScript2_1F0E56: @ 81F0E56
-	map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60
+	map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E60
 	.2byte 0
 
 Route111_EventScript_1F0E60:: @ 81F0E60
@@ -134,7 +134,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60
 	waitstate
 	special StartMirageTowerFossilFallAndSink
 	waitstate
-	setvar VAR_0x40CB, 2
+	setvar VAR_ROUTE_111_STATE, 2
 	clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
 	goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7
 	msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT
@@ -159,12 +159,12 @@ Route111_Movement_1F0EB1:: @ 81F0EB1
 Route111_EventScript_1F0EB9:: @ 81F0EB9
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4
 	msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT
 	giveitem_std ITEM_RAZZ_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY
 	special GetPlayerBigGuyGirlString
 	msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT
@@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5
 Route111_EventScript_1F0FE7:: @ 81F0FE7
 	msgbox Route111_Text_1F1523, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542
-	applymovement 1, Route111_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	call Route111_EventScript_1F113C
 	msgbox Route111_Text_1F156F, MSGBOX_DEFAULT
@@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
 	call Route111_EventScript_1F1143
 	msgbox Route111_Text_1F159D, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616
-	applymovement 2, Route111_Movement_2725A6
+	applymovement 2, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	call Route111_EventScript_1F113C
 	msgbox Route111_Text_1F1645, MSGBOX_DEFAULT
@@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
 	call Route111_EventScript_1F1143
 	msgbox Route111_Text_1F167E, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6
-	applymovement 3, Route111_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	call Route111_EventScript_1F113C
 	msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT
@@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
 	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756
 	msgbox Route111_Text_1F1788, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Route111_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	call Route111_EventScript_1F113C
 	applymovement 4, Route111_Movement_1F114A
@@ -411,9 +411,9 @@ Route111_EventScript_1F1192:: @ 81F1192
 Route111_EventScript_1F119B:: @ 81F119B
 	lock
 	faceplayer
-	compare VAR_0x40CB, 3
+	compare VAR_ROUTE_111_STATE, 3
 	goto_if_eq Route111_EventScript_1F11C6
-	compare VAR_0x40CB, 2
+	compare VAR_ROUTE_111_STATE, 2
 	goto_if_eq Route111_EventScript_1F11D0
 	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
 	msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT
@@ -437,11 +437,11 @@ Route111_EventScript_1F11DA:: @ 81F11DA
 
 Route111_EventScript_1F11E4:: @ 81F11E4
 	lockall
-	applymovement 46, Route111_Movement_27259E
+	applymovement 46, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT
 	closemessage
-	applymovement 46, Route111_Movement_2725A2
+	applymovement 46, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc
deleted file mode 100644
index 973837871..000000000
--- a/data/maps/Route111_OldLadysRestStop/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route111_OldLadysRestStop_EventObjects: @ 8533C18
-	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0
-
-Route111_OldLadysRestStop_MapWarps: @ 8533C30
-	warp_def 3, 7, 0, 2, MAP_ROUTE111
-	warp_def 4, 7, 0, 2, MAP_ROUTE111
-
-Route111_OldLadysRestStop_MapEvents:: @ 8533C40
-	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
deleted file mode 100644
index a3c2a0161..000000000
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route111_OldLadysRestStop: @ 8483DC4
-	.4byte House3_Layout
-	.4byte Route111_OldLadysRestStop_MapEvents
-	.4byte Route111_OldLadysRestStop_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 64
-	.byte MAPSEC_ROUTE_111
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json
new file mode 100644
index 000000000..c915bfb95
--- /dev/null
+++ b/data/maps/Route111_OldLadysRestStop/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP",
+  "name": "Route111_OldLadysRestStop",
+  "layout": "LAYOUT_HOUSE3",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_111",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_OldLadysRestStop_EventScript_22A920",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 5a89f40ed..9427e8692 100644
--- a/data/maps/Route111_OldLadysRestStop/scripts.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
@@ -1,5 +1,5 @@
 Route111_OldLadysRestStop_MapScripts:: @ 822A916
-	map_script 3, Route111_OldLadysRestStop_MapScript1_22A91C
+	map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C
 	.byte 0
 
 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C
@@ -19,7 +19,7 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920
 Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941
 	msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT
 	closemessage
-	call Route111_OldLadysRestStop_EventScript_272083
+	call Common_EventScript_OutOfCenterPartyHeal
 	msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	goto_if_eq Route111_OldLadysRestStop_EventScript_22A941
diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc
deleted file mode 100644
index edaf85eb4..000000000
--- a/data/maps/Route111_WinstrateFamilysHouse/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0
-	object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0
-
-Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4
-	warp_def 3, 7, 0, 0, MAP_ROUTE111
-	warp_def 4, 7, 0, 0, MAP_ROUTE111
-
-Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04
-	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
deleted file mode 100644
index 12e408089..000000000
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route111_WinstrateFamilysHouse: @ 8483DA8
-	.4byte House2_Layout
-	.4byte Route111_WinstrateFamilysHouse_MapEvents
-	.4byte Route111_WinstrateFamilysHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 60
-	.byte MAPSEC_ROUTE_111
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json
new file mode 100644
index 000000000..fed3dab3f
--- /dev/null
+++ b/data/maps/Route111_WinstrateFamilysHouse/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE",
+  "name": "Route111_WinstrateFamilysHouse",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_111",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index b54fe564e..312bf739f 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
@@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2
 	msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT
 	giveitem_std ITEM_MACHO_BRACE
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MACHO_BRACE
 	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
 	end
@@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E
 
 Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C
 	closemessage
-	applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2
+	applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc
deleted file mode 100644
index 132c4ff76..000000000
--- a/data/maps/Route112/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route112_MapConnectionsList: @ 848699C
-	connection up, -60, MAP_ROUTE113
-	connection left, 40, MAP_LAVARIDGE_TOWN
-	connection right, -20, MAP_ROUTE111
-
-Route112_MapConnections: @ 84869C0
-	.4byte 0x3
-	.4byte Route112_MapConnectionsList
-
diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc
deleted file mode 100644
index cfa145e97..000000000
--- a/data/maps/Route112/events.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-Route112_EventObjects: @ 8529974
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0
-	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET
-	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0
-
-Route112_MapWarps: @ 8529AC4
-	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: @ 8529AF4
-	bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F
-	bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46
-	bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58
-
-Route112_MapEvents:: @ 8529B18
-	map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
-
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
deleted file mode 100644
index 70e0f2d65..000000000
--- a/data/maps/Route112/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route112: @ 84827AC
-	.4byte Route112_Layout
-	.4byte Route112_MapEvents
-	.4byte Route112_MapScripts
-	.4byte Route112_MapConnections
-	.2byte MUS_DOORO_X1
-	.2byte 28
-	.byte MAPSEC_ROUTE_112
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
new file mode 100644
index 000000000..8839cc114
--- /dev/null
+++ b/data/maps/Route112/map.json
@@ -0,0 +1,287 @@
+{
+  "id": "MAP_ROUTE112",
+  "name": "Route112",
+  "layout": "LAYOUT_ROUTE112",
+  "music": "MUS_DOORO_X1",
+  "region_map_section": "MAPSEC_ROUTE_112",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": -60,
+      "map": "MAP_ROUTE113"
+    },
+    {
+      "direction": "left",
+      "offset": 40,
+      "map": "MAP_LAVARIDGE_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": -20,
+      "map": "MAP_ROUTE111"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 26,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route112_EventScript_1F1DB7",
+      "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 24,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route112_EventScript_1F1E6A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 29,
+      "y": 49,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route112_EventScript_1F1EE3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 22,
+      "y": 46,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route112_EventScript_1F1EFA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 15,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route112_EventScript_1F1E81",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 27,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route112_EventScript_1F1DB7",
+      "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 27,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "24",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 28,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "23",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 29,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "22",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 30,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "21",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 8,
+      "y": 50,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route112_EventScript_1F1E61",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 14,
+      "y": 43,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route112_EventScript_290DCF",
+      "flag": "FLAG_ITEM_ROUTE_112_NUGGET"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 31,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route112_EventScript_1F1F11",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 31,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route112_EventScript_1F1F28",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 28,
+      "y": 27,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 29,
+      "y": 27,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_JAGGED_PASS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_JAGGED_PASS",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 36,
+      "elevation": 0,
+      "dest_map": "MAP_FIERY_PATH",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 22,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_FIERY_PATH",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 44,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route112_EventScript_1F1E4F"
+    },
+    {
+      "type": "sign",
+      "x": 22,
+      "y": 37,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route112_EventScript_1F1E46"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 49,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route112_EventScript_1F1E58"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index 995102fe7..abc3ca4cd 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -1,45 +1,45 @@
 Route112_MapScripts:: @ 81F1DA8
-	map_script 3, Route112_MapScript1_1F1DAE
+	map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE
 	.byte 0
 
 Route112_MapScript1_1F1DAE: @ 81F1DAE
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
-	setvar VAR_0x40BD, 0
+	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
 Route112_EventScript_1F1DB7:: @ 81F1DB7
 	lockall
 	delay 40
-	applymovement 1, Route112_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 20
 	msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route112_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	delay 40
-	applymovement 6, Route112_Movement_2725A4
+	applymovement 6, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 20
 	msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, Route112_Movement_2725A2
+	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	delay 40
-	applymovement 1, Route112_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 20
 	msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route112_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	delay 40
-	applymovement 6, Route112_Movement_2725A4
+	applymovement 6, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 20
 	msgbox Route112_Text_1F2003, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, Route112_Movement_2725A2
+	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc
deleted file mode 100644
index 2fe084697..000000000
--- a/data/maps/Route112_CableCarStation/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route112_CableCarStation_EventObjects: @ 8533C54
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0
-	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
-
-Route112_CableCarStation_MapWarps: @ 8533C84
-	warp_def 6, 11, 0, 0, MAP_ROUTE112
-	warp_def 7, 11, 0, 1, MAP_ROUTE112
-
-Route112_CableCarStation_MapEvents:: @ 8533C94
-	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
deleted file mode 100644
index fd9038c12..000000000
--- a/data/maps/Route112_CableCarStation/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route112_CableCarStation: @ 8483DE0
-	.4byte CableCarStation_Layout
-	.4byte Route112_CableCarStation_MapEvents
-	.4byte Route112_CableCarStation_MapScripts
-	.4byte 0x0
-	.2byte MUS_DOORO_X1
-	.2byte 118
-	.byte MAPSEC_ROUTE_112
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json
new file mode 100644
index 000000000..52958a4ee
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_ROUTE112_CABLE_CAR_STATION",
+  "name": "Route112_CableCarStation",
+  "layout": "LAYOUT_CABLE_CAR_STATION",
+  "music": "MUS_DOORO_X1",
+  "region_map_section": "MAPSEC_ROUTE_112",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route112_CableCarStation_EventScript_22AB17",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE112",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE112",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
index a430a497e..f3cdae8f9 100644
--- a/data/maps/Route112_CableCarStation/scripts.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -1,11 +1,11 @@
 Route112_CableCarStation_MapScripts:: @ 822AABE
-	map_script 3, Route112_CableCarStation_MapScript1_22AAC9
-	map_script 2, Route112_CableCarStation_MapScript2_22AAE9
+	map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_22AAC9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9
 	.byte 0
 
 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9
 	setescapewarp MAP_ROUTE112, 255, 28, 28
-	compare VAR_0x40A3, 2
+	compare VAR_CABLE_CAR_STATION_STATE, 2
 	call_if_eq Route112_CableCarStation_EventScript_22AADD
 	end
 
@@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
 	return
 
 Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
-	map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3
 	.2byte 0
 
 Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
@@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
 	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80
 	applymovement 1, Route112_CableCarStation_Movement_22AB76
 	waitmovement 0
-	setvar VAR_0x40A3, 0
+	setvar VAR_CABLE_CAR_STATION_STATE, 0
 	setobjectxyperm 1, 6, 7
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	releaseall
@@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
 	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B
 	waitmovement 0
 	setvar VAR_0x8004, 0
-	setvar VAR_0x40A3, 1
+	setvar VAR_CABLE_CAR_STATION_STATE, 1
 	incrementgamestat 48
 	special CableCarWarp
 	special CableCar
diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc
deleted file mode 100644
index 3067ee23b..000000000
--- a/data/maps/Route113/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route113_MapConnectionsList: @ 84869C8
-	connection down, 60, MAP_ROUTE112
-	connection left, 0, MAP_FALLARBOR_TOWN
-	connection right, 0, MAP_ROUTE111
-
-Route113_MapConnections: @ 84869EC
-	.4byte 0x3
-	.4byte Route113_MapConnectionsList
-
diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc
deleted file mode 100644
index b2481d6ed..000000000
--- a/data/maps/Route113/events.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-Route113_EventObjects: @ 8529B2C
-	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL
-	object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0
-	object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0
-	object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0
-	object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION
-	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0
-	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0
-	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0
-
-Route113_MapWarps: @ 8529CAC
-	warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP
-	warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-	warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-
-Route113_MapCoordEvents: @ 8529CC4
-	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 86, 9, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 85, 10, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 85, 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 87, 8, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH
-
-Route113_MapBGEvents: @ 8529DF4
-	bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C
-	bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5
-	bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7
-	bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE
-	bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3
-	bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER
-	bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32
-	bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET
-
-Route113_MapEvents:: @ 8529E54
-	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
-
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
deleted file mode 100644
index deaacca36..000000000
--- a/data/maps/Route113/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route113: @ 84827C8
-	.4byte Route113_Layout
-	.4byte Route113_MapEvents
-	.4byte Route113_MapScripts
-	.4byte Route113_MapConnections
-	.2byte MUS_KAZANBAI
-	.2byte 29
-	.byte MAPSEC_ROUTE_113
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json
new file mode 100644
index 000000000..1ae33fda7
--- /dev/null
+++ b/data/maps/Route113/map.json
@@ -0,0 +1,465 @@
+{
+  "id": "MAP_ROUTE113",
+  "name": "Route113",
+  "layout": "LAYOUT_ROUTE113",
+  "music": "MUS_KAZANBAI",
+  "region_map_section": "MAPSEC_ROUTE_113",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 60,
+      "map": "MAP_ROUTE112"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_FALLARBOR_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE111"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 66,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route113_EventScript_1F2193",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 36,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route113_EventScript_1F218A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 62,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route113_EventScript_1F21C0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 21,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route113_EventScript_1F21D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 51,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route113_EventScript_1F21EE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 53,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route113_EventScript_290DDC",
+      "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 79,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route113_EventScript_290DE9",
+      "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 29,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_HIDDEN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route113_EventScript_1F2250",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 71,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_HIDDEN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route113_EventScript_1F22B2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 45,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route113_EventScript_1F22C9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 46,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route113_EventScript_1F22E4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 15,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route113_EventScript_290DF6",
+      "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 75,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route113_EventScript_1F2344",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 71,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route113_EventScript_1F232D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route113_EventScript_1F22FF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route113_EventScript_1F2316",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 33,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE113_GLASS_WORKSHOP",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 41,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 88,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 11,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 10,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 12,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 86,
+      "y": 9,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 85,
+      "y": 10,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 85,
+      "y": 11,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 14,
+      "y": 10,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 14,
+      "y": 12,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 14,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 94,
+      "y": 8,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 94,
+      "y": 9,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 94,
+      "y": 10,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 94,
+      "y": 11,
+      "elevation": 0,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 14,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 87,
+      "y": 8,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 87,
+      "y": 6,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    },
+    {
+      "type": "weather",
+      "x": 87,
+      "y": 7,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ASH"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 85,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route113_EventScript_1F219C"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route113_EventScript_1F21A5"
+    },
+    {
+      "type": "sign",
+      "x": 58,
+      "y": 4,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route113_EventScript_1F21B7"
+    },
+    {
+      "type": "sign",
+      "x": 31,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route113_EventScript_1F21AE"
+    },
+    {
+      "type": "secret_base",
+      "x": 49,
+      "y": 8,
+      "elevation": 3,
+      "secret_base_id": "SECRET_BASE_RED_CAVE1_3"
+    },
+    {
+      "type": "hidden_item",
+      "x": 66,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_ETHER",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_ETHER"
+    },
+    {
+      "type": "hidden_item",
+      "x": 22,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_TM32",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM_32"
+    },
+    {
+      "type": "hidden_item",
+      "x": 73,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_NUGGET",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index ac27784da..6efd05d6e 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -1,6 +1,6 @@
 Route113_MapScripts:: @ 81F2153
-	map_script 5, Route113_MapScript1_1F215E
-	map_script 3, Route113_MapScript1_1F2161
+	map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E
+	map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1F2161
 	.byte 0
 
 Route113_MapScript1_1F215E: @ 81F215E
diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc
deleted file mode 100644
index d6f9c0d4b..000000000
--- a/data/maps/Route113_GlassWorkshop/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route113_GlassWorkshop_EventObjects: @ 853EA78
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0
-	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0
-
-Route113_GlassWorkshop_MapWarps: @ 853EAA8
-	warp_def 3, 8, 0, 0, MAP_ROUTE113
-	warp_def 4, 8, 0, 0, MAP_ROUTE113
-
-Route113_GlassWorkshop_MapEvents:: @ 853EAB8
-	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
deleted file mode 100644
index 44a87e5ef..000000000
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route113_GlassWorkshop: @ 8485CB8
-	.4byte House4_Layout
-	.4byte Route113_GlassWorkshop_MapEvents
-	.4byte Route113_GlassWorkshop_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 67
-	.byte MAPSEC_ROUTE_113
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json
new file mode 100644
index 000000000..70e342048
--- /dev/null
+++ b/data/maps/Route113_GlassWorkshop/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_ROUTE113_GLASS_WORKSHOP",
+  "name": "Route113_GlassWorkshop",
+  "layout": "LAYOUT_HOUSE4",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_113",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route113_GlassWorkshop_EventScript_26ED1E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route113_GlassWorkshop_EventScript_26F194",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE113",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE113",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index 959c27799..46134a3d5 100644
--- a/data/maps/Route113_GlassWorkshop/scripts.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
@@ -1,29 +1,29 @@
 Route113_GlassWorkshop_MapScripts:: @ 826ED03
-	map_script 3, Route113_GlassWorkshop_MapScript1_26ED09
+	map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09
 	.byte 0
 
 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09
 	setflag FLAG_LANDMARK_GLASS_WORKSHOP
-	compare VAR_0x40BE, 1
+	compare VAR_GLASS_WORKSHOP_STATE, 1
 	call_if_eq Route113_GlassWorkshop_EventScript_26ED18
 	end
 
 Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18
-	setvar VAR_0x40BE, 2
+	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	return
 
 Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E
 	lock
 	faceplayer
-	compare VAR_0x40BE, 10
+	compare VAR_GLASS_WORKSHOP_STATE, 10
 	goto_if_ge Route113_GlassWorkshop_EventScript_26F090
-	compare VAR_0x40BE, 2
+	compare VAR_GLASS_WORKSHOP_STATE, 2
 	goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E
-	compare VAR_0x40BE, 1
+	compare VAR_GLASS_WORKSHOP_STATE, 1
 	goto_if_eq Route113_GlassWorkshop_EventScript_26ED64
 	msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOOT_SACK
-	setvar VAR_0x40BE, 1
+	setvar VAR_GLASS_WORKSHOP_STATE, 1
 	msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT
 	release
 	end
@@ -76,7 +76,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 10
+	setvar VAR_GLASS_WORKSHOP_STATE, 10
 	subvar VAR_ASH_GATHER_COUNT, 250
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -90,7 +90,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 11
+	setvar VAR_GLASS_WORKSHOP_STATE, 11
 	subvar VAR_ASH_GATHER_COUNT, 500
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -104,7 +104,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 12
+	setvar VAR_GLASS_WORKSHOP_STATE, 12
 	subvar VAR_ASH_GATHER_COUNT, 500
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -118,7 +118,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 13
+	setvar VAR_GLASS_WORKSHOP_STATE, 13
 	subvar VAR_ASH_GATHER_COUNT, 1000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -132,7 +132,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 14
+	setvar VAR_GLASS_WORKSHOP_STATE, 14
 	subvar VAR_ASH_GATHER_COUNT, 1000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -147,7 +147,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 15
+	setvar VAR_GLASS_WORKSHOP_STATE, 15
 	subvar VAR_ASH_GATHER_COUNT, 6000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -162,7 +162,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 16
+	setvar VAR_GLASS_WORKSHOP_STATE, 16
 	subvar VAR_ASH_GATHER_COUNT, 8000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -206,7 +206,7 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F
 	call_if_eq Route113_GlassWorkshop_EventScript_26F047
 	compare VAR_0x8009, 1
 	call_if_eq Route113_GlassWorkshop_EventScript_26F05F
-	setvar VAR_0x40BE, 2
+	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
 
@@ -223,19 +223,19 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F
 	return
 
 Route113_GlassWorkshop_EventScript_26F072:: @ 826F072
-	call Route113_GlassWorkshop_EventScript_27205E
+	call Common_EventScript_BagIsFull
 	msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_GlassWorkshop_EventScript_26F081:: @ 826F081
-	call Route113_GlassWorkshop_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_GlassWorkshop_EventScript_26F090:: @ 826F090
-	switch VAR_0x40BE
+	switch VAR_GLASS_WORKSHOP_STATE
 	case 10, Route113_GlassWorkshop_EventScript_26F0E3
 	case 11, Route113_GlassWorkshop_EventScript_26F0F7
 	case 12, Route113_GlassWorkshop_EventScript_26F10B
@@ -300,7 +300,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F
 	call_if_eq Route113_GlassWorkshop_EventScript_26F047
 	compare VAR_0x8009, 1
 	call_if_eq Route113_GlassWorkshop_EventScript_26F05F
-	setvar VAR_0x40BE, 2
+	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
 
diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc
deleted file mode 100644
index 760c2ddc0..000000000
--- a/data/maps/Route114/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route114_MapConnectionsList: @ 84869F4
-	connection left, 40, MAP_ROUTE115
-	connection right, 0, MAP_FALLARBOR_TOWN
-
-Route114_MapConnections: @ 8486A0C
-	.4byte 0x2
-	.4byte Route114_MapConnectionsList
-
diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc
deleted file mode 100644
index 55ea12195..000000000
--- a/data/maps/Route114/events.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-Route114_EventObjects: @ 8529E68
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0
-	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route114_EventScript_1F2657, 0
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_1F266E, 0
-	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0
-	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, FLAG_ITEM_ROUTE_114_RARE_CANDY
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, FLAG_ITEM_ROUTE_114_PROTEIN
-	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_11
-	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0
-	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0
-	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0
-	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0
-	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0
-	object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0
-	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_12
-	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_13
-	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_14
-	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_15
-	object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0
-	object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0
-	object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0
-	object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0
-	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER
-	object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0
-
-Route114_MapWarps: @ 852A0F0
-	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
-	warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-	warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-
-Route114_MapBGEvents: @ 852A118
-	bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625
-	bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E
-	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, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637
-	bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS
-	bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3
-	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE
-
-Route114_MapEvents:: @ 852A1A8
-	map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
-
diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc
deleted file mode 100644
index 318efdbaf..000000000
--- a/data/maps/Route114/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114: @ 84827E4
-	.4byte Route114_Layout
-	.4byte Route114_MapEvents
-	.4byte Route114_MapScripts
-	.4byte Route114_MapConnections
-	.2byte MUS_DOORO_X1
-	.2byte 30
-	.byte MAPSEC_ROUTE_114
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
new file mode 100644
index 000000000..9d1002910
--- /dev/null
+++ b/data/maps/Route114/map.json
@@ -0,0 +1,509 @@
+{
+  "id": "MAP_ROUTE114",
+  "name": "Route114",
+  "layout": "LAYOUT_ROUTE114",
+  "music": "MUS_DOORO_X1",
+  "region_map_section": "MAPSEC_ROUTE_114",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 40,
+      "map": "MAP_ROUTE115"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_FALLARBOR_TOWN"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 31,
+      "y": 43,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "77",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 31,
+      "y": 44,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "78",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 15,
+      "y": 65,
+      "elevation": 7,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route114_EventScript_1F2640",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 30,
+      "y": 72,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route114_EventScript_1F2657",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 22,
+      "y": 50,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route114_EventScript_1F266E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 19,
+      "y": 35,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route114_EventScript_1F2685",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 20,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route114_EventScript_1F269C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 31,
+      "y": 45,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "68",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_290E03",
+      "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 11,
+      "y": 37,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_290E10",
+      "flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 12,
+      "y": 43,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 19,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_1F25D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POOCHYENA",
+      "x": 19,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_1F2612",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 27,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_1F2582",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 25,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_1F2777",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 19,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_1F2760",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 30,
+      "y": 58,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route114_EventScript_1F26FE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 29,
+      "y": 53,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_2907A6",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 30,
+      "y": 54,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_2907A6",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 22,
+      "y": 69,
+      "elevation": 7,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_2907A6",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 11,
+      "y": 64,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_2907A6",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 24,
+      "y": 44,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route114_EventScript_1F27A9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 23,
+      "y": 44,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route114_EventScript_1F278E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 28,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route114_EventScript_1F27DB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 26,
+      "y": 72,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route114_EventScript_1F27C4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 31,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_EventScript_290E1D",
+      "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 28,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route114_EventScript_1F27F2",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 63,
+      "elevation": 0,
+      "dest_map": "MAP_METEOR_FALLS_1F_1R",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 29,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 27,
+      "y": 36,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114_LANETTES_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 46,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 64,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route114_EventScript_1F2625"
+    },
+    {
+      "type": "sign",
+      "x": 31,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route114_EventScript_1F262E"
+    },
+    {
+      "type": "secret_base",
+      "x": 9,
+      "y": 47,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE1_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 30,
+      "y": 51,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE2_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 11,
+      "y": 62,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE3_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 19,
+      "y": 70,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE4_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 11,
+      "y": 27,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE3_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 12,
+      "y": 27,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE4_2"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 38,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route114_EventScript_1F2637"
+    },
+    {
+      "type": "hidden_item",
+      "x": 20,
+      "y": 57,
+      "elevation": 3,
+      "item": "ITEM_CARBOS",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS"
+    },
+    {
+      "type": "secret_base",
+      "x": 32,
+      "y": 57,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE4_3"
+    },
+    {
+      "type": "hidden_item",
+      "x": 7,
+      "y": 30,
+      "elevation": 3,
+      "item": "ITEM_REVIVE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index 8f0c1c6ac..b03a2f228 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -1,33 +1,33 @@
 Route114_MapScripts:: @ 81F252F
-	map_script 3, Route114_MapScript1_1F253F
-	map_script 1, Route114_MapScript1_1F2561
-	map_script 2, Route114_MapScript2_1F2578
+	map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F
+	map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578
 	.byte 0
 
 Route114_MapScript1_1F253F: @ 81F253F
-	compare VAR_0x4039, 1
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route114_EventScript_273D13
-	compare VAR_0x4037, 1
-	call_if_eq Route114_EventScript_273D1B
-	compare VAR_0x4037, 2
-	call_if_eq Route114_EventScript_273D1B
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
+	call_if_eq UnusualWeather_StartGroudonWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route114_MapScript1_1F2561: @ 81F2561
-	compare VAR_0x4037, 1
-	call_if_eq Route114_EventScript_273913
-	compare VAR_0x4037, 2
-	call_if_eq Route114_EventScript_273926
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South
 	end
 
 Route114_MapScript2_1F2578: @ 81F2578
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route114_EventScript_1F2582:: @ 81F2582
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7
 	msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT
 	random 5
@@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route114_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY
 	msgbox Route114_Text_2A7034, MSGBOX_DEFAULT
 	release
@@ -53,7 +53,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1
 	msgbox Route114_Text_1F2809, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM05
 	compare VAR_RESULT, 0
-	goto_if_eq Route114_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM05
 	msgbox Route114_Text_1F2872, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc
deleted file mode 100644
index 9c4579c1d..000000000
--- a/data/maps/Route114_FossilManiacsHouse/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route114_FossilManiacsHouse_EventObjects: @ 8533CFC
-	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0
-
-Route114_FossilManiacsHouse_MapWarps: @ 8533D14
-	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: @ 8533D2C
-	bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73
-	bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73
-	bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C
-	bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C
-
-Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C
-	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
deleted file mode 100644
index ca042d6b4..000000000
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_FossilManiacsHouse: @ 8483E18
-	.4byte Route114_FossilManiacsHouse_Layout
-	.4byte Route114_FossilManiacsHouse_MapEvents
-	.4byte Route114_FossilManiacsHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_TONEKUSA
-	.2byte 119
-	.byte MAPSEC_ROUTE_114
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json
new file mode 100644
index 000000000..0c5c5ea77
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsHouse/map.json
@@ -0,0 +1,89 @@
+{
+  "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE",
+  "name": "Route114_FossilManiacsHouse",
+  "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE",
+  "music": "MUS_TONEKUSA",
+  "region_map_section": "MAPSEC_ROUTE_114",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_FossilManiacsHouse_EventScript_22AD3A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Route114_FossilManiacsHouse_EventScript_22AD73"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Route114_FossilManiacsHouse_EventScript_22AD73"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Route114_FossilManiacsHouse_EventScript_22AD7C"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Route114_FossilManiacsHouse_EventScript_22AD7C"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index e229c756d..c6b63d8da 100644
--- a/data/maps/Route114_FossilManiacsHouse/scripts.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
-	map_script 3, Route114_FossilManiacsHouse_MapScript1_22AD36
+	map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36
 	.byte 0
 
 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36
@@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A
 	msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM28
 	compare VAR_RESULT, 0
-	goto_if_eq Route114_FossilManiacsHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM28
 	release
 	end
diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc
deleted file mode 100644
index ba3798f7b..000000000
--- a/data/maps/Route114_FossilManiacsTunnel/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_FossilManiacsTunnel_EventObjects: @ 8533D70
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0
-
-Route114_FossilManiacsTunnel_MapWarps: @ 8533D88
-	warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
-	warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
-	warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS
-
-Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0
-	coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66
-	coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66
-
-Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0
-	map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0
-
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
deleted file mode 100644
index be53b84ce..000000000
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_FossilManiacsTunnel: @ 8483E34
-	.4byte Route114_FossilManiacsTunnel_Layout
-	.4byte Route114_FossilManiacsTunnel_MapEvents
-	.4byte Route114_FossilManiacsTunnel_MapScripts
-	.4byte 0x0
-	.2byte MUS_TONEKUSA
-	.2byte 120
-	.byte MAPSEC_ROUTE_114
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json
new file mode 100644
index 000000000..d0992f8fa
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsTunnel/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
+  "name": "Route114_FossilManiacsTunnel",
+  "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL",
+  "music": "MUS_TONEKUSA",
+  "region_map_section": "MAPSEC_ROUTE_114",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_FossilManiacsTunnel_EventScript_22AF87",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 25,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 7,
+      "y": 25,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_DESERT_UNDERPASS",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_FOSSIL_MANIAC_STATE",
+      "var_value": "1",
+      "script": "Route114_FossilManiacsTunnel_EventScript_22AF66"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_FOSSIL_MANIAC_STATE",
+      "var_value": "1",
+      "script": "Route114_FossilManiacsTunnel_EventScript_22AF66"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index 96d591d2d..8ab83a441 100644
--- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
@@ -1,6 +1,6 @@
 Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28
-	map_script 3, Route114_FossilManiacsTunnel_MapScript1_22AF33
-	map_script 1, Route114_FossilManiacsTunnel_MapScript1_22AF49
+	map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_22AF33
+	map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49
 	.byte 0
 
 Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33
@@ -23,11 +23,11 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53
 
 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66
 	lockall
-	applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT
-	setvar VAR_0x40CC, 2
+	setvar VAR_FOSSIL_MANIAC_STATE, 2
 	releaseall
 	end
 
diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc
deleted file mode 100644
index 17030ddc1..000000000
--- a/data/maps/Route114_LanettesHouse/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_LanettesHouse_EventObjects: @ 8533DD4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE
-
-Route114_LanettesHouse_MapWarps: @ 8533DEC
-	warp_def 5, 7, 0, 2, MAP_ROUTE114
-	warp_def 6, 7, 0, 2, MAP_ROUTE114
-
-Route114_LanettesHouse_MapBGEvents: @ 8533DFC
-	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309
-	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345
-	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345
-
-Route114_LanettesHouse_MapEvents:: @ 8533E20
-	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
deleted file mode 100644
index 51023a800..000000000
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_LanettesHouse: @ 8483E50
-	.4byte Route114_LanettesHouse_Layout
-	.4byte Route114_LanettesHouse_MapEvents
-	.4byte Route114_LanettesHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_TONEKUSA
-	.2byte 121
-	.byte MAPSEC_ROUTE_114
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json
new file mode 100644
index 000000000..b4b1b412b
--- /dev/null
+++ b/data/maps/Route114_LanettesHouse/map.json
@@ -0,0 +1,74 @@
+{
+  "id": "MAP_ROUTE114_LANETTES_HOUSE",
+  "name": "Route114_LanettesHouse",
+  "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE",
+  "music": "MUS_TONEKUSA",
+  "region_map_section": "MAPSEC_ROUTE_114",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route114_LanettesHouse_EventScript_22B2D2",
+      "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE114",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route114_LanettesHouse_EventScript_22B309"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route114_LanettesHouse_EventScript_22B345"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route114_LanettesHouse_EventScript_22B345"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index b54365523..1cf7ffb47 100644
--- a/data/maps/Route114_LanettesHouse/scripts.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route114_LanettesHouse_MapScripts:: @ 822B2C8
-	map_script 3, Route114_LanettesHouse_MapScript1_22B2CE
+	map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE
 	.byte 0
 
 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE
diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc
deleted file mode 100644
index 4518e31fa..000000000
--- a/data/maps/Route115/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route115_MapConnectionsList: @ 8486A14
-	connection down, 0, MAP_RUSTBORO_CITY
-	connection right, -40, MAP_ROUTE114
-
-Route115_MapConnections: @ 8486A2C
-	.4byte 0x2
-	.4byte Route115_MapConnectionsList
-
diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc
deleted file mode 100644
index 18179deb1..000000000
--- a/data/maps/Route115/events.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-Route115_EventObjects: @ 852A1BC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0
-	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, FLAG_ITEM_ROUTE_115_SUPER_POTION
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, FLAG_ITEM_ROUTE_115_TM_01
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, FLAG_ITEM_ROUTE_115_IRON
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0
-	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0
-	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, FLAG_TEMP_11
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, FLAG_ITEM_ROUTE_115_GREAT_BALL
-	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0
-	object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
-	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0
-	object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0
-	object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP
-	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER
-
-Route115_MapWarps: @ 852A3E4
-	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
-	warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-	warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-
-Route115_MapBGEvents: @ 852A3FC
-	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, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C
-	bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F2985
-	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_ROUTE_115_HEART_SCALE
-
-Route115_MapEvents:: @ 852A4A4
-	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
-
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
deleted file mode 100644
index 70e831aee..000000000
--- a/data/maps/Route115/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route115: @ 8482800
-	.4byte Route115_Layout
-	.4byte Route115_MapEvents
-	.4byte Route115_MapScripts
-	.4byte Route115_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 31
-	.byte MAPSEC_ROUTE_115
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
new file mode 100644
index 000000000..1c7603b58
--- /dev/null
+++ b/data/maps/Route115/map.json
@@ -0,0 +1,455 @@
+{
+  "id": "MAP_ROUTE115",
+  "name": "Route115",
+  "layout": "LAYOUT_ROUTE115",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_115",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_RUSTBORO_CITY"
+    },
+    {
+      "direction": "right",
+      "offset": -40,
+      "map": "MAP_ROUTE114"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 18,
+      "y": 68,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_1F2973",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 5,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route115_EventScript_1F298E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 27,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route115_EventScript_1F2A07",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "69",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "70",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "71",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 15,
+      "y": 50,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route115_EventScript_1F2A69",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 19,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+      "movement_range_x": 5,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route115_EventScript_1F29F0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 24,
+      "y": 62,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route115_EventScript_1F2ACB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 20,
+      "y": 60,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_290E2A",
+      "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 18,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_290E37",
+      "flag": "FLAG_ITEM_ROUTE_115_TM_01"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 23,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_290E44",
+      "flag": "FLAG_ITEM_ROUTE_115_IRON"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 31,
+      "y": 64,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "55",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 31,
+      "y": 65,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "56",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 29,
+      "y": 50,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 31,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_290E51",
+      "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route115_EventScript_1F2AE2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 11,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route115_EventScript_1F2AF9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 15,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route115_EventScript_1F2B27",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route115_EventScript_1F2B10",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 28,
+      "y": 62,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route115_EventScript_1F2B3E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 26,
+      "y": 67,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_290E6B",
+      "flag": "FLAG_ITEM_ROUTE_115_PP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 12,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route115_EventScript_290E5E",
+      "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 27,
+      "y": 37,
+      "elevation": 0,
+      "dest_map": "MAP_METEOR_FALLS_1F_1R",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 21,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 36,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "secret_base",
+      "x": 32,
+      "y": 6,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE4_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 21,
+      "y": 18,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE3_2"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 64,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route115_EventScript_1F297C"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 38,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route115_EventScript_1F2985"
+    },
+    {
+      "type": "secret_base",
+      "x": 8,
+      "y": 30,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 32,
+      "y": 39,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE1_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 26,
+      "y": 15,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE2_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 23,
+      "y": 8,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE1_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 32,
+      "y": 46,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE2_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 7,
+      "y": 20,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE2_4"
+    },
+    {
+      "type": "secret_base",
+      "x": 8,
+      "y": 20,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE3_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 25,
+      "y": 24,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BROWN_CAVE3_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 20,
+      "y": 53,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE3_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 15,
+      "y": 49,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 560c360af..259cd5904 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -1,27 +1,27 @@
 Route115_MapScripts:: @ 81F2920
-	map_script 1, Route115_MapScript1_1F2930
-	map_script 3, Route115_MapScript1_1F2947
-	map_script 2, Route115_MapScript2_1F2969
+	map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930
+	map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_1F2947
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969
 	.byte 0
 
 Route115_MapScript1_1F2930: @ 81F2930
-	compare VAR_0x4037, 3
-	call_if_eq Route115_EventScript_273939
-	compare VAR_0x4037, 4
-	call_if_eq Route115_EventScript_27394C
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East
 	end
 
 Route115_MapScript1_1F2947: @ 81F2947
-	compare VAR_0x4039, 1
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route115_EventScript_273D13
-	compare VAR_0x4037, 3
-	call_if_eq Route115_EventScript_273D1B
-	compare VAR_0x4037, 4
-	call_if_eq Route115_EventScript_273D1B
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
+	call_if_eq UnusualWeather_StartGroudonWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route115_MapScript2_1F2969: @ 81F2969
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route115_EventScript_1F2973:: @ 81F2973
diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc
deleted file mode 100644
index fef193c0f..000000000
--- a/data/maps/Route116/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route116_MapConnectionsList: @ 8486A34
-	connection down, 80, MAP_VERDANTURF_TOWN
-	connection left, 0, MAP_RUSTBORO_CITY
-
-Route116_MapConnections: @ 8486A4C
-	.4byte 0x2
-	.4byte Route116_MapConnectionsList
-
diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc
deleted file mode 100644
index 37c54eb7e..000000000
--- a/data/maps/Route116/events.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-Route116_EventObjects: @ 852A4B8
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0
-	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_11
-	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_12
-	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, FLAG_ITEM_ROUTE_116_ETHER
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, FLAG_ITEM_ROUTE_116_REPEL
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, FLAG_HIDE_ROUTE_116_MR_BRINEY
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_13
-	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_14
-	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, FLAG_ITEM_ROUTE_116_HP_UP
-	object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0
-	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0
-	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0
-	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, FLAG_ITEM_ROUTE_116_X_SPECIAL
-	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, FLAG_HIDE_ROUTE_116_TUNNELER
-	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN
-	object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0
-	object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0
-	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, FLAG_ITEM_ROUTE_116_POTION
-	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_15
-	object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0
-	object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0
-
-Route116_MapWarps: @ 852A758
-	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
-	warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-	warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-
-Route116_MapCoordEvents: @ 852A780
-	coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95
-
-Route116_MapBGEvents: @ 852A790
-	bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57
-	bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60
-	bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69
-	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, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D72
-	bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B
-	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_ROUTE_116_SUPER_POTION
-	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES
-
-Route116_MapEvents:: @ 852A814
-	map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
-
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
deleted file mode 100644
index e97885bc7..000000000
--- a/data/maps/Route116/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route116: @ 848281C
-	.4byte Route116_Layout
-	.4byte Route116_MapEvents
-	.4byte Route116_MapScripts
-	.4byte Route116_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte 32
-	.byte MAPSEC_ROUTE_116
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
new file mode 100644
index 000000000..27eb381d0
--- /dev/null
+++ b/data/maps/Route116/map.json
@@ -0,0 +1,527 @@
+{
+  "id": "MAP_ROUTE116",
+  "name": "Route116",
+  "layout": "LAYOUT_ROUTE116",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_116",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 80,
+      "map": "MAP_VERDANTURF_TOWN"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_RUSTBORO_CITY"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 18,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "25",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 19,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "26",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route116_EventScript_1F2E89",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 21,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 32,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_2906BB",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 13,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route116_EventScript_1F2EA0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 19,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_290E85",
+      "flag": "FLAG_ITEM_ROUTE_116_ETHER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 10,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_290E92",
+      "flag": "FLAG_ITEM_ROUTE_116_REPEL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 20,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "66",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 21,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "67",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 46,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_1F2D84",
+      "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 28,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_2906BB",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 36,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route116_EventScript_1F2F65",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 24,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_2906BB",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 80,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_290E9F",
+      "flag": "FLAG_ITEM_ROUTE_116_HP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 26,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route116_EventScript_1F2F7C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 22,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route116_EventScript_1F2F93",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 28,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route116_EventScript_1F2EB7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 46,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_1F2CA2",
+      "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 55,
+      "y": 12,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_290E78",
+      "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 38,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_1F2C70",
+      "flag": "FLAG_HIDE_ROUTE_116_TUNNELER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 74,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_1F2DB6",
+      "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route116_EventScript_1F3041",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route116_EventScript_1F3058",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 34,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_290EAC",
+      "flag": "FLAG_ITEM_ROUTE_116_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 30,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_EventScript_2906BB",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 36,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route116_EventScript_1F3086",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 42,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route116_EventScript_1F306F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 47,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTURF_TUNNEL",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 38,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE116_TUNNELERS_REST_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 65,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTURF_TUNNEL",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 59,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 79,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 47,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_ROUTE116_STATE",
+      "var_value": "1",
+      "script": "Route116_EventScript_1F2D95"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route116_EventScript_1F2D57"
+    },
+    {
+      "type": "sign",
+      "x": 48,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route116_EventScript_1F2D60"
+    },
+    {
+      "type": "sign",
+      "x": 40,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route116_EventScript_1F2D69"
+    },
+    {
+      "type": "secret_base",
+      "x": 71,
+      "y": 4,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE1_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 79,
+      "y": 11,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE2_1"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route116_EventScript_1F2D72"
+    },
+    {
+      "type": "sign",
+      "x": 29,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route116_EventScript_1F2D7B"
+    },
+    {
+      "type": "secret_base",
+      "x": 56,
+      "y": 6,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE3_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 55,
+      "y": 15,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE4_2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "item": "ITEM_SUPER_POTION",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION"
+    },
+    {
+      "type": "hidden_item",
+      "x": 70,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_BLACK_GLASSES",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index 623c74e3c..454201307 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -1,17 +1,17 @@
 Route116_MapScripts:: @ 81F2C0C
-	map_script 3, Route116_MapScript1_1F2C1C
-	map_script 1, Route116_MapScript1_1F2C4F
-	map_script 2, Route116_MapScript2_1F2C66
+	map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_1F2C1C
+	map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66
 	.byte 0
 
 Route116_MapScript1_1F2C1C: @ 81F2C1C
 	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
-	compare VAR_0x4039, 1
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route116_EventScript_273D13
-	compare VAR_0x4037, 5
-	call_if_eq Route116_EventScript_273D1B
-	compare VAR_0x4037, 6
-	call_if_eq Route116_EventScript_273D1B
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
+	call_if_eq UnusualWeather_StartGroudonWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route116_EventScript_1F2C47:: @ 81F2C47
@@ -19,14 +19,14 @@ Route116_EventScript_1F2C47:: @ 81F2C47
 	return
 
 Route116_MapScript1_1F2C4F: @ 81F2C4F
-	compare VAR_0x4037, 5
-	call_if_eq Route116_EventScript_27395F
-	compare VAR_0x4037, 6
-	call_if_eq Route116_EventScript_273972
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South
 	end
 
 Route116_MapScript2_1F2C66: @ 81F2C66
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route116_EventScript_1F2C70:: @ 81F2C70
@@ -145,17 +145,17 @@ Route116_EventScript_1F2D84:: @ 81F2D84
 	lock
 	faceplayer
 	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
-	setvar VAR_0x406F, 2
+	setvar VAR_ROUTE116_STATE, 2
 	release
 	end
 
 Route116_EventScript_1F2D95:: @ 81F2D95
 	lockall
-	applymovement 11, Route116_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4
+	applymovement 11, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
-	setvar VAR_0x406F, 2
+	setvar VAR_ROUTE116_STATE, 2
 	releaseall
 	end
 
diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
deleted file mode 100644
index 32a4dc0ea..000000000
--- a/data/maps/Route116_TunnelersRestHouse/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route116_TunnelersRestHouse_EventObjects: @ 8533E34
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0
-
-Route116_TunnelersRestHouse_MapWarps: @ 8533E7C
-	warp_def 4, 8, 0, 1, MAP_ROUTE116
-	warp_def 5, 8, 0, 1, MAP_ROUTE116
-
-Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C
-	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
deleted file mode 100644
index 1c3abde78..000000000
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route116_TunnelersRestHouse: @ 8483E6C
-	.4byte Route116_TunnelersRestHouse_Layout
-	.4byte Route116_TunnelersRestHouse_MapEvents
-	.4byte Route116_TunnelersRestHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 122
-	.byte MAPSEC_ROUTE_116
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json
new file mode 100644
index 000000000..f9dfb484c
--- /dev/null
+++ b/data/maps/Route116_TunnelersRestHouse/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE",
+  "name": "Route116_TunnelersRestHouse",
+  "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_116",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_TunnelersRestHouse_EventScript_22B85A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_TunnelersRestHouse_EventScript_22B86C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route116_TunnelersRestHouse_EventScript_22B863",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE116",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE116",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index 89ccdce8d..bdd22aadd 100644
--- a/data/maps/Route116_TunnelersRestHouse/scripts.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route116_TunnelersRestHouse_MapScripts:: @ 822B850
-	map_script 3, Route116_TunnelersRestHouse_MapScript1_22B856
+	map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856
 	.byte 0
 
 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856
diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc
deleted file mode 100644
index 2780eac5a..000000000
--- a/data/maps/Route117/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route117_MapConnectionsList: @ 8486A54
-	connection left, 0, MAP_VERDANTURF_TOWN
-	connection right, 0, MAP_MAUVILLE_CITY
-
-Route117_MapConnections: @ 8486A6C
-	.4byte 0x2
-	.4byte Route117_MapConnectionsList
-
diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc
deleted file mode 100644
index 4cede4040..000000000
--- a/data/maps/Route117/events.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-Route117_EventObjects: @ 852A828
-	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0
-	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
-	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
-	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0
-	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0
-	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0
-	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0
-	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, FLAG_ITEM_ROUTE_117_GREAT_BALL
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, FLAG_TEMP_11
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, FLAG_ITEM_ROUTE_117_REVIVE
-	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0
-	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0
-	object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0
-	object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0
-	object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0
-	object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0
-	object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0
-	object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0
-
-Route117_MapWarps: @ 852AA68
-	warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE
-
-Route117_MapBGEvents: @ 852AA70
-	bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5
-	bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE
-	bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7
-	bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL
-
-Route117_MapEvents:: @ 852AAA0
-	map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
-
diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc
deleted file mode 100644
index 1d5eda074..000000000
--- a/data/maps/Route117/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route117: @ 8482838
-	.4byte Route117_Layout
-	.4byte Route117_MapEvents
-	.4byte Route117_MapScripts
-	.4byte Route117_MapConnections
-	.2byte MUS_DOORO_X1
-	.2byte 33
-	.byte MAPSEC_ROUTE_117
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
new file mode 100644
index 000000000..c4cb4d5e5
--- /dev/null
+++ b/data/maps/Route117/map.json
@@ -0,0 +1,385 @@
+{
+  "id": "MAP_ROUTE117",
+  "name": "Route117",
+  "layout": "LAYOUT_ROUTE117",
+  "music": "MUS_DOORO_X1",
+  "region_map_section": "MAPSEC_ROUTE_117",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_VERDANTURF_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_MAUVILLE_CITY"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 13,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_EventScript_1F399A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 25,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_EventScript_1F39A3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 47,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_EventScript_291C18",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 33,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 39,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZUMARILL",
+      "x": 42,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PIKACHU",
+      "x": 49,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M",
+      "x": 38,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 8,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route117_EventScript_1F3A94",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route117_EventScript_1F3A32",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 33,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route117_EventScript_1F39D0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 41,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "29",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 42,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "28",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 43,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "27",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_EventScript_290EB9",
+      "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_EventScript_290EC6",
+      "flag": "FLAG_ITEM_ROUTE_117_REVIVE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F",
+      "x": 26,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route117_EventScript_1F3AF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 17,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route117_EventScript_1F3B58",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 43,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route117_EventScript_1F3BD3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 42,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route117_EventScript_1F3B6F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 48,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_EventScript_1F39AC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 15,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route117_EventScript_1F3C4E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 21,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route117_EventScript_1F3C65",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F",
+      "x": 16,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 4,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route117_EventScript_1F3C37",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 51,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE117_POKEMON_DAY_CARE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route117_EventScript_1F39B5"
+    },
+    {
+      "type": "sign",
+      "x": 49,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route117_EventScript_1F39BE"
+    },
+    {
+      "type": "sign",
+      "x": 49,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route117_EventScript_1F39C7"
+    },
+    {
+      "type": "hidden_item",
+      "x": 3,
+      "y": 18,
+      "elevation": 3,
+      "item": "ITEM_REPEL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_117_REPEL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc
index 4a51c17d8..08571690f 100644
--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -1,5 +1,5 @@
 Route117_MapScripts:: @ 81F397D
-	map_script 3, Route117_MapScript1_1F3983
+	map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_1F3983
 	.byte 0
 
 Route117_MapScript1_1F3983: @ 81F3983
diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc
deleted file mode 100644
index 37a9db0f2..000000000
--- a/data/maps/Route117_PokemonDayCare/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route117_PokemonDayCare_EventObjects: @ 8533EA0
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0
-
-Route117_PokemonDayCare_MapWarps: @ 8533EB8
-	warp_def 2, 8, 0, 0, MAP_ROUTE117
-	warp_def 3, 8, 0, 0, MAP_ROUTE117
-
-Route117_PokemonDayCare_MapEvents:: @ 8533EC8
-	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
deleted file mode 100644
index ba48de228..000000000
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route117_PokemonDayCare: @ 8483E88
-	.4byte Route117_PokemonDayCare_Layout
-	.4byte Route117_PokemonDayCare_MapEvents
-	.4byte Route117_PokemonDayCare_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 123
-	.byte MAPSEC_ROUTE_117
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json
new file mode 100644
index 000000000..c233701e5
--- /dev/null
+++ b/data/maps/Route117_PokemonDayCare/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_ROUTE117_POKEMON_DAY_CARE",
+  "name": "Route117_PokemonDayCare",
+  "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_117",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route117_PokemonDayCare_EventScript_291D11",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE117",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE117",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index b2e9ddfaa..ea9894ffc 100644
--- a/data/maps/Route117_PokemonDayCare/scripts.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
@@ -1,5 +1,5 @@
 Route117_PokemonDayCare_MapScripts:: @ 822BBB1
-	map_script 3, Route117_PokemonDayCare_MapScript1_22BBB7
+	map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7
 	.byte 0
 
 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7
diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc
deleted file mode 100644
index 8069f036e..000000000
--- a/data/maps/Route118/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route118_MapConnectionsList: @ 8486A74
-	connection up, 40, MAP_ROUTE119
-	connection left, 0, MAP_MAUVILLE_CITY
-	connection right, 0, MAP_ROUTE123
-
-Route118_MapConnections: @ 8486A98
-	.4byte 0x3
-	.4byte Route118_MapConnectionsList
-
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
deleted file mode 100644
index fe131549f..000000000
--- a/data/maps/Route118/events.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-Route118_EventObjects: @ 852AAB4
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
-	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
-	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
-	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0
-	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
-	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
-	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
-	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11
-	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
-	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
-	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
-	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION
-	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0
-
-Route118_MapWarps: @ 852ACAC
-	warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-	warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-
-Route118_MapCoordEvents: @ 852ACBC
-	coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E
-	coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE
-	coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4
-
-Route118_MapBGEvents: @ 852ACEC
-	bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1
-	bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C
-	bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85
-	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_ROUTE_118_IRON
-	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE
-
-Route118_MapEvents:: @ 852AD58
-	map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
-
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
deleted file mode 100644
index e0b541643..000000000
--- a/data/maps/Route118/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route118: @ 8482854
-	.4byte Route118_Layout
-	.4byte Route118_MapEvents
-	.4byte Route118_MapScripts
-	.4byte Route118_MapConnections
-	.2byte MUS_ROUTE_118
-	.2byte 34
-	.byte MAPSEC_ROUTE_118
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
new file mode 100644
index 000000000..7fc1e45c7
--- /dev/null
+++ b/data/maps/Route118/map.json
@@ -0,0 +1,421 @@
+{
+  "id": "MAP_ROUTE118",
+  "name": "Route118",
+  "layout": "LAYOUT_ROUTE118",
+  "music": "MUS_ROUTE_118",
+  "region_map_section": "MAPSEC_ROUTE_118",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 40,
+      "map": "MAP_ROUTE119"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_MAUVILLE_CITY"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE123"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 35,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "31",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 36,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "32",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 37,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "33",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 64,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route118_EventScript_1F4079",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_28CE16",
+      "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 34,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_28CE36",
+      "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_1F3E73",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_28CED6",
+      "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 34,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_28CEF6",
+      "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_28CF16",
+      "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 34,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_28CF36",
+      "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 38,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 28,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_1F3E14",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 7,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route118_EventScript_1F3F87",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 14,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_1F4000",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 56,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route118_EventScript_1F4090",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 39,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route118_EventScript_1F3FE9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 17,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route118_EventScript_1F4017",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 44,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_118_STEVEN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 69,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route118_EventScript_290ED3",
+      "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route118_EventScript_1F40A7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 42,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 43,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_ROUTE118_STATE",
+      "var_value": "0",
+      "script": "Route118_EventScript_1F3E8E"
+    },
+    {
+      "type": "trigger",
+      "x": 44,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_ROUTE118_STATE",
+      "var_value": "0",
+      "script": "Route118_EventScript_1F3EAE"
+    },
+    {
+      "type": "trigger",
+      "x": 45,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_ROUTE118_STATE",
+      "var_value": "0",
+      "script": "Route118_EventScript_1F3EC4"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "secret_base",
+      "x": 47,
+      "y": 14,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE1_1"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route118_EventScript_1F3E7C"
+    },
+    {
+      "type": "sign",
+      "x": 56,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route118_EventScript_1F3E85"
+    },
+    {
+      "type": "secret_base",
+      "x": 67,
+      "y": 6,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE2_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 29,
+      "y": 5,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 47,
+      "y": 5,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE1_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 46,
+      "y": 5,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE2_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_IRON",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_IRON"
+    },
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 14,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 45b8665b0..9c1ec46ca 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -1,28 +1,28 @@
 Route118_MapScripts:: @ 81F3DBC
-	map_script 3, Route118_MapScript1_1F3DCC
-	map_script 1, Route118_MapScript1_1F3DF3
-	map_script 2, Route118_MapScript2_1F3E0A
+	map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC
+	map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A
 	.byte 0
 
 Route118_MapScript1_1F3DCC: @ 81F3DCC
 	call Route118_EventScript_28CCC7
-	compare VAR_0x4039, 1
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route118_EventScript_273D13
-	compare VAR_0x4037, 7
-	call_if_eq Route118_EventScript_273D1B
-	compare VAR_0x4037, 8
-	call_if_eq Route118_EventScript_273D1B
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
+	call_if_eq UnusualWeather_StartGroudonWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route118_MapScript1_1F3DF3: @ 81F3DF3
-	compare VAR_0x4037, 7
-	call_if_eq Route118_EventScript_273985
-	compare VAR_0x4037, 8
-	call_if_eq Route118_EventScript_273998
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West
 	end
 
 Route118_MapScript2_1F3E0A: @ 81F3E0A
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route118_EventScript_1F3E14:: @ 81F3E14
@@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85
 Route118_EventScript_1F3E8E:: @ 81F3E8E
 	lockall
 	setvar VAR_0x8008, 0
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	applymovement 19, Route118_Movement_1F3F61
 	waitmovement 0
@@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E
 Route118_EventScript_1F3EAE:: @ 81F3EAE
 	lockall
 	setvar VAR_0x8008, 1
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	goto Route118_EventScript_1F3EE4
 	end
@@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE
 Route118_EventScript_1F3EC4:: @ 81F3EC4
 	lockall
 	setvar VAR_0x8008, 2
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	applymovement 19, Route118_Movement_1F3F63
 	waitmovement 0
@@ -107,7 +107,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4
 	call_if_eq Route118_EventScript_1F3F3A
 	compare VAR_0x8008, 2
 	call_if_eq Route118_EventScript_1F3F4C
-	setvar VAR_0x4071, 1
+	setvar VAR_ROUTE118_STATE, 1
 	removeobject 19
 	releaseall
 	end
diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc
deleted file mode 100644
index 4987e049e..000000000
--- a/data/maps/Route119/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route119_MapConnectionsList: @ 8486AA0
-	connection down, -40, MAP_ROUTE118
-	connection right, 0, MAP_FORTREE_CITY
-
-Route119_MapConnections: @ 8486AB8
-	.4byte 0x2
-	.4byte Route119_MapConnectionsList
-
diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc
deleted file mode 100644
index 86ec2d2be..000000000
--- a/data/maps/Route119/events.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-Route119_EventObjects: @ 852AD6C
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0
-	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0
-	object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F479D, 0
-	object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F4810, 0
-	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F4786, 0
-	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1F4872, 0
-	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0
-	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0
-	object_event 12, EVENT_OBJ_GFX_NINJA_BOY, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0
-	object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0
-	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0
-	object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0
-	object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL
-	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, FLAG_ITEM_ROUTE_119_SUPER_REPEL
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, FLAG_ITEM_ROUTE_119_ZINC
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, FLAG_ITEM_ROUTE_119_ELIXIR_1
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, FLAG_ITEM_ROUTE_119_LEAF_STONE
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, FLAG_ITEM_ROUTE_119_RARE_CANDY
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, FLAG_ITEM_ROUTE_119_HYPER_POTION_1
-	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-	object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
-	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0
-	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0
-	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0
-	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0
-	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0
-	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0
-	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, FLAG_ITEM_ROUTE_119_HYPER_POTION_2
-	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0
-	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0
-	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, FLAG_HIDE_ROUTE_119_KECLEON_1
-	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, FLAG_HIDE_ROUTE_119_KECLEON_2
-	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0
-	object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0
-	object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0
-	object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0
-	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, FLAG_ITEM_ROUTE_119_NUGGET
-	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2
-	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT
-
-Route119_MapWarps: @ 852B174
-	warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F
-	warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE
-
-Route119_MapCoordEvents: @ 852B184
-	coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472
-	coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D
-	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 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 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
-	coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-
-Route119_MapBGEvents: @ 852B2F4
-	bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D
-	bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774
-	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_ROUTE_119_CALCIUM
-	bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL
-	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_ROUTE_119_FULL_HEAL
-	bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER
-	bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3
-
-Route119_MapEvents:: @ 852B3E4
-	map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
-
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
deleted file mode 100644
index 7181f6b0d..000000000
--- a/data/maps/Route119/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119: @ 8482870
-	.4byte Route119_Layout
-	.4byte Route119_MapEvents
-	.4byte Route119_MapScripts
-	.4byte Route119_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 35
-	.byte MAPSEC_ROUTE_119
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
new file mode 100644
index 000000000..2146d5ec7
--- /dev/null
+++ b/data/maps/Route119/map.json
@@ -0,0 +1,920 @@
+{
+  "id": "MAP_ROUTE119",
+  "name": "Route119",
+  "layout": "LAYOUT_ROUTE119",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_119",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": -40,
+      "map": "MAP_ROUTE118"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_FORTREE_CITY"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 24,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "34",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 25,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "35",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 26,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "36",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 12,
+      "y": 123,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route119_EventScript_1F47E2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 26,
+      "y": 123,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route119_EventScript_1F47B4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 5,
+      "y": 125,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route119_EventScript_1F479D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 7,
+      "y": 74,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route119_EventScript_1F4810",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 28,
+      "y": 116,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route119_EventScript_1F4786",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 35,
+      "y": 83,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route119_EventScript_1F4872",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 34,
+      "y": 122,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route119_EventScript_1F47CB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 17,
+      "y": 128,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route119_EventScript_1F47F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 28,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route119_EventScript_1F4902",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 19,
+      "y": 49,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route119_EventScript_1F4919",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 10,
+      "y": 50,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route119_EventScript_1F48D4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 8,
+      "y": 63,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route119_EventScript_1F48EB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 25,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_119_RIVAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 12,
+      "y": 121,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290EE0",
+      "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 4,
+      "y": 96,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290EED",
+      "flag": "FLAG_ITEM_ROUTE_119_ZINC"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 29,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290EFA",
+      "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 25,
+      "y": 76,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290F07",
+      "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 8,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290F14",
+      "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 33,
+      "y": 117,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290F21",
+      "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 13,
+      "y": 33,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_1F49A3",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 13,
+      "y": 34,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_1F49BA",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 17,
+      "y": 33,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 31,
+      "y": 109,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_1F49D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 8,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "83",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 9,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "84",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 29,
+      "y": 90,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "85",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 30,
+      "y": 90,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "86",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M",
+      "x": 19,
+      "y": 133,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_1F476B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 56,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290F2E",
+      "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 35,
+      "y": 93,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_1F49DA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 29,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route119_EventScript_1F4930",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 31,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_27231C",
+      "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 25,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_272329",
+      "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 13,
+      "y": 104,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_1F4947",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 8,
+      "y": 68,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route119_EventScript_1F498C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 16,
+      "y": 52,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route119_EventScript_1F4975",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 32,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route119_EventScript_1F495E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 19,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_291399",
+      "flag": "FLAG_ITEM_ROUTE_119_NUGGET"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 24,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_EventScript_290F3B",
+      "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 28,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_119_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 33,
+      "y": 109,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 31,
+      "elevation": 0,
+      "var": "VAR_ROUTE119_STATE",
+      "var_value": "0",
+      "script": "Route119_EventScript_1F4472"
+    },
+    {
+      "type": "trigger",
+      "x": 26,
+      "y": 31,
+      "elevation": 0,
+      "var": "VAR_ROUTE119_STATE",
+      "var_value": "0",
+      "script": "Route119_EventScript_1F447D"
+    },
+    {
+      "type": "weather",
+      "x": 29,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 30,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 31,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 32,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 15,
+      "y": 133,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 16,
+      "y": 132,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 17,
+      "y": 131,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 18,
+      "y": 130,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 131,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 20,
+      "y": 132,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 21,
+      "y": 133,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 36,
+      "y": 6,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 36,
+      "y": 7,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 35,
+      "y": 8,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 35,
+      "y": 9,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 16,
+      "y": 137,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 17,
+      "y": 137,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 18,
+      "y": 137,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 137,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 20,
+      "y": 137,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 34,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 33,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route119_EventScript_1F477D"
+    },
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 19,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route119_EventScript_1F4774"
+    },
+    {
+      "type": "secret_base",
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB1_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 4,
+      "y": 89,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB1_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 5,
+      "y": 15,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB2_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 7,
+      "y": 101,
+      "elevation": 3,
+      "secret_base_id": "SECRET_BASE_SHRUB2_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 34,
+      "y": 24,
+      "elevation": 3,
+      "secret_base_id": "SECRET_BASE_SHRUB3_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 31,
+      "y": 73,
+      "elevation": 3,
+      "secret_base_id": "SECRET_BASE_SHRUB4_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 16,
+      "y": 81,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE3_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 16,
+      "y": 28,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE4_3"
+    },
+    {
+      "type": "hidden_item",
+      "x": 17,
+      "y": 82,
+      "elevation": 3,
+      "item": "ITEM_CALCIUM",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM"
+    },
+    {
+      "type": "hidden_item",
+      "x": 38,
+      "y": 63,
+      "elevation": 3,
+      "item": "ITEM_ULTRA_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL"
+    },
+    {
+      "type": "secret_base",
+      "x": 26,
+      "y": 81,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE3_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 19,
+      "y": 76,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE2_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 18,
+      "y": 76,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE4_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 4,
+      "y": 15,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB3_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB4_3"
+    },
+    {
+      "type": "hidden_item",
+      "x": 26,
+      "y": 120,
+      "elevation": 3,
+      "item": "ITEM_FULL_HEAL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 20,
+      "y": 29,
+      "elevation": 3,
+      "item": "ITEM_MAX_ETHER",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER"
+    },
+    {
+      "type": "sign",
+      "x": 28,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route119_EventScript_1F49E3"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index dee76d71d..22a73b74b 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -1,6 +1,6 @@
 Route119_MapScripts:: @ 81F4424
-	map_script 5, Route119_MapScript1_1F442F
-	map_script 3, Route119_MapScript1_1F444D
+	map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F
+	map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_1F444D
 	.byte 0
 
 Route119_MapScript1_1F442F: @ 81F442F
@@ -10,13 +10,13 @@ Route119_MapScript1_1F442F: @ 81F442F
 Route119_EventScript_1F4439:: @ 81F4439
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne Route119_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
 Route119_MapScript1_1F444D: @ 81F444D
-	call Route119_EventScript_271ED7
-	call Route119_EventScript_271EFB
+	call Common_EventScript_SetupRivalGender
+	call Common_EventScript_SetupRivalOnBikeGender
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
 	call_if_eq Route119_EventScript_1F4466
 	special SetRoute119Weather
@@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488
 	call_if_eq Route119_EventScript_1F46C6
 	compare VAR_TEMP_1, 2
 	call_if_eq Route119_EventScript_1F46D1
-	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	compare VAR_TEMP_1, 1
@@ -156,7 +156,7 @@ Route119_EventScript_1F460F:: @ 81F460F
 	compare VAR_TEMP_1, 2
 	call_if_eq Route119_EventScript_1F46EE
 	removeobject 25
-	setvar VAR_0x4072, 1
+	setvar VAR_ROUTE119_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	delay 60
@@ -167,7 +167,7 @@ Route119_EventScript_1F460F:: @ 81F460F
 	addobject 43
 	applymovement 43, Route119_Movement_1F4752
 	waitmovement 0
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
@@ -459,7 +459,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3
 	faceplayer
 	msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -469,7 +469,7 @@ Route119_EventScript_1F49BA:: @ 81F49BA
 	faceplayer
 	msgbox Route119_Text_1F5147, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -491,7 +491,7 @@ Route119_EventScript_1F49EC:: @ 81F49EC
 	pokenavcall Route119_Text_1F4FBA
 	waitmessage
 	clearflag FLAG_REGISTER_WINONA_POKENAV
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	releaseall
 	end
 
diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc
deleted file mode 100644
index aff8116a7..000000000
--- a/data/maps/Route119_House/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route119_House_EventObjects: @ 853ECD0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0
-	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0
-	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0
-	object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0
-	object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
-	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0
-
-Route119_House_MapWarps: @ 853ED78
-	warp_def 3, 8, 0, 1, MAP_ROUTE119
-	warp_def 4, 8, 0, 1, MAP_ROUTE119
-
-Route119_House_MapEvents:: @ 853ED88
-	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
deleted file mode 100644
index 334b858ec..000000000
--- a/data/maps/Route119_House/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119_House: @ 8485D28
-	.4byte House1_Layout
-	.4byte Route119_House_MapEvents
-	.4byte Route119_House_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 59
-	.byte MAPSEC_ROUTE_119
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json
new file mode 100644
index 000000000..31d84664f
--- /dev/null
+++ b/data/maps/Route119_House/map.json
@@ -0,0 +1,127 @@
+{
+  "id": "MAP_ROUTE119_HOUSE",
+  "name": "Route119_House",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_119",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_House_EventScript_270966",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_House_EventScript_27096F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_House_EventScript_27096F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_House_EventScript_27096F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 3,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_House_EventScript_27096F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_House_EventScript_27096F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_House_EventScript_27096F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
deleted file mode 100644
index 6d72fea9c..000000000
--- a/data/maps/Route119_WeatherInstitute_1F/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-Route119_WeatherInstitute_1F_EventObjects: @ 853EB20
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
-	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0
-
-Route119_WeatherInstitute_1F_MapWarps: @ 853EB98
-	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: @ 853EBB0
-	bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18
-	bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18
-	bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18
-	bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18
-
-Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0
-	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
deleted file mode 100644
index e5e7abbc9..000000000
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119_WeatherInstitute_1F: @ 8485CF0
-	.4byte Route119_WeatherInstitute_1F_Layout
-	.4byte Route119_WeatherInstitute_1F_MapEvents
-	.4byte Route119_WeatherInstitute_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 271
-	.byte MAPSEC_ROUTE_119
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json
new file mode 100644
index 000000000..8200c20df
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_1F/map.json
@@ -0,0 +1,141 @@
+{
+  "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F",
+  "name": "Route119_WeatherInstitute_1F",
+  "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_119",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 15,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FB29",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FB40",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F",
+      "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 2,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8",
+      "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 14,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+    },
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+    },
+    {
+      "type": "sign",
+      "x": 0,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index ae0fea259..09ed3c4f5 100644
--- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
@@ -1,5 +1,5 @@
 Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86
-	map_script 3, Route119_WeatherInstitute_1F_MapScript1_26FA8C
+	map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_26FA8C
 	.byte 0
 
 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C
@@ -57,7 +57,7 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18
 	lockall
 	msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT
 	closemessage
-	call Route119_WeatherInstitute_1F_EventScript_272083
+	call Common_EventScript_OutOfCenterPartyHeal
 	releaseall
 	end
 
diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
deleted file mode 100644
index d2cc64d40..000000000
--- a/data/maps/Route119_WeatherInstitute_2F/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
-	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-
-Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
-	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
-
-Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC
-	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
deleted file mode 100644
index c81f9731c..000000000
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119_WeatherInstitute_2F: @ 8485D0C
-	.4byte Route119_WeatherInstitute_2F_Layout
-	.4byte Route119_WeatherInstitute_2F_MapEvents
-	.4byte Route119_WeatherInstitute_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 272
-	.byte MAPSEC_ROUTE_119
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json
new file mode 100644
index 000000000..4b4534a8e
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/map.json
@@ -0,0 +1,133 @@
+{
+  "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F",
+  "name": "Route119_WeatherInstitute_2F",
+  "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_119",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route119_WeatherInstitute_2F_EventScript_26FF96",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 18,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route119_WeatherInstitute_2F_EventScript_27018B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 16,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 19,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route119_WeatherInstitute_2F_EventScript_26FF68",
+      "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index bbee65df8..fa2664d68 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -1,5 +1,5 @@
 Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
-	map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24
+	map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_26FF24
 	.byte 0
 
 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
@@ -55,9 +55,9 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
 	msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT
 	closemessage
 	playse SE_PIN
-	applymovement 3, Route119_WeatherInstitute_2F_Movement_272598
+	applymovement 3, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A
+	applymovement 3, Common_Movement_Delay48
 	waitmovement 0
 	msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT
 	closemessage
@@ -98,7 +98,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
 	compare VAR_RESULT, 0
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA
 	call Route119_WeatherInstitute_2F_EventScript_27378B
-	call Route119_WeatherInstitute_2F_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto Route119_WeatherInstitute_2F_EventScript_2700EA
 	end
 
@@ -131,41 +131,43 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA
 	end
 
 Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7
-	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_27010A
+	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather
 	msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A
+Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A
+    @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated
+    @ already.
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_270160
-	call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_270160
+	call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount
+	call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount
 	compare VAR_0x8004, 2
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166
-	call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159
-	specialvar VAR_RESULT, sub_813B374
+	goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated
+	call_if_unset FLAG_TEMP_2, WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather
+	specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType
 	compare VAR_RESULT, 1
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_27014F
-	msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT
+	goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage
+	msgbox WeatherInstitute_UnusualWeather_GroudonWeatherText, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F
-	msgbox Route119_WeatherInstitute_2F_Text_270873, MSGBOX_DEFAULT
+WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage:: @ 827014F
+	msgbox WeatherInstitute_UnusualWeather_KyogreWeatherText, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159
-	special sub_813B2E4
+WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather:: @ 8270159
+	special CreateUnusualWeatherEvent
 	setflag FLAG_TEMP_2
 	return
 
-Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160
+WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount:: @ 8270160
 	addvar VAR_0x8004, 1
 	return
 
-Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166
-	msgbox Route119_WeatherInstitute_2F_Text_2708FC, MSGBOX_DEFAULT
+WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated:: @ 8270166
+	msgbox WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText, MSGBOX_DEFAULT
 	release
 	end
 
@@ -309,7 +311,7 @@ Route119_WeatherInstitute_2F_Text_27077E: @ 827077E
 	.string "years, but it's ridiculous to think that\l"
 	.string "humans can freely change the weather.$"
 
-Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1
+WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, a drought has been recorded\n"
@@ -317,7 +319,7 @@ Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-Route119_WeatherInstitute_2F_Text_270873: @ 8270873
+WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, heavy rainfall has been\n"
@@ -325,7 +327,7 @@ Route119_WeatherInstitute_2F_Text_270873: @ 8270873
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC
+WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText: @ 82708FC
 	.string "Abnormal weather conditions are\n"
 	.string "no longer being reported.\p"
 	.string "The occasional rainfall is a blessing,\n"
diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc
deleted file mode 100644
index c599e6a2c..000000000
--- a/data/maps/Route120/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route120_MapConnectionsList: @ 8486AC0
-	connection left, 0, MAP_FORTREE_CITY
-	connection right, 80, MAP_ROUTE121
-
-Route120_MapConnections: @ 8486AD8
-	.4byte 0x2
-	.4byte Route120_MapConnectionsList
-
diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc
deleted file mode 100644
index 24b289060..000000000
--- a/data/maps/Route120/events.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-Route120_EventObjects: @ 852B3F8
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, BerryTreeScript, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, BerryTreeScript, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0
-	object_event 12, EVENT_OBJ_GFX_MAN_5, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0
-	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
-	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
-	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, FLAG_ITEM_ROUTE_120_NUGGET
-	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
-	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
-	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
-	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
-	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_11
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, FLAG_ITEM_ROUTE_120_FULL_HEAL
-	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
-	object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
-	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION
-	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1
-	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_HIDE_ROUTE_120_STEVEN
-	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14
-	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12
-	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
-	object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
-	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE
-	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, FLAG_HIDE_ROUTE_120_KECLEON_2
-	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, FLAG_HIDE_ROUTE_120_KECLEON_3
-	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, FLAG_HIDE_ROUTE_120_KECLEON_4
-	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, FLAG_HIDE_ROUTE_120_KECLEON_6
-	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, FLAG_HIDE_ROUTE_120_KECLEON_5
-	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
-	object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
-	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE
-
-Route120_MapWarps: @ 852B818
-	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
-	warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB
-
-Route120_MapCoordEvents: @ 852B828
-	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: @ 852B958
-	bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5
-	bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE
-	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_ROUTE_120_RARE_CANDY_1
-	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE
-	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2
-	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC
-	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
-
-Route120_MapEvents:: @ 852BA00
-	map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
-
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
deleted file mode 100644
index 626b57a94..000000000
--- a/data/maps/Route120/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route120: @ 848288C
-	.4byte Route120_Layout
-	.4byte Route120_MapEvents
-	.4byte Route120_MapScripts
-	.4byte Route120_MapConnections
-	.2byte MUS_DOORO_X3
-	.2byte 36
-	.byte MAPSEC_ROUTE_120
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
new file mode 100644
index 000000000..63585f86f
--- /dev/null
+++ b/data/maps/Route120/map.json
@@ -0,0 +1,858 @@
+{
+  "id": "MAP_ROUTE120",
+  "name": "Route120",
+  "layout": "LAYOUT_ROUTE120",
+  "music": "MUS_DOORO_X3",
+  "region_map_section": "MAPSEC_ROUTE_120",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_FORTREE_CITY"
+    },
+    {
+      "direction": "right",
+      "offset": 80,
+      "map": "MAP_ROUTE121"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 4,
+      "y": 79,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "46",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 5,
+      "y": 79,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "45",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 6,
+      "y": 79,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "44",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 7,
+      "y": 79,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "43",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 34,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "37",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 35,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "38",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 36,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "39",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 9,
+      "y": 92,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "40",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 10,
+      "y": 92,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "41",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 11,
+      "y": 92,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "42",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 5,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F57D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 32,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F57EE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 27,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route120_EventScript_1F5850",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 36,
+      "y": 45,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route120_EventScript_1F5867",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 19,
+      "y": 80,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F587E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 20,
+      "y": 55,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_290F48",
+      "flag": "FLAG_ITEM_ROUTE_120_NUGGET"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 37,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_28CE76",
+      "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 36,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_28CE56",
+      "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 36,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_28CF16",
+      "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 37,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_28CF36",
+      "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 35,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 89,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_290F55",
+      "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 14,
+      "y": 92,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_1F5527",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 31,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route120_EventScript_1F58E0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 9,
+      "y": 60,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route120_EventScript_1F58F7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 16,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route120_EventScript_1F590E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 18,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F5925",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 22,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_290F6F",
+      "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 23,
+      "y": 82,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_290F62",
+      "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 12,
+      "y": 16,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_1F57BC",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 13,
+      "y": 15,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_1F5641",
+      "flag": "FLAG_HIDE_ROUTE_120_STEVEN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 20,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_2906BB",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 15,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_2906BB",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 10,
+      "y": 72,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F593C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 19,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F5953",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_2",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 20,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_2722DB",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 27,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_2722E8",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 4,
+      "y": 77,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_2722F5",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 7,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_27230F",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 19,
+      "y": 48,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_272302",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 19,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F5981",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 14,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route120_EventScript_1F596A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 24,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route120_EventScript_290F7C",
+      "flag": "FLAG_ITEM_ROUTE_120_REVIVE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 55,
+      "elevation": 0,
+      "dest_map": "MAP_ANCIENT_TOMB",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 23,
+      "elevation": 1,
+      "dest_map": "MAP_SCORCHED_SLAB",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "weather",
+      "x": 7,
+      "y": 15,
+      "elevation": 0,
+      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+    },
+    {
+      "type": "weather",
+      "x": 7,
+      "y": 16,
+      "elevation": 0,
+      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+    },
+    {
+      "type": "weather",
+      "x": 22,
+      "y": 61,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+    },
+    {
+      "type": "weather",
+      "x": 12,
+      "y": 64,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+    },
+    {
+      "type": "weather",
+      "x": 35,
+      "y": 63,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 36,
+      "y": 63,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 37,
+      "y": 63,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 38,
+      "y": 63,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 32,
+      "y": 88,
+      "elevation": 5,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 28,
+      "y": 15,
+      "elevation": 0,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 28,
+      "y": 16,
+      "elevation": 0,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 28,
+      "y": 17,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 32,
+      "y": 89,
+      "elevation": 5,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 32,
+      "y": 90,
+      "elevation": 5,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 32,
+      "y": 91,
+      "elevation": 5,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 10,
+      "y": 75,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 11,
+      "y": 75,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 12,
+      "y": 75,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    },
+    {
+      "type": "weather",
+      "x": 13,
+      "y": 75,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_CLOUDS"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 3,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route120_EventScript_1F57C5"
+    },
+    {
+      "type": "sign",
+      "x": 38,
+      "y": 88,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route120_EventScript_1F57CE"
+    },
+    {
+      "type": "secret_base",
+      "x": 28,
+      "y": 62,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE3_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 30,
+      "y": 62,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE4_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 26,
+      "y": 10,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB3_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 29,
+      "y": 85,
+      "elevation": 5,
+      "secret_base_id": "SECRET_BASE_SHRUB4_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 18,
+      "y": 12,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE2_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 38,
+      "y": 54,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB1_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 31,
+      "y": 23,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB2_3"
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 11,
+      "elevation": 3,
+      "item": "ITEM_REVIVE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 0,
+      "y": 86,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 24,
+      "y": 42,
+      "elevation": 3,
+      "item": "ITEM_ZINC",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_ZINC"
+    },
+    {
+      "type": "secret_base",
+      "x": 5,
+      "y": 76,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB1_4"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index cd864e1dc..40c9ee09a 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -1,7 +1,7 @@
 Route120_MapScripts:: @ 81F53EC
-	map_script 5, Route120_MapScript1_1F53FC
-	map_script 3, Route120_MapScript1_1F54CD
-	map_script 1, Route120_MapScript1_1F5474
+	map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC
+	map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1F54CD
+	map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474
 	.byte 0
 
 Route120_MapScript1_1F53FC: @ 81F53FC
@@ -26,7 +26,7 @@ Route120_EventScript_1F5406:: @ 81F5406
 Route120_EventScript_1F5449:: @ 81F5449
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne Route120_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 30
 	removeobject 36
 	return
@@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449
 Route120_EventScript_1F5460:: @ 81F5460
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne Route120_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
@@ -98,7 +98,7 @@ Route120_EventScript_1F5523:: @ 81F5523
 Route120_EventScript_1F5527:: @ 81F5527
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_1F5625
 	msgbox Route120_Text_2A70C7, MSGBOX_YESNO
 	compare VAR_RESULT, 1
@@ -147,7 +147,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6
 Route120_EventScript_1F5601:: @ 81F5601
 	giveitem_std VAR_0x8004
 	compare VAR_RESULT, 0
-	goto_if_eq Route120_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY
 	msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT
 	release
@@ -196,12 +196,12 @@ Route120_EventScript_1F568B:: @ 81F568B
 	call_if_eq Route120_EventScript_1F57A3
 	compare VAR_FACING, 3
 	call_if_eq Route120_EventScript_1F57AE
-	applymovement 31, Route120_Movement_2725A4
+	applymovement 31, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 20
 	msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT
 	closemessage
-	applymovement 30, Route120_Movement_2725A8
+	applymovement 30, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 30, Route120_Movement_2723C7
 	waitmovement 0
@@ -233,15 +233,15 @@ Route120_EventScript_1F571C:: @ 81F571C
 	end
 
 Route120_EventScript_1F572C:: @ 81F572C
-	applymovement 31, Route120_Movement_2725AA
-	applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6
+	applymovement 31, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT
 	giveitem_std ITEM_DEVON_SCOPE
 	setflag FLAG_RECEIVED_DEVON_SCOPE
 	msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, Route120_Movement_2725AA
+	applymovement 31, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
@@ -258,7 +258,7 @@ Route120_EventScript_1F572C:: @ 81F572C
 	end
 
 Route120_EventScript_1F57A3:: @ 81F57A3
-	applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc
deleted file mode 100644
index 94116a03e..000000000
--- a/data/maps/Route121/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route121_MapConnectionsList: @ 8486AE0
-	connection down, 20, MAP_ROUTE122
-	connection left, -80, MAP_ROUTE120
-	connection right, -10, MAP_LILYCOVE_CITY
-
-Route121_MapConnections: @ 8486B04
-	.4byte 0x3
-	.4byte Route121_MapConnectionsList
-
diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc
deleted file mode 100644
index 432071ed1..000000000
--- a/data/maps/Route121/events.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-Route121_EventObjects: @ 852BA14
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, BerryTreeScript, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0
-	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0
-	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS
-	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11
-	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12
-	object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
-	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0
-	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0
-	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_ITEM_ROUTE_121_CARBOS
-	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13
-	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0
-	object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
-	object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
-	object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC
-
-Route121_MapWarps: @ 852BCCC
-	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
-
-Route121_MapCoordEvents: @ 852BCD4
-	coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
-	coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
-	coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
-	coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
-
-Route121_MapBGEvents: @ 852BD14
-	bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06
-	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, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F
-	bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP
-	bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET
-	bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL
-	bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE
-
-Route121_MapEvents:: @ 852BD8C
-	map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
-
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
deleted file mode 100644
index 3f070c2ec..000000000
--- a/data/maps/Route121/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route121: @ 84828A8
-	.4byte Route121_Layout
-	.4byte Route121_MapEvents
-	.4byte Route121_MapScripts
-	.4byte Route121_MapConnections
-	.2byte MUS_DOORO_X3
-	.2byte 37
-	.byte MAPSEC_ROUTE_121
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
new file mode 100644
index 000000000..4339b149d
--- /dev/null
+++ b/data/maps/Route121/map.json
@@ -0,0 +1,536 @@
+{
+  "id": "MAP_ROUTE121",
+  "name": "Route121",
+  "layout": "LAYOUT_ROUTE121",
+  "music": "MUS_DOORO_X3",
+  "region_map_section": "MAPSEC_ROUTE_121",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 20,
+      "map": "MAP_ROUTE122"
+    },
+    {
+      "direction": "left",
+      "offset": -80,
+      "map": "MAP_ROUTE120"
+    },
+    {
+      "direction": "right",
+      "offset": -10,
+      "map": "MAP_LILYCOVE_CITY"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 29,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_EventScript_1F5DFD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "47",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "48",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 16,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "49",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 17,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "50",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 64,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "51",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 65,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "52",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 66,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "53",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 67,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "54",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 39,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route121_EventScript_1F5F04",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 40,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route121_EventScript_1F5F1F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 30,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 30,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 31,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 32,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 65,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_EventScript_2906BB",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 63,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route121_EventScript_1F5E74",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 55,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route121_EventScript_1F5E8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route121_EventScript_1F5EED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 22,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route121_EventScript_1F5F3A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 55,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_EventScript_290F89",
+      "flag": "FLAG_ITEM_ROUTE_121_CARBOS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 26,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_EventScript_2906BB",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route121_EventScript_1F5F9C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 59,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route121_EventScript_1F5FB3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 59,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route121_EventScript_1F5FCA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 65,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route121_EventScript_1F5FE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 72,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route121_EventScript_1F5FF8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 60,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_EventScript_290F96",
+      "flag": "FLAG_ITEM_ROUTE_121_REVIVE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 38,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_EventScript_290FA3",
+      "flag": "FLAG_ITEM_ROUTE_121_ZINC"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 37,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_ROUTE121_STATE",
+      "var_value": "0",
+      "script": "Route121_EventScript_1F5E18"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_ROUTE121_STATE",
+      "var_value": "0",
+      "script": "Route121_EventScript_1F5E18"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_ROUTE121_STATE",
+      "var_value": "0",
+      "script": "Route121_EventScript_1F5E18"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_ROUTE121_STATE",
+      "var_value": "0",
+      "script": "Route121_EventScript_1F5E18"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route121_EventScript_1F5E06"
+    },
+    {
+      "type": "secret_base",
+      "x": 40,
+      "y": 11,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE2_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 18,
+      "y": 13,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE3_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 43,
+      "y": 7,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE1_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 42,
+      "y": 7,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE2_2"
+    },
+    {
+      "type": "sign",
+      "x": 39,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route121_EventScript_1F5E0F"
+    },
+    {
+      "type": "hidden_item",
+      "x": 23,
+      "y": 10,
+      "elevation": 3,
+      "item": "ITEM_HP_UP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP"
+    },
+    {
+      "type": "hidden_item",
+      "x": 58,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_NUGGET",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET"
+    },
+    {
+      "type": "hidden_item",
+      "x": 72,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_FULL_HEAL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 68,
+      "y": 8,
+      "elevation": 3,
+      "item": "ITEM_MAX_REVIVE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
index ee361d30c..edca585c9 100644
--- a/data/maps/Route121/scripts.inc
+++ b/data/maps/Route121/scripts.inc
@@ -28,7 +28,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18
 	removeobject 12
 	removeobject 13
 	removeobject 14
-	setvar VAR_0x4074, 1
+	setvar VAR_ROUTE121_STATE, 1
 	releaseall
 	end
 
diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc
deleted file mode 100644
index 658be476f..000000000
--- a/data/maps/Route121_SafariZoneEntrance/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route121_SafariZoneEntrance_EventObjects: @ 8533EDC
-	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0
-	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
-
-Route121_SafariZoneEntrance_MapWarps: @ 8533F24
-	warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH
-	warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH
-	warp_def 14, 13, 0, 0, MAP_ROUTE121
-	warp_def 15, 13, 0, 0, MAP_ROUTE121
-
-Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44
-	coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18
-
-Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54
-	bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21
-
-Route121_SafariZoneEntrance_MapEvents:: @ 8533F60
-	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
deleted file mode 100644
index fa645a693..000000000
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route121_SafariZoneEntrance: @ 8483EA4
-	.4byte Route121_SafariZoneEntrance_Layout
-	.4byte Route121_SafariZoneEntrance_MapEvents
-	.4byte Route121_SafariZoneEntrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 124
-	.byte MAPSEC_ROUTE_121
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json
new file mode 100644
index 000000000..90eedd773
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE",
+  "name": "Route121_SafariZoneEntrance",
+  "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_ROUTE_121",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 17,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_SafariZoneEntrance_EventScript_22BBE6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route121_SafariZoneEntrance_EventScript_22BBEF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_SOUTH",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_SOUTH",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE121",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE121",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "0",
+      "script": "Route121_SafariZoneEntrance_EventScript_22BC18"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route121_SafariZoneEntrance_EventScript_22BD21"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index d4ef73f9b..69f5ea80d 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -1,16 +1,16 @@
 Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB
-	map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1
 	.byte 0
 
 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1
-	map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
+	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
 	.2byte 0
 
 Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD
 	waitmovement 0
-	setvar VAR_0x40A4, 0
+	setvar VAR_SAFARI_ZONE_STATE, 0
 	releaseall
 	end
 
@@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E
 
 Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	showmoneybox 0, 0, 0
 	msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO
@@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
 	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18
 	waitmovement 0
 	special EnterSafariMode
-	setvar VAR_0x40A4, 2
+	setvar VAR_SAFARI_ZONE_STATE, 2
 	clearflag FLAG_GOOD_LUCK_SAFARI_ZONE
 	warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33
 	waitstate
diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc
deleted file mode 100644
index 2a0442a05..000000000
--- a/data/maps/Route122/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route122_MapConnectionsList: @ 8486B0C
-	connection up, -20, MAP_ROUTE121
-	connection down, -100, MAP_ROUTE123
-
-Route122_MapConnections: @ 8486B24
-	.4byte 0x2
-	.4byte Route122_MapConnectionsList
-
diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc
deleted file mode 100644
index 4c5b9b464..000000000
--- a/data/maps/Route122/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Route122_MapWarps: @ 852BDA0
-	warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F
-
-Route122_MapEvents:: @ 852BDA8
-	map_events 0x0, Route122_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
deleted file mode 100644
index eddd1a234..000000000
--- a/data/maps/Route122/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route122: @ 84828C4
-	.4byte Route122_Layout
-	.4byte Route122_MapEvents
-	.4byte Route122_MapScripts
-	.4byte Route122_MapConnections
-	.2byte MUS_DOORO_X4
-	.2byte 38
-	.byte MAPSEC_ROUTE_122
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json
new file mode 100644
index 000000000..9dee984d9
--- /dev/null
+++ b/data/maps/Route122/map.json
@@ -0,0 +1,39 @@
+{
+  "id": "MAP_ROUTE122",
+  "name": "Route122",
+  "layout": "LAYOUT_ROUTE122",
+  "music": "MUS_DOORO_X4",
+  "region_map_section": "MAPSEC_ROUTE_122",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": -20,
+      "map": "MAP_ROUTE121"
+    },
+    {
+      "direction": "down",
+      "offset": -100,
+      "map": "MAP_ROUTE123"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_MT_PYRE_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc
deleted file mode 100644
index 616c365ef..000000000
--- a/data/maps/Route123/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route123_MapConnectionsList: @ 8486B2C
-	connection up, 100, MAP_ROUTE122
-	connection left, 0, MAP_ROUTE118
-
-Route123_MapConnections: @ 8486B44
-	.4byte 0x2
-	.4byte Route123_MapConnectionsList
-
diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc
deleted file mode 100644
index d45ac0222..000000000
--- a/data/maps/Route123/events.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-Route123_EventObjects: @ 852BDBC
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, BerryTreeScript, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0
-	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, BerryTreeScript, 0
-	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, BerryTreeScript, 0
-	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0
-	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0
-	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0
-	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_11
-	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_12
-	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_13
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, FLAG_ITEM_ROUTE_123_CALCIUM
-	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0
-	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0
-	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0
-	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0
-	object_event 27, EVENT_OBJ_GFX_TWIN, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0
-	object_event 28, EVENT_OBJ_GFX_TWIN, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0
-	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0
-	object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0
-	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0
-	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, FLAG_ITEM_ROUTE_123_ULTRA_BALL
-	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, FLAG_ITEM_ROUTE_123_ELIXIR
-	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
-	object_event 35, EVENT_OBJ_GFX_WOMAN_2, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
-	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0
-	object_event 37, EVENT_OBJ_GFX_MAN_5, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
-	object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
-	object_event 39, EVENT_OBJ_GFX_EXPERT_M, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
-	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, FLAG_ITEM_ROUTE_123_PP_UP
-	object_event 41, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
-	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0
-	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB
-
-Route123_MapWarps: @ 852C1C4
-	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
-
-Route123_MapCoordEvents: @ 852C1CC
-	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: @ 852C32C
-	bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3
-	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, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA
-	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL
-	bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC
-	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3
-	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE
-	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION
-	bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP
-	bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY
-
-Route123_MapEvents:: @ 852C3B0
-	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
-
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
deleted file mode 100644
index a215c3592..000000000
--- a/data/maps/Route123/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route123: @ 84828E0
-	.4byte Route123_Layout
-	.4byte Route123_MapEvents
-	.4byte Route123_MapScripts
-	.4byte Route123_MapConnections
-	.2byte MUS_DOORO_X4
-	.2byte 39
-	.byte MAPSEC_ROUTE_123
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
new file mode 100644
index 000000000..6562fa7a9
--- /dev/null
+++ b/data/maps/Route123/map.json
@@ -0,0 +1,840 @@
+{
+  "id": "MAP_ROUTE123",
+  "name": "Route123",
+  "layout": "LAYOUT_ROUTE123",
+  "music": "MUS_DOORO_X4",
+  "region_map_section": "MAPSEC_ROUTE_123",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 100,
+      "map": "MAP_ROUTE122"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE118"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 11,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "58",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 12,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "59",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 14,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "60",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 15,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "61",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 81,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "62",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 82,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "63",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 83,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "64",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 70,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route123_EventScript_1F61C5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 58,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route123_EventScript_1F61DC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "65",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 15,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "72",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "73",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 18,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "74",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 17,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "79",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 18,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "14",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 11,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "15",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "30",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 101,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_2906BB",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 129,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_2906BB",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+      "x": 92,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_2906BB",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 31,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_290FB0",
+      "flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 108,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_1F6151",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 109,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "87",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 110,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "88",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 111,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "89",
+      "script": "BerryTreeScript",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 18,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route123_EventScript_1F61F3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 38,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route123_EventScript_1F62E9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 37,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route123_EventScript_1F62CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 138,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route123_EventScript_1F620A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 49,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route123_EventScript_1F626C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 87,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route123_EventScript_1F6304",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 27,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_290FBD",
+      "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 75,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_290FCA",
+      "flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 138,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route123_EventScript_1F6377",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 138,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route123_EventScript_1F6360",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 87,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route123_EventScript_1F6349",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 66,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route123_EventScript_1F63BC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 66,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route123_EventScript_1F6332",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 49,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route123_EventScript_1F631B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 43,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_290FD7",
+      "flag": "FLAG_ITEM_ROUTE_123_PP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 14,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route123_EventScript_1F638E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 14,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route123_EventScript_1F63A5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 57,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_EventScript_290FE4",
+      "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE123_BERRY_MASTERS_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "weather",
+      "x": 90,
+      "y": 16,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 92,
+      "y": 9,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 93,
+      "y": 12,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 92,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 91,
+      "y": 14,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 12,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 34,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 14,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 15,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 19,
+      "y": 16,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    },
+    {
+      "type": "weather",
+      "x": 108,
+      "y": 14,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 109,
+      "y": 15,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 110,
+      "y": 16,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 111,
+      "y": 17,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 112,
+      "y": 18,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 9,
+      "y": 14,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 9,
+      "y": 15,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_SUNNY"
+    },
+    {
+      "type": "weather",
+      "x": 94,
+      "y": 10,
+      "elevation": 3,
+      "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 117,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route123_EventScript_1F61B3"
+    },
+    {
+      "type": "secret_base",
+      "x": 47,
+      "y": 3,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE1_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 49,
+      "y": 3,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE2_2"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 12,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route123_EventScript_1F61AA"
+    },
+    {
+      "type": "hidden_item",
+      "x": 75,
+      "y": 1,
+      "elevation": 3,
+      "item": "ITEM_SUPER_REPEL",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL"
+    },
+    {
+      "type": "sign",
+      "x": 20,
+      "y": 7,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route123_EventScript_1F61BC"
+    },
+    {
+      "type": "secret_base",
+      "x": 57,
+      "y": 5,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_BLUE_CAVE1_3"
+    },
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "item": "ITEM_REVIVE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 91,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_HYPER_POTION",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION"
+    },
+    {
+      "type": "hidden_item",
+      "x": 139,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_PP_UP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP"
+    },
+    {
+      "type": "hidden_item",
+      "x": 138,
+      "y": 18,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index 86a6e767e..8e1692114 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -1,5 +1,5 @@
 Route123_MapScripts:: @ 81F6147
-	map_script 3, Route123_MapScript1_1F614D
+	map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D
 	.byte 0
 
 Route123_MapScript1_1F614D: @ 81F614D
@@ -17,7 +17,7 @@ Route123_EventScript_1F6151:: @ 81F6151
 	msgbox Route123_Text_1F645D, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM19
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM19
 	msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc
deleted file mode 100644
index 3462054cb..000000000
--- a/data/maps/Route123_BerryMastersHouse/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route123_BerryMastersHouse_EventObjects: @ 853EACC
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0
-
-Route123_BerryMastersHouse_MapWarps: @ 853EAFC
-	warp_def 3, 7, 0, 0, MAP_ROUTE123
-	warp_def 4, 7, 0, 0, MAP_ROUTE123
-
-Route123_BerryMastersHouse_MapEvents:: @ 853EB0C
-	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
deleted file mode 100644
index 163625aae..000000000
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route123_BerryMastersHouse: @ 8485CD4
-	.4byte House2_Layout
-	.4byte Route123_BerryMastersHouse_MapEvents
-	.4byte Route123_BerryMastersHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 60
-	.byte MAPSEC_ROUTE_123
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json
new file mode 100644
index 000000000..c87feb2bc
--- /dev/null
+++ b/data/maps/Route123_BerryMastersHouse/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE",
+  "name": "Route123_BerryMastersHouse",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_ROUTE_123",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_BerryMastersHouse_EventScript_26F845",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route123_BerryMastersHouse_EventScript_26F8C0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE123",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE123",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index a3ae5df93..31158782d 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route123_BerryMastersHouse_MapScripts:: @ 826F83B
-	map_script 3, Route123_BerryMastersHouse_MapScript1_26F841
+	map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841
 	.byte 0
 
 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841
@@ -9,7 +9,7 @@ Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841
 Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6
 	msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT
 	random 10
@@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY
 	msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT
 	random 10
@@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT
 	release
 	end
@@ -38,11 +38,11 @@ Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6
 Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F
 	msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 13
-	call Route123_BerryMastersHouse_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	goto Route123_BerryMastersHouse_EventScript_26FA79
 	release
 	end
@@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A
 	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
 	giveitem_std ITEM_SPELON_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SPELON_BERRY
 	goto Route123_BerryMastersHouse_EventScript_26FA79
 	end
@@ -98,7 +98,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB
 	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
 	giveitem_std ITEM_PAMTRE_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_PAMTRE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_26FA79
 	end
@@ -108,7 +108,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC
 	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
 	giveitem_std ITEM_WATMEL_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WATMEL_BERRY
 	goto Route123_BerryMastersHouse_EventScript_26FA79
 	end
@@ -118,7 +118,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D
 	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
 	giveitem_std ITEM_DURIN_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_DURIN_BERRY
 	goto Route123_BerryMastersHouse_EventScript_26FA79
 	end
@@ -128,7 +128,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E
 	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
 	giveitem_std ITEM_BELUE_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_BELUE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_26FA79
 	end
diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc
deleted file mode 100644
index ed10daab9..000000000
--- a/data/maps/Route124/connections.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route124_MapConnectionsList: @ 8486B4C
-	connection down, 0, MAP_ROUTE126
-	connection left, 10, MAP_LILYCOVE_CITY
-	connection right, 0, MAP_ROUTE125
-	connection right, 40, MAP_MOSSDEEP_CITY
-	connection dive, 0, MAP_UNDERWATER1
-
-Route124_MapConnections: @ 8486B88
-	.4byte 0x5
-	.4byte Route124_MapConnectionsList
-
diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc
deleted file mode 100644
index 4b52615fc..000000000
--- a/data/maps/Route124/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route124_EventObjects: @ 852C3C4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD
-	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0
-	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0
-	object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0
-	object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0
-
-Route124_MapWarps: @ 852C4E4
-	warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE
-
-Route124_MapBGEvents: @ 852C4EC
-	bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C
-
-Route124_MapEvents:: @ 852C4F8
-	map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
-
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
deleted file mode 100644
index c9ae442b7..000000000
--- a/data/maps/Route124/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route124: @ 84828FC
-	.4byte Route124_Layout
-	.4byte Route124_MapEvents
-	.4byte Route124_MapScripts
-	.4byte Route124_MapConnections
-	.2byte MUS_DOORO_X3
-	.2byte 40
-	.byte MAPSEC_ROUTE_124
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
new file mode 100644
index 000000000..c1a22a2d0
--- /dev/null
+++ b/data/maps/Route124/map.json
@@ -0,0 +1,220 @@
+{
+  "id": "MAP_ROUTE124",
+  "name": "Route124",
+  "layout": "LAYOUT_ROUTE124",
+  "music": "MUS_DOORO_X3",
+  "region_map_section": "MAPSEC_ROUTE_124",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE126"
+    },
+    {
+      "direction": "left",
+      "offset": 10,
+      "map": "MAP_LILYCOVE_CITY"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE125"
+    },
+    {
+      "direction": "right",
+      "offset": 40,
+      "map": "MAP_MOSSDEEP_CITY"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER1"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 34,
+      "y": 25,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 5,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route124_EventScript_1F6585",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 61,
+      "y": 74,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 5,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route124_EventScript_1F659C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 49,
+      "y": 45,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route124_EventScript_1F65B3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 7,
+      "y": 23,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 6,
+      "movement_range_y": 8,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route124_EventScript_1F6615",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 58,
+      "y": 58,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 7,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route124_EventScript_1F662C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 28,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route124_EventScript_290FF1",
+      "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 31,
+      "y": 53,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route124_EventScript_290FFE",
+      "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 58,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route124_EventScript_29100B",
+      "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 18,
+      "y": 44,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route124_EventScript_1F6643",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING",
+      "x": 17,
+      "y": 44,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route124_EventScript_1F66A7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 7,
+      "y": 29,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route124_EventScript_1F670B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 69,
+      "y": 74,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route124_EventScript_1F6722",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 70,
+      "y": 48,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 73,
+      "y": 48,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route124_EventScript_1F657C"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index 97aa6f4be..34e315792 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -1,9 +1,9 @@
 Route124_MapScripts:: @ 81F656C
-	map_script 3, Route124_MapScript1_1F6572
+	map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572
 	.byte 0
 
 Route124_MapScript1_1F6572: @ 81F6572
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	end
 
 Route124_EventScript_1F657C:: @ 81F657C
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
deleted file mode 100644
index 30dffed32..000000000
--- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0
-
-Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4
-	warp_def 3, 8, 0, 0, MAP_ROUTE124
-	warp_def 4, 8, 0, 0, MAP_ROUTE124
-
-Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4
-	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63
-
-Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0
-	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
deleted file mode 100644
index db9097ce5..000000000
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route124_DivingTreasureHuntersHouse: @ 8485D44
-	.4byte Route124_DivingTreasureHuntersHouse_Layout
-	.4byte Route124_DivingTreasureHuntersHouse_MapEvents
-	.4byte Route124_DivingTreasureHuntersHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_MINAMO
-	.2byte 301
-	.byte MAPSEC_ROUTE_124
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
new file mode 100644
index 000000000..2b61cd6fa
--- /dev/null
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
@@ -0,0 +1,58 @@
+{
+  "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
+  "name": "Route124_DivingTreasureHuntersHouse",
+  "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
+  "music": "MUS_MINAMO",
+  "region_map_section": "MAPSEC_ROUTE_124",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 5,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE124",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE124",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route124_DivingTreasureHuntersHouse_EventScript_270F63"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 934c6757d..250a5ba51 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28
-	map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E
+	map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E
 	.byte 0
 
 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E
diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc
deleted file mode 100644
index 2b5f944c9..000000000
--- a/data/maps/Route125/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route125_MapConnectionsList: @ 8486B90
-	connection down, 0, MAP_MOSSDEEP_CITY
-	connection left, 0, MAP_ROUTE124
-	connection dive, 0, MAP_UNDERWATER7
-
-Route125_MapConnections: @ 8486BB4
-	.4byte 0x3
-	.4byte Route125_MapConnectionsList
-
diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc
deleted file mode 100644
index 256802406..000000000
--- a/data/maps/Route125/events.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route125_EventObjects: @ 852C50C
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0
-	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0
-	object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0
-	object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
-	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL
-
-Route125_MapWarps: @ 852C5FC
-	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-
-Route125_MapBGEvents: @ 852C604
-	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:: @ 852C634
-	map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
-
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
deleted file mode 100644
index 12ea80531..000000000
--- a/data/maps/Route125/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route125: @ 8482918
-	.4byte Route125_Layout
-	.4byte Route125_MapEvents
-	.4byte Route125_MapScripts
-	.4byte Route125_MapConnections
-	.2byte MUS_DOORO_X3
-	.2byte 41
-	.byte MAPSEC_ROUTE_125
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
new file mode 100644
index 000000000..0ce520fdd
--- /dev/null
+++ b/data/maps/Route125/map.json
@@ -0,0 +1,204 @@
+{
+  "id": "MAP_ROUTE125",
+  "name": "Route125",
+  "layout": "LAYOUT_ROUTE125",
+  "music": "MUS_DOORO_X3",
+  "region_map_section": "MAPSEC_ROUTE_125",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_MOSSDEEP_CITY"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE124"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER7"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 7,
+      "y": 31,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route125_EventScript_1F67A4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 45,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route125_EventScript_1F67BB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 38,
+      "y": 24,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 6,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route125_EventScript_1F67D2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 30,
+      "y": 28,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP",
+      "movement_range_x": 9,
+      "movement_range_y": 9,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route125_EventScript_1F67E9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 21,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route125_EventScript_1F6800",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 17,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route125_EventScript_1F6862",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 18,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route125_EventScript_1F687D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 43,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route125_EventScript_1F6898",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 48,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route125_EventScript_1F68AF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 46,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route125_EventScript_291018",
+      "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "secret_base",
+      "x": 53,
+      "y": 10,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE1_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 55,
+      "y": 11,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE4_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 7,
+      "y": 25,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 24,
+      "y": 32,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index e5ad32697..8abcbe787 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -1,28 +1,28 @@
 Route125_MapScripts:: @ 81F6748
-	map_script 3, Route125_MapScript1_1F6758
-	map_script 1, Route125_MapScript1_1F6783
-	map_script 2, Route125_MapScript2_1F679A
+	map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758
+	map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A
 	.byte 0
 
 Route125_MapScript1_1F6758: @ 81F6758
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A
-	compare VAR_0x4039, 1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route125_EventScript_273D13
-	compare VAR_0x4037, 11
-	call_if_eq Route125_EventScript_273D17
-	compare VAR_0x4037, 12
-	call_if_eq Route125_EventScript_273D17
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
+	call_if_eq UnusualWeather_StartKyogreWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route125_MapScript1_1F6783: @ 81F6783
-	compare VAR_0x4037, 11
-	call_if_eq Route125_EventScript_273A85
-	compare VAR_0x4037, 12
-	call_if_eq Route125_EventScript_273AF2
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East
 	end
 
 Route125_MapScript2_1F679A: @ 81F679A
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route125_EventScript_1F67A4:: @ 81F67A4
diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc
deleted file mode 100644
index b1f0f6d81..000000000
--- a/data/maps/Route126/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route126_MapConnectionsList: @ 8486BBC
-	connection up, 0, MAP_ROUTE124
-	connection right, 0, MAP_ROUTE127
-	connection dive, 0, MAP_UNDERWATER2
-
-Route126_MapConnections: @ 8486BE0
-	.4byte 0x3
-	.4byte Route126_MapConnectionsList
-
diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc
deleted file mode 100644
index 8754a0006..000000000
--- a/data/maps/Route126/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-Route126_EventObjects: @ 852C648
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD
-	object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0
-	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0
-	object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0
-
-Route126_MapEvents:: @ 852C720
-	map_events Route126_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
deleted file mode 100644
index 86225727f..000000000
--- a/data/maps/Route126/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route126: @ 8482934
-	.4byte Route126_Layout
-	.4byte Route126_MapEvents
-	.4byte Route126_MapScripts
-	.4byte Route126_MapConnections
-	.2byte MUS_DOORO_X3
-	.2byte 42
-	.byte MAPSEC_ROUTE_126
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
new file mode 100644
index 000000000..ea63eb80d
--- /dev/null
+++ b/data/maps/Route126/map.json
@@ -0,0 +1,154 @@
+{
+  "id": "MAP_ROUTE126",
+  "name": "Route126",
+  "layout": "LAYOUT_ROUTE126",
+  "music": "MUS_DOORO_X3",
+  "region_map_section": "MAPSEC_ROUTE_126",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE124"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE127"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER2"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 51,
+      "y": 65,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN",
+      "movement_range_x": 10,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route126_EventScript_1F68D6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 56,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 9,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route126_EventScript_1F68ED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 63,
+      "y": 43,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route126_EventScript_1F6904",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 9,
+      "y": 48,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route126_EventScript_1F691B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 14,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route126_EventScript_291025",
+      "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 15,
+      "y": 66,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route126_EventScript_1F6960",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 7,
+      "y": 66,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route126_EventScript_1F6977",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 64,
+      "y": 5,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route126_EventScript_1F6949",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 56,
+      "y": 5,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route126_EventScript_1F6932",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index 4fa47e0bb..71bc77b28 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -1,9 +1,9 @@
 Route126_MapScripts:: @ 81F68C6
-	map_script 3, Route126_MapScript1_1F68CC
+	map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC
 	.byte 0
 
 Route126_MapScript1_1F68CC: @ 81F68CC
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	end
 
 Route126_EventScript_1F68D6:: @ 81F68D6
diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc
deleted file mode 100644
index 3ad7057a3..000000000
--- a/data/maps/Route127/connections.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route127_MapConnectionsList: @ 8486BE8
-	connection up, 0, MAP_MOSSDEEP_CITY
-	connection down, 0, MAP_ROUTE128
-	connection left, 0, MAP_ROUTE126
-	connection dive, 0, MAP_UNDERWATER3
-
-Route127_MapConnections: @ 8486C18
-	.4byte 0x4
-	.4byte Route127_MapConnectionsList
-
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
deleted file mode 100644
index 78dc26899..000000000
--- a/data/maps/Route127/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route127_EventObjects: @ 852C734
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS
-	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
-	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
-	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
-	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY
-
-Route127_MapBGEvents: @ 852C83C
-	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:: @ 852C878
-	map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
-
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
deleted file mode 100644
index b237a42ab..000000000
--- a/data/maps/Route127/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route127: @ 8482950
-	.4byte Route127_Layout
-	.4byte Route127_MapEvents
-	.4byte Route127_MapScripts
-	.4byte Route127_MapConnections
-	.2byte MUS_DOORO_X3
-	.2byte 43
-	.byte MAPSEC_ROUTE_127
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
new file mode 100644
index 000000000..e4a68c3e1
--- /dev/null
+++ b/data/maps/Route127/map.json
@@ -0,0 +1,221 @@
+{
+  "id": "MAP_ROUTE127",
+  "name": "Route127",
+  "layout": "LAYOUT_ROUTE127",
+  "music": "MUS_DOORO_X3",
+  "region_map_section": "MAPSEC_ROUTE_127",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_MOSSDEEP_CITY"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE128"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE126"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER3"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 45,
+      "y": 42,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route127_EventScript_1F6A35",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 18,
+      "y": 68,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route127_EventScript_1F6A4C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route127_EventScript_291032",
+      "flag": "FLAG_ITEM_ROUTE_127_ZINC"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 64,
+      "y": 39,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route127_EventScript_29103F",
+      "flag": "FLAG_ITEM_ROUTE_127_CARBOS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 42,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route127_EventScript_1F6A63",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 64,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route127_EventScript_1F6A91",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 54,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route127_EventScript_1F6A7A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 15,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route127_EventScript_1F6AA8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 63,
+      "y": 63,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route127_EventScript_1F6AD6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 12,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route127_EventScript_1F6ABF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 13,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route127_EventScript_29104C",
+      "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "secret_base",
+      "x": 59,
+      "y": 67,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_RED_CAVE4_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 59,
+      "y": 72,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 67,
+      "y": 63,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 61,
+      "y": 21,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 45,
+      "y": 24,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 28f20bfb3..91fab2b61 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -1,28 +1,28 @@
 Route127_MapScripts:: @ 81F69D9
-	map_script 3, Route127_MapScript1_1F69E9
-	map_script 1, Route127_MapScript1_1F6A14
-	map_script 2, Route127_MapScript2_1F6A2B
+	map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9
+	map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B
 	.byte 0
 
 Route127_MapScript1_1F69E9: @ 81F69E9
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A
-	compare VAR_0x4039, 1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route127_EventScript_273D13
-	compare VAR_0x4037, 13
-	call_if_eq Route127_EventScript_273D17
-	compare VAR_0x4037, 14
-	call_if_eq Route127_EventScript_273D17
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
+	call_if_eq UnusualWeather_StartKyogreWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route127_MapScript1_1F6A14: @ 81F6A14
-	compare VAR_0x4037, 13
-	call_if_eq Route127_EventScript_273B5F
-	compare VAR_0x4037, 14
-	call_if_eq Route127_EventScript_273BCC
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South
 	end
 
 Route127_MapScript2_1F6A2B: @ 81F6A2B
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route127_EventScript_1F6A35:: @ 81F6A35
diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc
deleted file mode 100644
index 5b2f0665d..000000000
--- a/data/maps/Route128/connections.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route128_MapConnectionsList: @ 8486C20
-	connection up, 0, MAP_ROUTE127
-	connection down, 0, MAP_ROUTE129
-	connection right, -40, MAP_EVER_GRANDE_CITY
-	connection dive, 0, MAP_UNDERWATER4
-
-Route128_MapConnections: @ 8486C50
-	.4byte 0x4
-	.4byte Route128_MapConnectionsList
-
diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc
deleted file mode 100644
index 792ff5ca3..000000000
--- a/data/maps/Route128/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route128_EventObjects: @ 852C88C
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0
-	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN
-	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_ARCHIE
-	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_MAXIE
-	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
-	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0
-	object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0
-
-Route128_MapBGEvents: @ 852C97C
-	bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1
-	bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2
-	bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3
-
-Route128_MapEvents:: @ 852C9A0
-	map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents
-
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
deleted file mode 100644
index 2875033e9..000000000
--- a/data/maps/Route128/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route128: @ 848296C
-	.4byte Route128_Layout
-	.4byte Route128_MapEvents
-	.4byte Route128_MapScripts
-	.4byte Route128_MapConnections
-	.2byte MUS_DOORO_X3
-	.2byte 44
-	.byte MAPSEC_ROUTE_128
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
new file mode 100644
index 000000000..58246c247
--- /dev/null
+++ b/data/maps/Route128/map.json
@@ -0,0 +1,197 @@
+{
+  "id": "MAP_ROUTE128",
+  "name": "Route128",
+  "layout": "LAYOUT_ROUTE128",
+  "music": "MUS_DOORO_X3",
+  "region_map_section": "MAPSEC_ROUTE_128",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE127"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE129"
+    },
+    {
+      "direction": "right",
+      "offset": -40,
+      "map": "MAP_EVER_GRANDE_CITY"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER4"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 35,
+      "y": 33,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN",
+      "movement_range_x": 5,
+      "movement_range_y": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route128_EventScript_1F6CBE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 78,
+      "y": 24,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 5,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "7",
+      "script": "Route128_EventScript_1F6D20",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 40,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_128_STEVEN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 37,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_128_ARCHIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 38,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_ROUTE_128_MAXIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 63,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route128_EventScript_1F6DB0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 47,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route128_EventScript_1F6D99",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 24,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route128_EventScript_1F6D82",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 101,
+      "y": 29,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route128_EventScript_1F6DDE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 101,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route128_EventScript_1F6DC7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 49,
+      "y": 9,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 57,
+      "y": 21,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 33,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index bb4f8d150..84091ac3a 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -1,14 +1,14 @@
 Route128_MapScripts:: @ 81F6B38
-	map_script 3, Route128_MapScript1_1F6B43
-	map_script 2, Route128_MapScript2_1F6B4D
+	map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D
 	.byte 0
 
 Route128_MapScript1_1F6B43: @ 81F6B43
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	end
 
 Route128_MapScript2_1F6B4D: @ 81F6B4D
-	map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57
+	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57
 	.2byte 0
 
 Route128_EventScript_1F6B57:: @ 81F6B57
@@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	closemessage
 	applymovement 5, Route128_Movement_1F6CAD
 	waitmovement 0
-	applymovement 4, Route128_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Route128_Movement_1F6CBB
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Route128_Movement_1F6C96
-	applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	applymovement 5, Route128_Movement_1F6CA8
 	waitmovement 0
 	msgbox Route128_Text_1F704F, MSGBOX_DEFAULT
@@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	addobject 3
 	applymovement 3, Route128_Movement_1F6C87
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Route128_Movement_1F6C85
-	applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT
-	applymovement 3, Route128_Movement_2725AA
+	applymovement 3, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox Route128_Text_1F721B, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, Route128_Movement_2725AA
+	applymovement 3, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
@@ -73,8 +73,8 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	delay 15
 	removeobject 3
 	waitfieldeffect 30
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x407B, 2
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
+	setvar VAR_ROUTE128_STATE, 2
 	releaseall
 	end
 
diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc
deleted file mode 100644
index 1293e8235..000000000
--- a/data/maps/Route129/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route129_MapConnectionsList: @ 8486C58
-	connection up, 0, MAP_ROUTE128
-	connection left, 0, MAP_ROUTE130
-	connection dive, 0, MAP_UNDERWATER5
-
-Route129_MapConnections: @ 8486C7C
-	.4byte 0x3
-	.4byte Route129_MapConnectionsList
-
diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc
deleted file mode 100644
index c127ec5e3..000000000
--- a/data/maps/Route129/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route129_EventObjects: @ 852C9B4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0
-
-Route129_MapEvents:: @ 852CA2C
-	map_events Route129_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
deleted file mode 100644
index 645cc7d92..000000000
--- a/data/maps/Route129/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route129: @ 8482988
-	.4byte Route129_Layout
-	.4byte Route129_MapEvents
-	.4byte Route129_MapScripts
-	.4byte Route129_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 45
-	.byte MAPSEC_ROUTE_129
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
new file mode 100644
index 000000000..3183f9821
--- /dev/null
+++ b/data/maps/Route129/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_ROUTE129",
+  "name": "Route129",
+  "layout": "LAYOUT_ROUTE129",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_129",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE128"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE130"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER5"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 28,
+      "y": 16,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route129_EventScript_1F72EC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 10,
+      "y": 14,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP",
+      "movement_range_x": 5,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route129_EventScript_1F7303",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 13,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route129_EventScript_1F7331",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 35,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route129_EventScript_1F731A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 13,
+      "y": 27,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route129_EventScript_1F7348",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 177dc626a..25aa675a6 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -1,33 +1,33 @@
 Route129_MapScripts:: @ 81F7284
-	map_script 3, Route129_MapScript1_1F72AB
-	map_script 1, Route129_MapScript1_1F7294
-	map_script 2, Route129_MapScript2_1F72E2
+	map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB
+	map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2
 	.byte 0
 
 Route129_MapScript1_1F7294: @ 81F7294
-	compare VAR_0x4037, 15
-	call_if_eq Route129_EventScript_273C39
-	compare VAR_0x4037, 16
-	call_if_eq Route129_EventScript_273CA6
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East
 	end
 
 Route129_MapScript1_1F72AB: @ 81F72AB
-	compare VAR_0x4039, 1
+	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq Route129_EventScript_273D13
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	call_if_ge Route129_EventScript_1F72D8
-	compare VAR_0x4037, 15
-	call_if_eq Route129_EventScript_273D17
-	compare VAR_0x4037, 16
-	call_if_eq Route129_EventScript_273D17
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
+	call_if_eq UnusualWeather_StartKyogreWeather
+	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route129_EventScript_1F72D8:: @ 81F72D8
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	return
 
 Route129_MapScript2_1F72E2: @ 81F72E2
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route129_EventScript_1F72EC:: @ 81F72EC
diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc
deleted file mode 100644
index b977d43bc..000000000
--- a/data/maps/Route130/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route130_MapConnectionsList: @ 8486C84
-	connection left, 0, MAP_ROUTE131
-	connection right, 0, MAP_ROUTE129
-
-Route130_MapConnections: @ 8486C9C
-	.4byte 0x2
-	.4byte Route130_MapConnectionsList
-
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
deleted file mode 100644
index 97532e576..000000000
--- a/data/maps/Route130/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route130_EventObjects: @ 852CA40
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0
-
-Route130_MapEvents:: @ 852CAA0
-	map_events Route130_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
deleted file mode 100644
index 4c03656ac..000000000
--- a/data/maps/Route130/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route130: @ 84829A4
-	.4byte Route130_Layout
-	.4byte Route130_MapEvents
-	.4byte Route130_MapScripts
-	.4byte Route130_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 263
-	.byte MAPSEC_ROUTE_130
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
new file mode 100644
index 000000000..18d168b17
--- /dev/null
+++ b/data/maps/Route130/map.json
@@ -0,0 +1,84 @@
+{
+  "id": "MAP_ROUTE130",
+  "name": "Route130",
+  "layout": "LAYOUT_ROUTE130",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_130",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE131"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE129"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 70,
+      "y": 21,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN",
+      "movement_range_x": 3,
+      "movement_range_y": 6,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route130_EventScript_1F73BF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 7,
+      "y": 21,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route130_EventScript_1F73D6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 52,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "82",
+      "script": "BerryTreeScript",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 7,
+      "y": 30,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route130_EventScript_1F73ED",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 5c7696eb7..cdcc61550 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -1,9 +1,9 @@
 Route130_MapScripts:: @ 81F735F
-	map_script 3, Route130_MapScript1_1F7365
+	map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365
 	.byte 0
 
 Route130_MapScript1_1F7365: @ 81F7365
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	call_if_ge Route130_EventScript_1F73B5
 	specialvar VAR_RESULT, IsMirageIslandPresent
 	compare VAR_RESULT, 1
@@ -23,15 +23,15 @@ Route130_MapScript1_1F7365: @ 81F7365
 	setflag FLAG_TEMP_1D
 	setflag FLAG_TEMP_1E
 	setflag FLAG_TEMP_1F
-	setmaplayoutindex 263
+	setmaplayoutindex LAYOUT_ROUTE130
 	end
 
 Route130_EventScript_1F73B1:: @ 81F73B1
-	setmaplayoutindex 46
+	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
 
 Route130_EventScript_1F73B5:: @ 81F73B5
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	return
 
 Route130_EventScript_1F73BF:: @ 81F73BF
diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc
deleted file mode 100644
index 150ea7023..000000000
--- a/data/maps/Route131/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route131_MapConnectionsList: @ 8486CA4
-	connection left, 0, MAP_PACIFIDLOG_TOWN
-	connection right, 0, MAP_ROUTE130
-
-Route131_MapConnections: @ 8486CBC
-	.4byte 0x2
-	.4byte Route131_MapConnectionsList
-
diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc
deleted file mode 100644
index 1c321a6cb..000000000
--- a/data/maps/Route131/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route131_EventObjects: @ 852CAB4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 3, 5, 1, 3, Route131_EventScript_1F746E, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F7485, 0
-	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0
-	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0
-
-Route131_MapWarps: @ 852CB74
-	warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE
-
-Route131_MapEvents:: @ 852CB7C
-	map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
deleted file mode 100644
index e84799fd4..000000000
--- a/data/maps/Route131/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route131: @ 84829C0
-	.4byte Route131_Layout
-	.4byte Route131_MapEvents
-	.4byte Route131_MapScripts
-	.4byte Route131_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 47
-	.byte MAPSEC_ROUTE_131
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json
new file mode 100644
index 000000000..379b15b3d
--- /dev/null
+++ b/data/maps/Route131/map.json
@@ -0,0 +1,144 @@
+{
+  "id": "MAP_ROUTE131",
+  "name": "Route131",
+  "layout": "LAYOUT_ROUTE131",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_131",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_PACIFIDLOG_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE130"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 41,
+      "y": 32,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN",
+      "movement_range_x": 5,
+      "movement_range_y": 7,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route131_EventScript_1F7429",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 18,
+      "y": 19,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 7,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route131_EventScript_1F7440",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 10,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT",
+      "movement_range_x": 6,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route131_EventScript_1F7457",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 31,
+      "y": 25,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP",
+      "movement_range_x": 3,
+      "movement_range_y": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route131_EventScript_1F746E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 9,
+      "y": 16,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route131_EventScript_1F7485",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING",
+      "x": 8,
+      "y": 16,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route131_EventScript_1F74A0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 52,
+      "y": 20,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route131_EventScript_1F74D2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 52,
+      "y": 27,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route131_EventScript_1F74BB",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 36,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index da36f4001..0d178e969 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -1,19 +1,19 @@
 Route131_MapScripts:: @ 81F7404
-	map_script 3, Route131_MapScript1_1F740A
+	map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_1F740A
 	.byte 0
 
 Route131_MapScript1_1F740A: @ 81F740A
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	call_if_ge Route131_EventScript_1F741F
 	call Route131_EventScript_1F741B
 	end
 
 Route131_EventScript_1F741B:: @ 81F741B
-	setmaplayoutindex 319
+	setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
 	return
 
 Route131_EventScript_1F741F:: @ 81F741F
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route131_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	return
 
 Route131_EventScript_1F7429:: @ 81F7429
diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc
deleted file mode 100644
index 5a70e3471..000000000
--- a/data/maps/Route132/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route132_MapConnectionsList: @ 8486CC4
-	connection left, 0, MAP_ROUTE133
-	connection right, 0, MAP_PACIFIDLOG_TOWN
-
-Route132_MapConnections: @ 8486CDC
-	.4byte 0x2
-	.4byte Route132_MapConnectionsList
-
diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc
deleted file mode 100644
index da648b925..000000000
--- a/data/maps/Route132/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route132_EventObjects: @ 852CB90
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY
-	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0
-	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0
-	object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0
-	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN
-
-Route132_MapEvents:: @ 852CC80
-	map_events Route132_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
deleted file mode 100644
index 50630af03..000000000
--- a/data/maps/Route132/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route132: @ 84829DC
-	.4byte Route132_Layout
-	.4byte Route132_MapEvents
-	.4byte Route132_MapScripts
-	.4byte Route132_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 48
-	.byte MAPSEC_ROUTE_132
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
new file mode 100644
index 000000000..15c0de83d
--- /dev/null
+++ b/data/maps/Route132/map.json
@@ -0,0 +1,162 @@
+{
+  "id": "MAP_ROUTE132",
+  "name": "Route132",
+  "layout": "LAYOUT_ROUTE132",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_132",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE133"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_PACIFIDLOG_TOWN"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 40,
+      "y": 13,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route132_EventScript_1F74EA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 10,
+      "y": 6,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route132_EventScript_1F7501",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route132_EventScript_291059",
+      "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 9,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route132_EventScript_1F752F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 49,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "Route132_EventScript_1F7518",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 33,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route132_EventScript_1F7546",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 33,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route132_EventScript_1F755D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 21,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route132_EventScript_1F758B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 21,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route132_EventScript_1F7574",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 20,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route132_EventScript_291066",
+      "flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc
deleted file mode 100644
index 1f22ea960..000000000
--- a/data/maps/Route133/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route133_MapConnectionsList: @ 8486CE4
-	connection left, 0, MAP_ROUTE134
-	connection right, 0, MAP_ROUTE132
-
-Route133_MapConnections: @ 8486CFC
-	.4byte 0x2
-	.4byte Route133_MapConnectionsList
-
diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc
deleted file mode 100644
index 36f8b747d..000000000
--- a/data/maps/Route133/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route133_EventObjects: @ 852CC94
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_ITEM_ROUTE_133_BIG_PEARL
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_ITEM_ROUTE_133_STAR_PIECE
-	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0
-	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0
-	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE
-
-Route133_MapEvents:: @ 852CD84
-	map_events Route133_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
deleted file mode 100644
index ed6b7d2ce..000000000
--- a/data/maps/Route133/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route133: @ 84829F8
-	.4byte Route133_Layout
-	.4byte Route133_MapEvents
-	.4byte Route133_MapScripts
-	.4byte Route133_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 49
-	.byte MAPSEC_ROUTE_133
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
new file mode 100644
index 000000000..eed30d7ee
--- /dev/null
+++ b/data/maps/Route133/map.json
@@ -0,0 +1,162 @@
+{
+  "id": "MAP_ROUTE133",
+  "name": "Route133",
+  "layout": "LAYOUT_ROUTE133",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_133",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE134"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE132"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 68,
+      "y": 27,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route133_EventScript_1F75A3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 13,
+      "y": 3,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route133_EventScript_1F75D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 68,
+      "y": 28,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route133_EventScript_1F75BA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 53,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route133_EventScript_291073",
+      "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route133_EventScript_291080",
+      "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route133_EventScript_1F75FF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 37,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "Route133_EventScript_1F75E8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 56,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route133_EventScript_1F7616",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 56,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route133_EventScript_1F762D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 48,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route133_EventScript_29108D",
+      "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc
deleted file mode 100644
index 861c82b4d..000000000
--- a/data/maps/Route134/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route134_MapConnectionsList: @ 8486D04
-	connection left, 0, MAP_SLATEPORT_CITY
-	connection right, 0, MAP_ROUTE133
-
-Route134_MapConnections: @ 8486D1C
-	.4byte 0x2
-	.4byte Route134_MapConnectionsList
-
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc
deleted file mode 100644
index 8caf4da1e..000000000
--- a/data/maps/Route134/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route134_EventObjects: @ 852CD98
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0
-	object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0
-	object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0
-	object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE
-
-Route134_MapEvents:: @ 852CEA0
-	map_events Route134_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
deleted file mode 100644
index 8204e2815..000000000
--- a/data/maps/Route134/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route134: @ 8482A14
-	.4byte Route134_Layout
-	.4byte Route134_MapEvents
-	.4byte Route134_MapScripts
-	.4byte Route134_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 50
-	.byte MAPSEC_ROUTE_134
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
new file mode 100644
index 000000000..8b3a9518e
--- /dev/null
+++ b/data/maps/Route134/map.json
@@ -0,0 +1,175 @@
+{
+  "id": "MAP_ROUTE134",
+  "name": "Route134",
+  "layout": "LAYOUT_ROUTE134",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_134",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_SLATEPORT_CITY"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE133"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 49,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT",
+      "movement_range_x": 3,
+      "movement_range_y": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route134_EventScript_1F7653",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 58,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route134_EventScript_1F766A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 41,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route134_EventScript_1F7698",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 24,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route134_EventScript_1F7681",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 49,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+      "movement_range_x": 6,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route134_EventScript_1F76AF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 43,
+      "y": 23,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "Route134_EventScript_1F76F4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 24,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "Route134_EventScript_1F770B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 50,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+      "movement_range_x": 6,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route134_EventScript_1F76DD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 63,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route134_EventScript_1F76C6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 50,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route134_EventScript_29109A",
+      "flag": "FLAG_ITEM_ROUTE_134_CARBOS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 22,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route134_EventScript_2910A7",
+      "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
index f6f4feee3..a941e19b5 100644
--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -1,5 +1,5 @@
 Route134_MapScripts:: @ 81F7644
-	map_script 5, Route134_MapScript1_1F764A
+	map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A
 	.byte 0
 
 Route134_MapScript1_1F764A: @ 81F764A
diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc
deleted file mode 100644
index dbca1662d..000000000
--- a/data/maps/RustboroCity/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-RustboroCity_MapConnectionsList: @ 8486758
-	connection up, 0, MAP_ROUTE115
-	connection down, 0, MAP_ROUTE104
-	connection right, 0, MAP_ROUTE116
-
-RustboroCity_MapConnections: @ 848677C
-	.4byte 0x3
-	.4byte RustboroCity_MapConnectionsList
-
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc
deleted file mode 100644
index b2bcfa7ca..000000000
--- a/data/maps/RustboroCity/events.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-RustboroCity_EventObjects: @ 85267E0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0
-	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0
-	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
-	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
-	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
-	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
-	object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND
-	object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
-	object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL
-	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
-	object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0
-
-RustboroCity_MapWarps: @ 8526960
-	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: @ 85269C0
-	coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A
-	coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971
-	coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988
-	coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F
-	coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6
-	coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE
-	coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A
-	coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16
-	coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22
-	coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B
-	coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37
-	coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43
-	coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F
-	coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3
-	coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33
-	coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73
-	coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3
-	coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3
-	coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33
-	coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73
-	coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3
-
-RustboroCity_MapBGEvents: @ 8526B10
-	bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5
-	bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910
-	bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A
-	bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73
-	bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907
-	bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A
-	bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73
-	bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC
-	bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3
-	bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919
-
-RustboroCity_MapEvents:: @ 8526B88
-	map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
-
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
deleted file mode 100644
index 0cbd55b24..000000000
--- a/data/maps/RustboroCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity: @ 848250C
-	.4byte RustboroCity_Layout
-	.4byte RustboroCity_MapEvents
-	.4byte RustboroCity_MapScripts
-	.4byte RustboroCity_MapConnections
-	.2byte MUS_GOTOWN
-	.2byte 4
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
new file mode 100644
index 000000000..04c68baa3
--- /dev/null
+++ b/data/maps/RustboroCity/map.json
@@ -0,0 +1,601 @@
+{
+  "id": "MAP_RUSTBORO_CITY",
+  "name": "RustboroCity",
+  "layout": "LAYOUT_RUSTBORO_CITY",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE115"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE104"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE116"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 22,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E088A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 19,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E085F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 25,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E08DA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 21,
+      "y": 46,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E08D1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 12,
+      "y": 45,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E08B2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 26,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E0893",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 24,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E0922",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 25,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E0938",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 30,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E0ADD",
+      "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 13,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE",
+      "x": 13,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E087E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 36,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_2910DB",
+      "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 19,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E094E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 16,
+      "y": 50,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E0DB8",
+      "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 11,
+      "y": 15,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 31,
+      "y": 36,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_EventScript_1E1236",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 27,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_GYM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 30,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 45,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 27,
+      "y": 34,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 33,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 30,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 51,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 46,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_HOUSE3",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 20,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "1",
+      "script": "RustboroCity_EventScript_1E095A"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 21,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "1",
+      "script": "RustboroCity_EventScript_1E0971"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 22,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "1",
+      "script": "RustboroCity_EventScript_1E0988"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "1",
+      "script": "RustboroCity_EventScript_1E099F"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 24,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "1",
+      "script": "RustboroCity_EventScript_1E09B6"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "2",
+      "script": "RustboroCity_EventScript_1E0AFE"
+    },
+    {
+      "type": "trigger",
+      "x": 29,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "2",
+      "script": "RustboroCity_EventScript_1E0B0A"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "2",
+      "script": "RustboroCity_EventScript_1E0B16"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "2",
+      "script": "RustboroCity_EventScript_1E0B22"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "4",
+      "script": "RustboroCity_EventScript_1E0C2B"
+    },
+    {
+      "type": "trigger",
+      "x": 31,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "4",
+      "script": "RustboroCity_EventScript_1E0C37"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "4",
+      "script": "RustboroCity_EventScript_1E0C43"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "4",
+      "script": "RustboroCity_EventScript_1E0C4F"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0DF3"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0E33"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0E73"
+    },
+    {
+      "type": "trigger",
+      "x": 15,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0EB3"
+    },
+    {
+      "type": "trigger",
+      "x": 16,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0EF3"
+    },
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0F33"
+    },
+    {
+      "type": "trigger",
+      "x": 18,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0F73"
+    },
+    {
+      "type": "trigger",
+      "x": 19,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_RUSTBORO_STATE",
+      "var_value": "7",
+      "script": "RustboroCity_EventScript_1E0FB3"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 19,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_EventScript_1E08F5"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 35,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_EventScript_1E0910"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 45,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 38,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 49,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_EventScript_1E0907"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 45,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 38,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 20,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_EventScript_1E08EC"
+    },
+    {
+      "type": "sign",
+      "x": 30,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_EventScript_1E08E3"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 38,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_EventScript_1E0919"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 8ffbf8373..1ba63c959 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -1,15 +1,15 @@
 RustboroCity_MapScripts:: @ 81E06BD
-	map_script 3, RustboroCity_MapScript1_1E06C8
-	map_script 2, RustboroCity_MapScript2_1E070B
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B
 	.byte 0
 
 RustboroCity_MapScript1_1E06C8: @ 81E06C8
 	setflag FLAG_VISITED_RUSTBORO_CITY
-	call RustboroCity_EventScript_271ED7
-	compare VAR_0x405A, 6
+	call Common_EventScript_SetupRivalGender
+	compare VAR_RUSTBORO_STATE, 6
 	call_if_eq RustboroCity_EventScript_1E0707
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_0x405A, 6
+	compare VAR_RUSTBORO_STATE, 6
 	goto_if_eq RustboroCity_EventScript_1E06EC
 	end
 
@@ -24,11 +24,11 @@ RustboroCity_EventScript_1E06FF:: @ 81E06FF
 	end
 
 RustboroCity_EventScript_1E0707:: @ 81E0707
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 RustboroCity_MapScript2_1E070B: @ 81E070B
-	map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715
+	map_script_2 VAR_RUSTBORO_STATE, 6, RustboroCity_EventScript_1E0715
 	.2byte 0
 
 RustboroCity_EventScript_1E0715:: @ 81E0715
@@ -42,18 +42,18 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
 	applymovement 15, RustboroCity_Movement_1E0852
 	waitmovement 0
 	playse SE_PIN
-	applymovement 15, RustboroCity_Movement_272598
+	applymovement 15, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 15, RustboroCity_Movement_27259A
+	applymovement 15, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	applymovement 15, RustboroCity_Movement_1E084E
 	waitmovement 0
 	msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_HAS_MATCH_CALL
-	applymovement 15, RustboroCity_Movement_2725A4
+	applymovement 15, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_TK_KASYA
 	delay 10
@@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
 	delay 10
 	playse SE_TK_KASYA
 	delay 20
-	applymovement 15, RustboroCity_Movement_2725AA
+	applymovement 15, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT
 	closemessage
@@ -99,8 +99,8 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	playse SE_KAIDAN
 	removeobject 15
 	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
-	setvar VAR_0x405A, 7
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_RUSTBORO_STATE, 7
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
@@ -221,7 +221,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT
-	applymovement 7, RustboroCity_Movement_2725A2
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -230,7 +230,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT
-	applymovement 8, RustboroCity_Movement_2725A2
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -302,9 +302,9 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
 	setobjectxyperm 9, 30, 10
 	clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
 	setflag FLAG_DEVON_GOODS_STOLEN
-	setvar VAR_0x405A, 2
+	setvar VAR_RUSTBORO_STATE, 2
 	setvar VAR_RUSTURF_TUNNEL_STATE, 2
-	setvar VAR_0x406F, 1
+	setvar VAR_ROUTE116_STATE, 1
 	clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
@@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E
 RustboroCity_EventScript_1E0A79:: @ 81E0A79
 	applymovement 9, RustboroCity_Movement_1E0AD5
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
@@ -493,59 +493,59 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
 	compare VAR_TEMP_1, 3
 	call_if_eq RustboroCity_EventScript_1E0BF3
 	setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN
-	setvar VAR_0x405A, 3
+	setvar VAR_RUSTBORO_STATE, 3
 	moveobjectoffscreen 9
 	msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT
 	releaseall
 	end
 
 RustboroCity_EventScript_1E0B6F:: @ 81E0B6F
-	applymovement 9, RustboroCity_Movement_2725A6
+	applymovement 9, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0B9B:: @ 81E0B9B
-	applymovement 9, RustboroCity_Movement_2725A4
+	applymovement 9, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0BC7:: @ 81E0BC7
-	applymovement 9, RustboroCity_Movement_2725AA
+	applymovement 9, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
-	applymovement 9, RustboroCity_Movement_2725AA
+	applymovement 9, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 9, RustboroCity_Movement_1E0C29
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
@@ -596,7 +596,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
 	closemessage
 	setflag FLAG_RETURNED_DEVON_GOODS
 	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
-	setvar VAR_0x405A, 5
+	setvar VAR_RUSTBORO_STATE, 5
 	delay 30
 	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
 	waitstate
@@ -608,69 +608,69 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3
 	return
 
 RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
-	applymovement 9, RustboroCity_Movement_2725A6
+	applymovement 9, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0D08:: @ 81E0D08
-	applymovement 9, RustboroCity_Movement_2725A8
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0D34:: @ 81E0D34
-	applymovement 9, RustboroCity_Movement_2725AA
+	applymovement 9, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0D60:: @ 81E0D60
-	applymovement 9, RustboroCity_Movement_2725AA
+	applymovement 9, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 9, RustboroCity_Movement_1E0C29
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0D96:: @ 81E0D96
-	applymovement 9, RustboroCity_Movement_2725A4
+	applymovement 9, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
 	lockall
 	call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_27259E
+	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
@@ -694,128 +694,128 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE
 RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E120E
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
 RustboroCity_EventScript_1E0E33:: @ 81E0E33
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E1215
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
 RustboroCity_EventScript_1E0E73:: @ 81E0E73
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E121B
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E1220
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E1224
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
 RustboroCity_EventScript_1E0F33:: @ 81E0F33
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E1227
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
 RustboroCity_EventScript_1E0F73:: @ 81E0F73
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E122B
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
 	lockall
 	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
+	applymovement 14, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
+	applymovement 14, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
+	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_1E1230
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	goto RustboroCity_EventScript_1E0FF3
 
@@ -840,7 +840,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
-	setvar VAR_0x405A, 8
+	setvar VAR_RUSTBORO_STATE, 8
 	setvar VAR_0x4063, 2
 	setvar VAR_0x8008, 0
 	msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
@@ -911,7 +911,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
-	setvar VAR_0x405A, 8
+	setvar VAR_RUSTBORO_STATE, 8
 	setvar VAR_0x4063, 2
 	msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
 	compare VAR_RESULT, 1
diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc
deleted file mode 100644
index 71e57a143..000000000
--- a/data/maps/RustboroCity_CuttersHouse/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_CuttersHouse_EventObjects: @ 8530A1C
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0
-	object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0
-
-RustboroCity_CuttersHouse_MapWarps: @ 8530A4C
-	warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY
-
-RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C
-	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
deleted file mode 100644
index 8ffdf2c7b..000000000
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_CuttersHouse: @ 8483478
-	.4byte RustboroCity_CuttersHouse_Layout
-	.4byte RustboroCity_CuttersHouse_MapEvents
-	.4byte RustboroCity_CuttersHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 98
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json
new file mode 100644
index 000000000..134b9f726
--- /dev/null
+++ b/data/maps/RustboroCity_CuttersHouse/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE",
+  "name": "RustboroCity_CuttersHouse",
+  "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_CuttersHouse_EventScript_215BD4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_CuttersHouse_EventScript_215C0A",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc
deleted file mode 100644
index f0d54df77..000000000
--- a/data/maps/RustboroCity_DevonCorp_1F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-RustboroCity_DevonCorp_1F_EventObjects: @ 853037C
-	object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0
-	object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0
-
-RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4
-	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_MapBGEvents: @ 85303DC
-	bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312
-	bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309
-
-RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4
-	map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents
-
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
deleted file mode 100644
index a6f55163b..000000000
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_1F: @ 8483344
-	.4byte RustboroCity_DevonCorp_1F_Layout
-	.4byte RustboroCity_DevonCorp_1F_MapEvents
-	.4byte RustboroCity_DevonCorp_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 92
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json
new file mode 100644
index 000000000..7eee74211
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_1F/map.json
@@ -0,0 +1,99 @@
+{
+  "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+  "name": "RustboroCity_DevonCorp_1F",
+  "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_211261",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE",
+      "x": 15,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_211293",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 14,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_211312"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_211309"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index a7a84335b..4f1971c80 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
@@ -1,5 +1,5 @@
 RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245
-	map_script 3, RustboroCity_DevonCorp_1F_MapScript1_21124B
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_21124B
 	.byte 0
 
 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B
diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc
deleted file mode 100644
index f10c94780..000000000
--- a/data/maps/RustboroCity_DevonCorp_2F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_2F_EventObjects: @ 8530408
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0
-	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0
-	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0
-	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0
-
-RustboroCity_DevonCorp_2F_MapWarps: @ 8530498
-	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:: @ 85304A8
-	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
deleted file mode 100644
index bb548c44e..000000000
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_2F: @ 8483360
-	.4byte RustboroCity_DevonCorp_2F_Layout
-	.4byte RustboroCity_DevonCorp_2F_MapEvents
-	.4byte RustboroCity_DevonCorp_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 93
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json
new file mode 100644
index 000000000..9ab864774
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F",
+  "name": "RustboroCity_DevonCorp_2F",
+  "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_21186F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_211886",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 10,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 14,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index cce9ae394..5c6138c6c 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -1,20 +1,20 @@
 RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857
-	map_script 3, RustboroCity_DevonCorp_2F_MapScript1_21185D
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_21185D
 	.byte 0
 
 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869
-	setvar VAR_0x40C4, 2
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
 	return
 
 RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT
 	release
@@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
 RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6
 	msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT
@@ -38,7 +38,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6
 RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0
 	msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT
@@ -53,7 +53,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0
 RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT
 	release
@@ -62,9 +62,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
 RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1
 	lock
 	faceplayer
-	compare VAR_0x40C4, 2
+	compare VAR_FOSSIL_RESURRECTION_STATE, 2
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9
 	msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT
 	checkitem ITEM_ROOT_FOSSIL, 1
@@ -79,9 +79,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1
 RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933
 	closemessage
 	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
 	compare VAR_RESULT, 0
@@ -96,17 +96,17 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974
 	bufferitemname 0, ITEM_ROOT_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
 	takeitem ITEM_ROOT_FOSSIL, 1
-	setvar VAR_0x40C4, 1
-	setvar VAR_0x40C5, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 1
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991
 	closemessage
 	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
 	compare VAR_RESULT, 0
@@ -121,8 +121,8 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2
 	bufferitemname 0, ITEM_CLAW_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
 	takeitem ITEM_CLAW_FOSSIL, 1
-	setvar VAR_0x40C4, 1
-	setvar VAR_0x40C5, 2
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 2
 	release
 	end
 
@@ -137,9 +137,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03
-	compare VAR_0x40C5, 1
+	compare VAR_WHICH_FOSSIL_REVIVED, 1
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A
-	compare VAR_0x40C5, 2
+	compare VAR_WHICH_FOSSIL_REVIVED, 2
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C
 	end
 
@@ -171,7 +171,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
 	call RustboroCity_DevonCorp_2F_EventScript_27378B
-	call RustboroCity_DevonCorp_2F_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto RustboroCity_DevonCorp_2F_EventScript_211AD7
 	end
 
@@ -199,7 +199,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4
 	return
 
 RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7
-	setvar VAR_0x40C4, 0
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
@@ -220,7 +220,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
 	call RustboroCity_DevonCorp_2F_EventScript_27378B
-	call RustboroCity_DevonCorp_2F_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto RustboroCity_DevonCorp_2F_EventScript_211B7A
 	end
 
@@ -248,7 +248,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67
 	return
 
 RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A
-	setvar VAR_0x40C4, 0
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
@@ -279,9 +279,9 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD
 RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
-	compare VAR_0x405A, 6
+	compare VAR_RUSTBORO_STATE, 6
 	goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1
 	msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc
deleted file mode 100644
index df8ba0293..000000000
--- a/data/maps/RustboroCity_DevonCorp_3F/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0
-
-RustboroCity_DevonCorp_3F_MapWarps: @ 8530504
-	warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F
-
-RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C
-	bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600
-	bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600
-
-RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524
-	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
deleted file mode 100644
index d37f055a5..000000000
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_3F: @ 848337C
-	.4byte RustboroCity_DevonCorp_3F_Layout
-	.4byte RustboroCity_DevonCorp_3F_MapEvents
-	.4byte RustboroCity_DevonCorp_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 269
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json
new file mode 100644
index 000000000..0ed5d0b7e
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/map.json
@@ -0,0 +1,85 @@
+{
+  "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F",
+  "name": "RustboroCity_DevonCorp_3F",
+  "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 17,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_21256C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1",
+      "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 15,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_21256C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_212600"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_212600"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index 9d5fbe58b..6d0a78a42 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -1,11 +1,11 @@
 RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D
-	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D
-	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455
-	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_21243D
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464
 	.byte 0
 
 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D
-	compare VAR_0x408F, 0
+	compare VAR_DEVON_CORP_3F_STATE, 0
 	call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449
 	end
 
@@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
 	return
 
 RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
-	map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
 	.2byte 0
 
 RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
@@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
 	end
 
 RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464
-	map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
 	.2byte 0
 
 RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
@@ -58,17 +58,17 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
 	setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT
 	msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT
 	closemessage
-	call RustboroCity_DevonCorp_3F_EventScript_272083
+	call Common_EventScript_OutOfCenterPartyHeal
 	msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT
 	setflag FLAG_HIDE_ROUTE_116_TUNNELER
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
-	setvar VAR_0x4096, 1
+	setvar VAR_BRINEY_LOCATION, 1
 	clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL
-	setvar VAR_0x408F, 1
-	setvar VAR_0x405A, 6
+	setvar VAR_DEVON_CORP_3F_STATE, 1
+	setvar VAR_RUSTBORO_STATE, 6
 	releaseall
 	end
 
@@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C
 	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595
 	msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -163,11 +163,11 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595
 	msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT
 	giveitem_std ITEM_EXP_SHARE
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_EXP_SHARE
 	msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595
 RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC
 	msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
deleted file mode 100644
index b606a30db..000000000
--- a/data/maps/RustboroCity_Flat1_1F/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_Flat1_1F_EventObjects: @ 8530890
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0
-
-RustboroCity_Flat1_1F_MapWarps: @ 85308C0
-	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:: @ 85308D8
-	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
deleted file mode 100644
index 9d3a63c8c..000000000
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat1_1F: @ 8483424
-	.4byte RustboroCity_Flat1_1F_Layout
-	.4byte RustboroCity_Flat1_1F_MapEvents
-	.4byte RustboroCity_Flat1_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 313
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json
new file mode 100644
index 000000000..bc016aa2c
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_1F/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_RUSTBORO_CITY_FLAT1_1F",
+  "name": "RustboroCity_Flat1_1F",
+  "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_1F_EventScript_2150CE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 12,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_1F_EventScript_2150D7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT1_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc
deleted file mode 100644
index 9d3aace61..000000000
--- a/data/maps/RustboroCity_Flat1_2F/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-RustboroCity_Flat1_2F_EventObjects: @ 85308EC
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0
-	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
-	object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
-	object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0
-	object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
-	object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
-
-RustboroCity_Flat1_2F_MapWarps: @ 85309AC
-	warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F
-
-RustboroCity_Flat1_2F_MapEvents:: @ 85309B4
-	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
deleted file mode 100644
index ce47b6cb4..000000000
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat1_2F: @ 8483440
-	.4byte RustboroCity_Flat1_2F_Layout
-	.4byte RustboroCity_Flat1_2F_MapEvents
-	.4byte RustboroCity_Flat1_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 314
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json
new file mode 100644
index 000000000..5c047888e
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_2F/map.json
@@ -0,0 +1,133 @@
+{
+  "id": "MAP_RUSTBORO_CITY_FLAT1_2F",
+  "name": "RustboroCity_Flat1_2F",
+  "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_2F_EventScript_21523D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SKITTY_DOLL",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TREECKO_DOLL",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TORCHIC_DOLL",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_2F_EventScript_21513A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MUDKIP_DOLL",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PIKACHU_DOLL",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index 7798e72e6..ec59115ef 100644
--- a/data/maps/RustboroCity_Flat1_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
@@ -59,7 +59,7 @@ RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8
 	msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT
 	call RustboroCity_Flat1_2F_EventScript_215238
 	msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT
-	applymovement 6, RustboroCity_Flat1_2F_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc
deleted file mode 100644
index c35574261..000000000
--- a/data/maps/RustboroCity_Flat2_1F/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_Flat2_1F_EventObjects: @ 8530AC4
-	object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0
-
-RustboroCity_Flat2_1F_MapWarps: @ 8530AF4
-	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:: @ 8530B0C
-	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
deleted file mode 100644
index dc2a68edf..000000000
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat2_1F: @ 84834B0
-	.4byte RustboroCity_Flat2_1F_Layout
-	.4byte RustboroCity_Flat2_1F_MapEvents
-	.4byte RustboroCity_Flat2_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 294
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json
new file mode 100644
index 000000000..6d10fe9d8
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_1F/map.json
@@ -0,0 +1,69 @@
+{
+  "id": "MAP_RUSTBORO_CITY_FLAT2_1F",
+  "name": "RustboroCity_Flat2_1F",
+  "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SKITTY",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat2_1F_EventScript_215F80",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat2_1F_EventScript_215F77",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc
deleted file mode 100644
index 60423b5d6..000000000
--- a/data/maps/RustboroCity_Flat2_2F/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_Flat2_2F_EventObjects: @ 8530B20
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0
-	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0
-
-RustboroCity_Flat2_2F_MapWarps: @ 8530B50
-	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:: @ 8530B60
-	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
deleted file mode 100644
index 1d117d316..000000000
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat2_2F: @ 84834CC
-	.4byte RustboroCity_Flat2_2F_Layout
-	.4byte RustboroCity_Flat2_2F_MapEvents
-	.4byte RustboroCity_Flat2_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 295
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json
new file mode 100644
index 000000000..a7d254e4d
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_2F/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_RUSTBORO_CITY_FLAT2_2F",
+  "name": "RustboroCity_Flat2_2F",
+  "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat2_2F_EventScript_215FD8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat2_2F_EventScript_215FE1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT2_3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index 639e93884..d4b940c9f 100644
--- a/data/maps/RustboroCity_Flat2_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
@@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1
 	msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT
 	giveitem_std ITEM_PREMIER_BALL
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Flat2_2F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO
 	release
 	end
diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
deleted file mode 100644
index 9ab4727f3..000000000
--- a/data/maps/RustboroCity_Flat2_3F/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_Flat2_3F_EventObjects: @ 8530B74
-	object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0
-
-RustboroCity_Flat2_3F_MapWarps: @ 8530BA4
-	warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F
-
-RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC
-	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
deleted file mode 100644
index 037ca6821..000000000
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat2_3F: @ 84834E8
-	.4byte RustboroCity_Flat2_3F_Layout
-	.4byte RustboroCity_Flat2_3F_MapEvents
-	.4byte RustboroCity_Flat2_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 296
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json
new file mode 100644
index 000000000..2366b5392
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_3F/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_RUSTBORO_CITY_FLAT2_3F",
+  "name": "RustboroCity_Flat2_3F",
+  "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat2_3F_EventScript_216117",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Flat2_3F_EventScript_216120",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc
deleted file mode 100644
index 0d1f57cdd..000000000
--- a/data/maps/RustboroCity_Gym/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RustboroCity_Gym_EventObjects: @ 8530538
-	object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0
-	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0
-
-RustboroCity_Gym_MapWarps: @ 85305B0
-	warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY
-	warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY
-
-RustboroCity_Gym_MapBGEvents: @ 85305C0
-	bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047
-	bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057
-
-RustboroCity_Gym_MapEvents:: @ 85305D8
-	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
deleted file mode 100644
index 72dc7ee47..000000000
--- a/data/maps/RustboroCity_Gym/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Gym: @ 8483398
-	.4byte RustboroCity_Gym_Layout
-	.4byte RustboroCity_Gym_MapEvents
-	.4byte RustboroCity_Gym_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 94
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json
new file mode 100644
index 000000000..3da39df9d
--- /dev/null
+++ b/data/maps/RustboroCity_Gym/map.json
@@ -0,0 +1,118 @@
+{
+  "id": "MAP_RUSTBORO_CITY_GYM",
+  "name": "RustboroCity_Gym",
+  "layout": "LAYOUT_RUSTBORO_CITY_GYM",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ROXANNE",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Gym_EventScript_212F31",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 5,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "RustboroCity_Gym_EventScript_212FE3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "RustboroCity_Gym_EventScript_212FFA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 3,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Gym_EventScript_213028",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "RustboroCity_Gym_EventScript_213011",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "RustboroCity_Gym_EventScript_213047"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "RustboroCity_Gym_EventScript_213057"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 4581707ce..aaa3b3f0b 100644
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -14,15 +14,15 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31
 RustboroCity_Gym_EventScript_212F66:: @ 8212F66
 	message RustboroCity_Gym_Text_2137EC
 	waitmessage
-	call RustboroCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_RUSTBORO_GYM
 	setflag FLAG_BADGE01_GET
-	setvar VAR_0x405A, 1
-	addvar VAR_0x4085, 1
+	setvar VAR_RUSTBORO_STATE, 1
+	addvar VAR_PETALBURG_GYM_STATE, 1
 	setvar VAR_0x8008, 1
 	call RustboroCity_Gym_EventScript_271F43
-	compare VAR_0x4085, 6
+	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq RustboroCity_Gym_EventScript_271E84
 	goto RustboroCity_Gym_EventScript_212FA4
 	end
@@ -30,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
 RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4
 	giveitem_std ITEM_TM39
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM39
 	msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc
deleted file mode 100644
index 2fc0284a9..000000000
--- a/data/maps/RustboroCity_House1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_House1_EventObjects: @ 85309C8
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0
-
-RustboroCity_House1_MapWarps: @ 85309F8
-	warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY
-	warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY
-
-RustboroCity_House1_MapEvents:: @ 8530A08
-	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
deleted file mode 100644
index cff9064e9..000000000
--- a/data/maps/RustboroCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_House1: @ 848345C
-	.4byte RustboroCity_House1_Layout
-	.4byte RustboroCity_House1_MapEvents
-	.4byte RustboroCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 97
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json
new file mode 100644
index 000000000..bc889d66b
--- /dev/null
+++ b/data/maps/RustboroCity_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_RUSTBORO_CITY_HOUSE1",
+  "name": "RustboroCity_House1",
+  "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_House1_EventScript_21593F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_House1_EventScript_2159DF",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc
deleted file mode 100644
index 2f8d4b2bf..000000000
--- a/data/maps/RustboroCity_House2/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_House2_EventObjects: @ 8530A70
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0
-
-RustboroCity_House2_MapWarps: @ 8530AA0
-	warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY
-
-RustboroCity_House2_MapEvents:: @ 8530AB0
-	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
deleted file mode 100644
index d842f2e79..000000000
--- a/data/maps/RustboroCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_House2: @ 8483494
-	.4byte RustboroCity_House_Layout
-	.4byte RustboroCity_House2_MapEvents
-	.4byte RustboroCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 96
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json
new file mode 100644
index 000000000..b10b2c074
--- /dev/null
+++ b/data/maps/RustboroCity_House2/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_RUSTBORO_CITY_HOUSE2",
+  "name": "RustboroCity_House2",
+  "layout": "LAYOUT_RUSTBORO_CITY_HOUSE",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_House2_EventScript_215EB4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_House2_EventScript_215EBD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc
deleted file mode 100644
index 95198b27c..000000000
--- a/data/maps/RustboroCity_House3/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_House3_EventObjects: @ 8530BC0
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0
-	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0
-
-RustboroCity_House3_MapWarps: @ 8530C08
-	warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY
-
-RustboroCity_House3_MapEvents:: @ 8530C18
-	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
deleted file mode 100644
index 7f057cf15..000000000
--- a/data/maps/RustboroCity_House3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_House3: @ 8483504
-	.4byte RustboroCity_House_Layout
-	.4byte RustboroCity_House3_MapEvents
-	.4byte RustboroCity_House3_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 96
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json
new file mode 100644
index 000000000..50b5f1295
--- /dev/null
+++ b/data/maps/RustboroCity_House3/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_RUSTBORO_CITY_HOUSE3",
+  "name": "RustboroCity_House3",
+  "layout": "LAYOUT_RUSTBORO_CITY_HOUSE",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_House3_EventScript_216191",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_House3_EventScript_21619A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PIKACHU",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_House3_EventScript_2161A3",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc
deleted file mode 100644
index 8d65c367d..000000000
--- a/data/maps/RustboroCity_Mart/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-RustboroCity_Mart_EventObjects: @ 853080C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0
-	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0
-
-RustboroCity_Mart_MapWarps: @ 853086C
-	warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY
-	warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY
-
-RustboroCity_Mart_MapEvents:: @ 853087C
-	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
deleted file mode 100644
index bb41aab1d..000000000
--- a/data/maps/RustboroCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Mart: @ 8483408
-	.4byte Mart_Layout
-	.4byte RustboroCity_Mart_MapEvents
-	.4byte RustboroCity_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json
new file mode 100644
index 000000000..a2a5a846f
--- /dev/null
+++ b/data/maps/RustboroCity_Mart/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_RUSTBORO_CITY_MART",
+  "name": "RustboroCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Mart_EventScript_214F06",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Mart_EventScript_214F7D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Mart_EventScript_214F74",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
+      "x": 8,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_Mart_EventScript_214F86",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index 597eace15..000000000
--- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0
-
-RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754
-	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:: @ 853076C
-	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
deleted file mode 100644
index 4c5c50074..000000000
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_PokemonCenter_1F: @ 84833D0
-	.4byte PokemonCenter_1F_Layout
-	.4byte RustboroCity_PokemonCenter_1F_MapEvents
-	.4byte RustboroCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..b91dd25ac
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F",
+  "name": "RustboroCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index f76603dbd..e7bea0f0d 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
-	map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D
-	map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_214D6D
+	map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index 346a4de16..000000000
--- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0
-	warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8
-	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
deleted file mode 100644
index 8e70f4c80..000000000
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_PokemonCenter_2F: @ 84833EC
-	.4byte PokemonCenter_2F_Layout
-	.4byte RustboroCity_PokemonCenter_2F_MapEvents
-	.4byte RustboroCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..db6388bba
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F",
+  "name": "RustboroCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index a1bdeba5b..fac3cb059 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE
-	map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3
diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
deleted file mode 100644
index 0c6ca19dc..000000000
--- a/data/maps/RustboroCity_PokemonSchool/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-RustboroCity_PokemonSchool_EventObjects: @ 85305EC
-	object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0
-	object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0
-	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0
-	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0
-	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0
-	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT
-
-RustboroCity_PokemonSchool_MapWarps: @ 8530694
-	warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY
-	warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY
-
-RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4
-	bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C
-
-RustboroCity_PokemonSchool_MapEvents:: @ 85306E0
-	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
deleted file mode 100644
index 9b1467042..000000000
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_PokemonSchool: @ 84833B4
-	.4byte RustboroCity_PokemonSchool_Layout
-	.4byte RustboroCity_PokemonSchool_MapEvents
-	.4byte RustboroCity_PokemonSchool_MapScripts
-	.4byte 0x0
-	.2byte MUS_P_SCHOOL
-	.2byte 95
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json
new file mode 100644
index 000000000..614b123c4
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/map.json
@@ -0,0 +1,168 @@
+{
+  "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL",
+  "name": "RustboroCity_PokemonSchool",
+  "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL",
+  "music": "MUS_P_SCHOOL",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonSchool_EventScript_213F5F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonSchool_EventScript_213F68",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 3,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonSchool_EventScript_213F71",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonSchool_EventScript_213F7A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonSchool_EventScript_213F83",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonSchool_EventScript_213F95",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 0,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_PokemonSchool_EventScript_214040",
+      "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_PokemonSchool_EventScript_213F8C"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index c01e4a436..ff52ee5ac 100644
--- a/data/maps/RustboroCity_PokemonSchool/scripts.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
@@ -85,9 +85,9 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
 	msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT
 	giveitem_std ITEM_QUICK_CLAW
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_PokemonSchool_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	setflag FLAG_RECEIVED_QUICK_CLAW
 	release
@@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0
 RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
 	msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	release
 	end
@@ -170,7 +170,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
 	goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F
 	goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082
 	msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_RUSTBORO
 	release
 	end
@@ -192,7 +192,7 @@ RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090
 	end
 
 RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE
 	release
 	end
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
deleted file mode 100644
index 292bda57d..000000000
--- a/data/maps/RusturfTunnel/events.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-RusturfTunnel_EventObjects: @ 85341C4
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
-	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER
-	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
-	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2
-	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
-
-RusturfTunnel_MapWarps: @ 85342B4
-	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: @ 85342CC
-	coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071
-	coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
-	coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
-	coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077
-	coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D
-
-RusturfTunnel_MapEvents:: @ 853431C
-	map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
-
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
deleted file mode 100644
index 70a477681..000000000
--- a/data/maps/RusturfTunnel/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RusturfTunnel: @ 8483F30
-	.4byte RusturfTunnel_Layout
-	.4byte RusturfTunnel_MapEvents
-	.4byte RusturfTunnel_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 129
-	.byte MAPSEC_RUSTURF_TUNNEL
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
new file mode 100644
index 000000000..b873c76c8
--- /dev/null
+++ b/data/maps/RusturfTunnel/map.json
@@ -0,0 +1,219 @@
+{
+  "id": "MAP_RUSTURF_TUNNEL",
+  "name": "RusturfTunnel",
+  "layout": "LAYOUT_RUSTURF_TUNNEL",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_RUSTURF_TUNNEL",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 23,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_22CE76",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 24,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_2907A6",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_291136",
+      "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 30,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_291143",
+      "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_22D0C2",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 14,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_22D0AF",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 24,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_2907A6",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 32,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "RusturfTunnel_EventScript_22D1B1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 25,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RusturfTunnel_EventScript_22CE5F",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE116",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 29,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 18,
+      "y": 20,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE116",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 4,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "RusturfTunnel_EventScript_22D071"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_RUSTURF_TUNNEL_STATE",
+      "var_value": "2",
+      "script": "RusturfTunnel_EventScript_22D083"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_RUSTURF_TUNNEL_STATE",
+      "var_value": "2",
+      "script": "RusturfTunnel_EventScript_22D083"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 4,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "RusturfTunnel_EventScript_22D077"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 5,
+      "elevation": 3,
+      "var": "0",
+      "var_value": "0",
+      "script": "RusturfTunnel_EventScript_22D07D"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 59d0789ba..8e7e2342e 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -1,6 +1,6 @@
 RusturfTunnel_MapScripts:: @ 822CE27
-	map_script 3, RusturfTunnel_MapScript1_22CE44
-	map_script 2, RusturfTunnel_MapScript2_22CE32
+	map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32
 	.byte 0
 
 RusturfTunnel_MapScript2_22CE32: @ 822CE32
@@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
 	faceplayer
 	msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76
 	setflag FLAG_TEMP_1
 	msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76
 RusturfTunnel_EventScript_22CE99:: @ 822CE99
 	msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
 	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
 	applymovement 1, RusturfTunnel_Movement_22D06C
 	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_2725AA
+	applymovement 10, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
@@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
 	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
 	applymovement 1, RusturfTunnel_Movement_22D06C
 	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_2725AA
+	applymovement 10, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
-	applymovement 1, RusturfTunnel_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
@@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6
 
 RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
 	playse SE_PIN
-	applymovement 1, RusturfTunnel_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, RusturfTunnel_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	return
 
@@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	applymovement 5, RusturfTunnel_Movement_22D1A4
 	waitmovement 0
 	msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT
-	applymovement 5, RusturfTunnel_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	message RusturfTunnel_Text_22D3BA
 	waitmessage
@@ -345,8 +345,8 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	removeobject 7
 	clearflag FLAG_DEVON_GOODS_STOLEN
 	setflag FLAG_RECOVERED_DEVON_GOODS
-	setvar VAR_0x405A, 4
-	setvar VAR_0x4090, 1
+	setvar VAR_RUSTBORO_STATE, 4
+	setvar VAR_BRINEY_HOUSE_STATE, 1
 	setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
 	release
 	end
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc
deleted file mode 100644
index c36e38fda..000000000
--- a/data/maps/SSTidalCorridor/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-SSTidalCorridor_EventObjects: @ 853A158
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
-	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT
-
-SSTidalCorridor_MapWarps: @ 853A1D0
-	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: @ 853A218
-	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
-	bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0F5
-	bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0FE
-	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107
-	bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110
-
-SSTidalCorridor_MapEvents:: @ 853A2A8
-	map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
-
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
deleted file mode 100644
index 37128821c..000000000
--- a/data/maps/SSTidalCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SSTidalCorridor: @ 8484F0C
-	.4byte SSTidalCorridor_Layout
-	.4byte SSTidalCorridor_MapEvents
-	.4byte SSTidalCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_BOAT
-	.2byte 277
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json
new file mode 100644
index 000000000..ce6c3d2d0
--- /dev/null
+++ b/data/maps/SSTidalCorridor/map.json
@@ -0,0 +1,247 @@
+{
+  "id": "MAP_SS_TIDAL_CORRIDOR",
+  "name": "SSTidalCorridor",
+  "layout": "LAYOUT_SS_TIDAL_CORRIDOR",
+  "music": "MUS_M_BOAT",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 1,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalCorridor_EventScript_23C119",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 16,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalCorridor_EventScript_23C1A3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalCorridor_EventScript_23C0D9",
+      "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalCorridor_EventScript_23C0E2",
+      "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_ROOMS",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 16,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_LOWER_DECK",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalCorridor_EventScript_23C17D"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SSTidalCorridor_EventScript_23C0F5"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SSTidalCorridor_EventScript_23C0FE"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SSTidalCorridor_EventScript_23C107"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SSTidalCorridor_EventScript_23C110"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index 204d70e14..ec231ccdd 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,9 +1,9 @@
 SSTidalCorridor_MapScripts:: @ 823BFCF
-	map_script 2, SSTidalCorridor_MapScript2_23BFD5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5
 	.byte 0
 
 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
-	map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219
+	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219
 	map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
 	map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
 	map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
@@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
 	lockall
 	applymovement 5, SSTidalCorridor_Movement_23C26D
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT
 	closemessage
@@ -216,7 +216,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
 	waitmovement 0
 	delay 30
 	setflag FLAG_MET_SCOTT_ON_SS_TIDAL
-	setvar VAR_0x40D4, 1
+	setvar VAR_SS_TIDAL_SCOTT_STATE, 1
 	releaseall
 	end
 
diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc
deleted file mode 100644
index 65ced7c13..000000000
--- a/data/maps/SSTidalLowerDeck/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SSTidalLowerDeck_EventObjects: @ 853A2BC
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0
-
-SSTidalLowerDeck_MapWarps: @ 853A2EC
-	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
-
-SSTidalLowerDeck_MapBGEvents: @ 853A2F4
-	bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS
-
-SSTidalLowerDeck_MapEvents:: @ 853A300
-	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
-
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
deleted file mode 100644
index f86d3ac06..000000000
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SSTidalLowerDeck: @ 8484F28
-	.4byte SSTidalLowerDeck_Layout
-	.4byte SSTidalLowerDeck_MapEvents
-	.4byte SSTidalLowerDeck_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_BOAT
-	.2byte 278
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json
new file mode 100644
index 000000000..3e678ca8c
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/map.json
@@ -0,0 +1,64 @@
+{
+  "id": "MAP_SS_TIDAL_LOWER_DECK",
+  "name": "SSTidalLowerDeck",
+  "layout": "LAYOUT_SS_TIDAL_LOWER_DECK",
+  "music": "MUS_M_BOAT",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT",
+      "movement_range_x": 4,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SSTidalLowerDeck_EventScript_23C819",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
+      "movement_range_x": 7,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SSTidalLowerDeck_EventScript_23C830",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 0,
+      "y": 2,
+      "elevation": 0,
+      "item": "ITEM_LEFTOVERS",
+      "flag": "FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc
deleted file mode 100644
index 99937ef75..000000000
--- a/data/maps/SSTidalRooms/events.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SSTidalRooms_EventObjects: @ 853A314
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0
-	object_event 6, EVENT_OBJ_GFX_RICH_BOY, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0
-	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
-
-SSTidalRooms_MapWarps: @ 853A3D4
-	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: @ 853A434
-	bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33
-	bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33
-
-SSTidalRooms_MapEvents:: @ 853A44C
-	map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
-
diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc
deleted file mode 100644
index 0d1f4db63..000000000
--- a/data/maps/SSTidalRooms/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SSTidalRooms: @ 8484F44
-	.4byte SSTidalRooms_Layout
-	.4byte SSTidalRooms_MapEvents
-	.4byte SSTidalRooms_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_BOAT
-	.2byte 279
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json
new file mode 100644
index 000000000..8fb4bd05d
--- /dev/null
+++ b/data/maps/SSTidalRooms/map.json
@@ -0,0 +1,227 @@
+{
+  "id": "MAP_SS_TIDAL_ROOMS",
+  "name": "SSTidalRooms",
+  "layout": "LAYOUT_SS_TIDAL_ROOMS",
+  "music": "MUS_M_BOAT",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalRooms_EventScript_23CA49",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 34,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SSTidalRooms_EventScript_23CA60",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 21,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalRooms_EventScript_23CA77",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "SSTidalRooms_EventScript_23CA8E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 4,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "SSTidalRooms_EventScript_23CAA9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 22,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SSTidalRooms_EventScript_23CAC4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalRooms_EventScript_23CADB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 28,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SSTidalRooms_EventScript_23C9F2",
+      "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 22,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 23,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 31,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 32,
+      "y": 16,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 22,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 31,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SS_TIDAL_CORRIDOR",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 11,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalRooms_EventScript_23CA33"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SSTidalRooms_EventScript_23CA33"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index a021f5272..3b8df90a3 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -8,7 +8,7 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2
 	msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM49
 	compare VAR_RESULT, 0
-	goto_if_eq SSTidalRooms_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM49
 	msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT
 	release
@@ -23,7 +23,7 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33
 	lockall
 	msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT
 	closemessage
-	call SSTidalRooms_EventScript_272083
+	call Common_EventScript_OutOfCenterPartyHeal
 	call SSTidalRooms_EventScript_23C0A7
 	releaseall
 	end
diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc
deleted file mode 100644
index d99826f0d..000000000
--- a/data/maps/SafariZone_North/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SafariZone_North_MapConnectionsList: @ 8486E18
-	connection left, 0, MAP_SAFARI_ZONE_NORTHWEST
-	connection down, 0, MAP_SAFARI_ZONE_SOUTH
-	connection right, 0, MAP_SAFARI_ZONE_NORTHEAST
-
-SafariZone_North_MapConnections: @ 8486E3C
-	.4byte 0x3
-	.4byte SafariZone_North_MapConnectionsList
-
diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc
deleted file mode 100644
index 152fa54c5..000000000
--- a/data/maps/SafariZone_North/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_North_EventObjects: @ 853B160
-	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_12
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_13
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_14
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_15
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM
-
-SafariZone_North_MapEvents:: @ 853B238
-	map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc
deleted file mode 100644
index ebcb62f9a..000000000
--- a/data/maps/SafariZone_North/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_North: @ 8485158
-	.4byte SafariZone_North_Layout
-	.4byte SafariZone_North_MapEvents
-	.4byte SafariZone_North_MapScripts
-	.4byte SafariZone_North_MapConnections
-	.2byte MUS_SAFARI
-	.2byte 239
-	.byte MAPSEC_SAFARI_ZONE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
new file mode 100644
index 000000000..7c637f0ef
--- /dev/null
+++ b/data/maps/SafariZone_North/map.json
@@ -0,0 +1,154 @@
+{
+  "id": "MAP_SAFARI_ZONE_NORTH",
+  "name": "SafariZone_North",
+  "layout": "LAYOUT_SAFARI_ZONE_NORTH",
+  "music": "MUS_SAFARI",
+  "region_map_section": "MAPSEC_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_NORTHWEST"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_SOUTH"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_NORTHEAST"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_23D254",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 6,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_23D25D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 25,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 25,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_2907A6",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 28,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_2907A6",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 23,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_2907A6",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 20,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_2907A6",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 27,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_2907A6",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_North_EventScript_2912C9",
+      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc
deleted file mode 100644
index c762c485a..000000000
--- a/data/maps/SafariZone_Northeast/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZone_Northeast_MapConnectionsList: @ 8486E90
-	connection left, 0, MAP_SAFARI_ZONE_NORTH
-	connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST
-
-SafariZone_Northeast_MapConnections: @ 8486EA8
-	.4byte 0x2
-	.4byte SafariZone_Northeast_MapConnectionsList
-
diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc
deleted file mode 100644
index dc0393b4d..000000000
--- a/data/maps/SafariZone_Northeast/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SafariZone_Northeast_EventObjects: @ 853B968
-	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_13
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_11
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_14
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET
-
-SafariZone_Northeast_MapBGEvents: @ 853BA40
-	bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY
-	bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC
-
-SafariZone_Northeast_MapEvents:: @ 853BA58
-	map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents
-
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
deleted file mode 100644
index 9db5fd596..000000000
--- a/data/maps/SafariZone_Northeast/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Northeast: @ 848528C
-	.4byte SafariZone_Northeast_Layout
-	.4byte SafariZone_Northeast_MapEvents
-	.4byte SafariZone_Northeast_MapScripts
-	.4byte SafariZone_Northeast_MapConnections
-	.2byte MUS_SAFARI
-	.2byte 394
-	.byte MAPSEC_SAFARI_ZONE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json
new file mode 100644
index 000000000..8e3337f53
--- /dev/null
+++ b/data/maps/SafariZone_Northeast/map.json
@@ -0,0 +1,166 @@
+{
+  "id": "MAP_SAFARI_ZONE_NORTHEAST",
+  "name": "SafariZone_Northeast",
+  "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST",
+  "music": "MUS_SAFARI",
+  "region_map_section": "MAPSEC_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_NORTH"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_SOUTHEAST"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 8,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_23D3C6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 30,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_23D3D8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 13,
+      "y": 35,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_23D3CF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 8,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northeast_EventScript_2912E3",
+      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 35,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY"
+    },
+    {
+      "type": "hidden_item",
+      "x": 21,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_ZINC",
+      "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc
deleted file mode 100644
index 010a13cc2..000000000
--- a/data/maps/SafariZone_Northwest/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZone_Northwest_MapConnectionsList: @ 8486DF8
-	connection right, 0, MAP_SAFARI_ZONE_NORTH
-	connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST
-
-SafariZone_Northwest_MapConnections: @ 8486E10
-	.4byte 0x2
-	.4byte SafariZone_Northwest_MapConnectionsList
-
diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc
deleted file mode 100644
index 95b6623ac..000000000
--- a/data/maps/SafariZone_Northwest/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SafariZone_Northwest_EventObjects: @ 853B11C
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22
-
-SafariZone_Northwest_MapEvents:: @ 853B14C
-	map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
deleted file mode 100644
index ca59f45e7..000000000
--- a/data/maps/SafariZone_Northwest/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Northwest: @ 848513C
-	.4byte SafariZone_Northwest_Layout
-	.4byte SafariZone_Northwest_MapEvents
-	.4byte SafariZone_Northwest_MapScripts
-	.4byte SafariZone_Northwest_MapConnections
-	.2byte MUS_SAFARI
-	.2byte 238
-	.byte MAPSEC_SAFARI_ZONE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json
new file mode 100644
index 000000000..2d3a1fa49
--- /dev/null
+++ b/data/maps/SafariZone_Northwest/map.json
@@ -0,0 +1,58 @@
+{
+  "id": "MAP_SAFARI_ZONE_NORTHWEST",
+  "name": "SafariZone_Northwest",
+  "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST",
+  "music": "MUS_SAFARI",
+  "region_map_section": "MAPSEC_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_NORTH"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_SOUTHWEST"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 8,
+      "y": 8,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northwest_EventScript_23D24A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 33,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Northwest_EventScript_2912BC",
+      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc
deleted file mode 100644
index 5a54de961..000000000
--- a/data/maps/SafariZone_RestHouse/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SafariZone_RestHouse_EventObjects: @ 853B8FC
-	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0
-	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0
-
-SafariZone_RestHouse_MapWarps: @ 853B944
-	warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
-	warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
-
-SafariZone_RestHouse_MapEvents:: @ 853B954
-	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
deleted file mode 100644
index fbb6f4d05..000000000
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_RestHouse: @ 8485270
-	.4byte SafariZone_RestHouse_Layout
-	.4byte SafariZone_RestHouse_MapEvents
-	.4byte SafariZone_RestHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_SAFARI
-	.2byte 329
-	.byte MAPSEC_SAFARI_ZONE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json
new file mode 100644
index 000000000..db0ba8048
--- /dev/null
+++ b/data/maps/SafariZone_RestHouse/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_SAFARI_ZONE_REST_HOUSE",
+  "name": "SafariZone_RestHouse",
+  "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
+  "music": "MUS_SAFARI",
+  "region_map_section": "MAPSEC_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 7,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_RestHouse_EventScript_242BE7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_RestHouse_EventScript_242BF0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_RestHouse_EventScript_242BF9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc
deleted file mode 100644
index 856bb30ab..000000000
--- a/data/maps/SafariZone_South/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SafariZone_South_MapConnectionsList: @ 8486E64
-	connection up, 0, MAP_SAFARI_ZONE_NORTH
-	connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST
-	connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST
-
-SafariZone_South_MapConnections: @ 8486E88
-	.4byte 0x3
-	.4byte SafariZone_South_MapConnectionsList
-
diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc
deleted file mode 100644
index 6d8d84877..000000000
--- a/data/maps/SafariZone_South/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_South_EventObjects: @ 853B2A4
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
-	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
-
-SafariZone_South_MapWarps: @ 853B334
-	warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
-
-SafariZone_South_MapEvents:: @ 853B33C
-	map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc
deleted file mode 100644
index 1567935d2..000000000
--- a/data/maps/SafariZone_South/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_South: @ 8485190
-	.4byte SafariZone_South_Layout
-	.4byte SafariZone_South_MapEvents
-	.4byte SafariZone_South_MapScripts
-	.4byte SafariZone_South_MapConnections
-	.2byte MUS_SAFARI
-	.2byte 241
-	.byte MAPSEC_SAFARI_ZONE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json
new file mode 100644
index 000000000..371be2119
--- /dev/null
+++ b/data/maps/SafariZone_South/map.json
@@ -0,0 +1,123 @@
+{
+  "id": "MAP_SAFARI_ZONE_SOUTH",
+  "name": "SafariZone_South",
+  "layout": "LAYOUT_SAFARI_ZONE_SOUTH",
+  "music": "MUS_SAFARI",
+  "region_map_section": "MAPSEC_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_NORTH"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_SOUTHWEST"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_SOUTHEAST"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 32,
+      "y": 34,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_South_EventScript_23D2E5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 26,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_South_EventScript_23D2CA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 16,
+      "y": 6,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_South_EventScript_23D2D3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+      "x": 15,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_South_EventScript_23D2DC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 36,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_South_EventScript_23D390",
+      "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 36,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_South_EventScript_23D3A2",
+      "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 32,
+      "y": 33,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc
index ab6f70f86..75ec95d33 100644
--- a/data/maps/SafariZone_South/scripts.inc
+++ b/data/maps/SafariZone_South/scripts.inc
@@ -1,10 +1,10 @@
 SafariZone_South_MapScripts:: @ 823D279
-	map_script 3, SafariZone_South_MapScript1_23D2B1
-	map_script 2, SafariZone_South_MapScript2_23D284
+	map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_23D2B1
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284
 	.byte 0
 
 SafariZone_South_MapScript2_23D284: @ 823D284
-	map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E
+	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E
 	.2byte 0
 
 SafariZone_South_EventScript_23D28E:: @ 823D28E
@@ -14,12 +14,12 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E
 	applymovement 1, SafariZone_South_Movement_23D2C7
 	waitmovement 0
 	setobjectxyperm 1, 32, 34
-	setvar VAR_0x40A4, 0
+	setvar VAR_SAFARI_ZONE_STATE, 0
 	releaseall
 	end
 
 SafariZone_South_MapScript1_23D2B1: @ 823D2B1
-	compare VAR_0x40A4, 2
+	compare VAR_SAFARI_ZONE_STATE, 2
 	call_if_eq SafariZone_South_EventScript_23D2BD
 	end
 
@@ -90,7 +90,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359
 	end
 
 SafariZone_South_EventScript_23D373:: @ 823D373
-	setvar VAR_0x40A4, 1
+	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc
deleted file mode 100644
index 16b39e87b..000000000
--- a/data/maps/SafariZone_Southeast/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZone_Southeast_MapConnectionsList: @ 8486EB0
-	connection left, 0, MAP_SAFARI_ZONE_SOUTH
-	connection up, 0, MAP_SAFARI_ZONE_NORTHEAST
-
-SafariZone_Southeast_MapConnections: @ 8486EC8
-	.4byte 0x2
-	.4byte SafariZone_Southeast_MapConnectionsList
-
diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc
deleted file mode 100644
index badaaefd4..000000000
--- a/data/maps/SafariZone_Southeast/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_Southeast_EventObjects: @ 853BA6C
-	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
-
-SafariZone_Southeast_MapBGEvents: @ 853BAE4
-	bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP
-	bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE
-
-SafariZone_Southeast_MapEvents:: @ 853BAFC
-	map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents
-
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
deleted file mode 100644
index 55ff68232..000000000
--- a/data/maps/SafariZone_Southeast/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Southeast: @ 84852A8
-	.4byte SafariZone_Southeast_Layout
-	.4byte SafariZone_Southeast_MapEvents
-	.4byte SafariZone_Southeast_MapScripts
-	.4byte SafariZone_Southeast_MapConnections
-	.2byte MUS_SAFARI
-	.2byte 395
-	.byte MAPSEC_SAFARI_ZONE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json
new file mode 100644
index 000000000..3ace62488
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_SAFARI_ZONE_SOUTHEAST",
+  "name": "SafariZone_Southeast",
+  "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST",
+  "music": "MUS_SAFARI",
+  "region_map_section": "MAPSEC_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_SOUTH"
+    },
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_NORTHEAST"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Southeast_EventScript_23D3BD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 20,
+      "y": 30,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Southeast_EventScript_23D3B4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 8,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Southeast_EventScript_23D3AB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 31,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Southeast_EventScript_2912F0",
+      "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Southeast_EventScript_23D399",
+      "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 36,
+      "elevation": 3,
+      "item": "ITEM_PP_UP",
+      "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP"
+    },
+    {
+      "type": "hidden_item",
+      "x": 32,
+      "y": 33,
+      "elevation": 0,
+      "item": "ITEM_FULL_RESTORE",
+      "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc
deleted file mode 100644
index 83398e3a3..000000000
--- a/data/maps/SafariZone_Southwest/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZone_Southwest_MapConnectionsList: @ 8486E44
-	connection up, 0, MAP_SAFARI_ZONE_NORTHWEST
-	connection right, 0, MAP_SAFARI_ZONE_SOUTH
-
-SafariZone_Southwest_MapConnections: @ 8486E5C
-	.4byte 0x2
-	.4byte SafariZone_Southwest_MapConnectionsList
-
diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc
deleted file mode 100644
index 930d3c8ed..000000000
--- a/data/maps/SafariZone_Southwest/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SafariZone_Southwest_EventObjects: @ 853B24C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE
-
-SafariZone_Southwest_MapWarps: @ 853B27C
-	warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE
-
-SafariZone_Southwest_MapBGEvents: @ 853B284
-	bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270
-
-SafariZone_Southwest_MapEvents:: @ 853B290
-	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
deleted file mode 100644
index 189fa09b8..000000000
--- a/data/maps/SafariZone_Southwest/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SafariZone_Southwest: @ 8485174
-	.4byte SafariZone_Southwest_Layout
-	.4byte SafariZone_Southwest_MapEvents
-	.4byte SafariZone_Southwest_MapScripts
-	.4byte SafariZone_Southwest_MapConnections
-	.2byte MUS_SAFARI
-	.2byte 240
-	.byte MAPSEC_SAFARI_ZONE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json
new file mode 100644
index 000000000..5e383a694
--- /dev/null
+++ b/data/maps/SafariZone_Southwest/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_SAFARI_ZONE_SOUTHWEST",
+  "name": "SafariZone_Southwest",
+  "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST",
+  "music": "MUS_SAFARI",
+  "region_map_section": "MAPSEC_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_NORTHWEST"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_SAFARI_ZONE_SOUTH"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Southwest_EventScript_23D267",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SafariZone_Southwest_EventScript_2912D6",
+      "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 29,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_REST_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 7,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SafariZone_Southwest_EventScript_23D270"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc
deleted file mode 100644
index 20a5fc145..000000000
--- a/data/maps/ScorchedSlab/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-ScorchedSlab_EventObjects: @ 8536F88
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11
-
-ScorchedSlab_MapWarps: @ 8536FA0
-	warp_def 7, 16, 1, 1, MAP_ROUTE120
-
-ScorchedSlab_MapEvents:: @ 8536FA8
-	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
deleted file mode 100644
index 84c09df3f..000000000
--- a/data/maps/ScorchedSlab/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ScorchedSlab: @ 84846BC
-	.4byte ScorchedSlab_Layout
-	.4byte ScorchedSlab_MapEvents
-	.4byte ScorchedSlab_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 311
-	.byte MAPSEC_SCORCHED_SLAB
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json
new file mode 100644
index 000000000..304ebd676
--- /dev/null
+++ b/data/maps/ScorchedSlab/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SCORCHED_SLAB",
+  "name": "ScorchedSlab",
+  "layout": "LAYOUT_SCORCHED_SLAB",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_SCORCHED_SLAB",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ScorchedSlab_EventScript_2912AF",
+      "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 16,
+      "elevation": 1,
+      "dest_map": "MAP_ROUTE120",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc
index f83724ec5..62a546780 100644
--- a/data/maps/ScorchedSlab/scripts.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
@@ -1,5 +1,5 @@
 ScorchedSlab_MapScripts:: @ 8239291
-	map_script 3, ScorchedSlab_MapScript1_239297
+	map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_239297
 	.byte 0
 
 ScorchedSlab_MapScript1_239297: @ 8239297
diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc
deleted file mode 100644
index b0574d14e..000000000
--- a/data/maps/SeafloorCavern_Entrance/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SeafloorCavern_Entrance_EventObjects: @ 85356BC
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
-
-SeafloorCavern_Entrance_MapWarps: @ 85356D4
-	warp_def 10, 18, 3, 0, MAP_UNDERWATER4
-	warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1
-
-SeafloorCavern_Entrance_MapEvents:: @ 85356E4
-	map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
deleted file mode 100644
index 8e62470ac..000000000
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Entrance: @ 84841B4
-	.4byte SeafloorCavern_Entrance_Layout
-	.4byte SeafloorCavern_Entrance_MapEvents
-	.4byte SeafloorCavern_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 147
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json
new file mode 100644
index 000000000..12000c699
--- /dev/null
+++ b/data/maps/SeafloorCavern_Entrance/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+  "name": "SeafloorCavern_Entrance",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Entrance_EventScript_234485",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERWATER4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 9bbb9cbdc..1bf570549 100644
--- a/data/maps/SeafloorCavern_Entrance/scripts.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Entrance_MapScripts:: @ 823446E
-	map_script 5, SeafloorCavern_Entrance_MapScript1_234474
+	map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474
 	.byte 0
 
 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
@@ -9,13 +9,13 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
 
 SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
 	lockall
-	compare VAR_0x40D9, 1
+	compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
 	goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED
 	waitse
 	playse SE_PIN
-	applymovement 1, SeafloorCavern_Entrance_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, SeafloorCavern_Entrance_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	delay 20
 	compare VAR_FACING, 3
@@ -25,11 +25,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
 	compare VAR_FACING, 2
 	call_if_eq SeafloorCavern_Entrance_EventScript_234539
 	delay 30
-	setvar VAR_0x40D9, 1
+	setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
 	moveobjectoffscreen 1
 	msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	releaseall
 	end
@@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
 	call_if_eq SeafloorCavern_Entrance_EventScript_234539
 	msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	releaseall
 	end
 
 SeafloorCavern_Entrance_EventScript_234523:: @ 8234523
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 SeafloorCavern_Entrance_EventScript_234539:: @ 8234539
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc
deleted file mode 100644
index 2c507151b..000000000
--- a/data/maps/SeafloorCavern_Room1/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room1_EventObjects: @ 85356F8
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-
-SeafloorCavern_Room1_MapWarps: @ 8535770
-	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:: @ 8535788
-	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
deleted file mode 100644
index 9b84e5d96..000000000
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room1: @ 84841D0
-	.4byte SeafloorCavern_Room1_Layout
-	.4byte SeafloorCavern_Room1_MapEvents
-	.4byte SeafloorCavern_Room1_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 148
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json
new file mode 100644
index 000000000..bcac09256
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room1/map.json
@@ -0,0 +1,108 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM1",
+  "name": "SeafloorCavern_Room1",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 5,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room1_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 12,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room1_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 5,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room1_EventScript_2907A6",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 8,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "SeafloorCavern_Room1_EventScript_2347EC",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 15,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SeafloorCavern_Room1_EventScript_234803",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 17,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc
deleted file mode 100644
index 1cc30957a..000000000
--- a/data/maps/SeafloorCavern_Room2/events.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room2_EventObjects: @ 853579C
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_15
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_16
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_18
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17
-
-SeafloorCavern_Room2_MapWarps: @ 853585C
-	warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1
-	warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4
-	warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6
-	warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7
-
-SeafloorCavern_Room2_MapEvents:: @ 853587C
-	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
deleted file mode 100644
index b7d4e47d7..000000000
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room2: @ 84841EC
-	.4byte SeafloorCavern_Room2_Layout
-	.4byte SeafloorCavern_Room2_MapEvents
-	.4byte SeafloorCavern_Room2_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 149
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json
new file mode 100644
index 000000000..3e5d6b127
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room2/map.json
@@ -0,0 +1,154 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM2",
+  "name": "SeafloorCavern_Room2",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 13,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 8,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2907A6",
+      "flag": "FLAG_TEMP_18"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2907A6",
+      "flag": "FLAG_TEMP_19"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "flag": "FLAG_TEMP_17"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 11,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc
deleted file mode 100644
index e48782693..000000000
--- a/data/maps/SeafloorCavern_Room3/events.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room3_EventObjects: @ 8535890
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_16
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_17
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_18
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_19
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-
-SeafloorCavern_Room3_MapWarps: @ 8535968
-	warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8
-	warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7
-	warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6
-
-SeafloorCavern_Room3_MapEvents:: @ 8535980
-	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
deleted file mode 100644
index b5a032b60..000000000
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room3: @ 8484208
-	.4byte SeafloorCavern_Room3_Layout
-	.4byte SeafloorCavern_Room3_MapEvents
-	.4byte SeafloorCavern_Room3_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 150
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json
new file mode 100644
index 000000000..c7a90b42d
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room3/map.json
@@ -0,0 +1,160 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM3",
+  "name": "SeafloorCavern_Room3",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 12,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "flag": "FLAG_TEMP_17"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 12,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "flag": "FLAG_TEMP_18"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 13,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "flag": "FLAG_TEMP_19"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
+      "script": "SeafloorCavern_Room3_EventScript_234938",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "SeafloorCavern_Room3_EventScript_23494F",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc
deleted file mode 100644
index c4e96aee0..000000000
--- a/data/maps/SeafloorCavern_Room4/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SeafloorCavern_Room4_EventObjects: @ 8535994
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-
-SeafloorCavern_Room4_MapWarps: @ 85359C4
-	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:: @ 85359E4
-	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
deleted file mode 100644
index 75b51c343..000000000
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room4: @ 8484224
-	.4byte SeafloorCavern_Room4_Layout
-	.4byte SeafloorCavern_Room4_MapEvents
-	.4byte SeafloorCavern_Room4_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 151
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json
new file mode 100644
index 000000000..0638ab4ed
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room4/map.json
@@ -0,0 +1,76 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM4",
+  "name": "SeafloorCavern_Room4",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SeafloorCavern_Room4_EventScript_234C9C",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SeafloorCavern_Room4_EventScript_234CB3",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc
deleted file mode 100644
index e4780db22..000000000
--- a/data/maps/SeafloorCavern_Room5/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SeafloorCavern_Room5_EventObjects: @ 85359F8
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_15
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14
-
-SeafloorCavern_Room5_MapWarps: @ 8535A88
-	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:: @ 8535AA0
-	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
deleted file mode 100644
index 6b053fc71..000000000
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room5: @ 8484240
-	.4byte SeafloorCavern_Room5_Layout
-	.4byte SeafloorCavern_Room5_MapEvents
-	.4byte SeafloorCavern_Room5_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 152
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json
new file mode 100644
index 000000000..975fc6a98
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/map.json
@@ -0,0 +1,121 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM5",
+  "name": "SeafloorCavern_Room5",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 3,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 11,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 3,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room5_EventScript_2907A6",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 13,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room5_EventScript_2907A6",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "flag": "FLAG_TEMP_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc
deleted file mode 100644
index 99c10d87e..000000000
--- a/data/maps/SeafloorCavern_Room6/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafloorCavern_Room6_MapWarps: @ 8535AB4
-	warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2
-	warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3
-	warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
-
-SeafloorCavern_Room6_MapEvents:: @ 8535ACC
-	map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
deleted file mode 100644
index d1346acd8..000000000
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room6: @ 848425C
-	.4byte SeafloorCavern_Room6_Layout
-	.4byte SeafloorCavern_Room6_MapEvents
-	.4byte SeafloorCavern_Room6_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 153
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json
new file mode 100644
index 000000000..69c5330ea
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM6",
+  "name": "SeafloorCavern_Room6",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 14,
+      "y": 8,
+      "elevation": 1,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc
deleted file mode 100644
index 2d8fca999..000000000
--- a/data/maps/SeafloorCavern_Room7/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SeafloorCavern_Room7_MapWarps: @ 8535AE0
-	warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2
-	warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3
-
-SeafloorCavern_Room7_MapEvents:: @ 8535AF0
-	map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
deleted file mode 100644
index b5b4aca03..000000000
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room7: @ 8484278
-	.4byte SeafloorCavern_Room7_Layout
-	.4byte SeafloorCavern_Room7_MapEvents
-	.4byte SeafloorCavern_Room7_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 154
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json
new file mode 100644
index 000000000..65c103aaf
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room7/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM7",
+  "name": "SeafloorCavern_Room7",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 23,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc
deleted file mode 100644
index c34ec76d3..000000000
--- a/data/maps/SeafloorCavern_Room8/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SeafloorCavern_Room8_EventObjects: @ 8535B04
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_14
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_15
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_16
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_17
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_18
-	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_19
-	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1A
-	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B
-	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C
-
-SeafloorCavern_Room8_MapWarps: @ 8535C24
-	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9
-	warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3
-
-SeafloorCavern_Room8_MapEvents:: @ 8535C34
-	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
deleted file mode 100644
index 0ada4ab71..000000000
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room8: @ 8484294
-	.4byte SeafloorCavern_Room8_Layout
-	.4byte SeafloorCavern_Room8_MapEvents
-	.4byte SeafloorCavern_Room8_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 155
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json
new file mode 100644
index 000000000..88ea40e3a
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room8/map.json
@@ -0,0 +1,192 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM8",
+  "name": "SeafloorCavern_Room8",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 6,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_17"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_18"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_19"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_1A"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_1B"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "flag": "FLAG_TEMP_1C"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM9",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc
deleted file mode 100644
index 6ca415e12..000000000
--- a/data/maps/SeafloorCavern_Room9/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SeafloorCavern_Room9_EventObjects: @ 8535C48
-	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
-	object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26
-	object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2
-
-SeafloorCavern_Room9_MapWarps: @ 8535CF0
-	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
-
-SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8
-	coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9
-
-SeafloorCavern_Room9_MapEvents:: @ 8535D08
-	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
deleted file mode 100644
index 4d2be9474..000000000
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room9: @ 84842B0
-	.4byte SeafloorCavern_Room9_Layout
-	.4byte SeafloorCavern_Room9_MapEvents
-	.4byte SeafloorCavern_Room9_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 156
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json
new file mode 100644
index 000000000..f4f7fd336
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/map.json
@@ -0,0 +1,130 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM9",
+  "name": "SeafloorCavern_Room9",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1",
+      "x": 17,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 9,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 9,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+      "x": 8,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F",
+      "x": 8,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SeafloorCavern_Room9_EventScript_291401",
+      "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KYOGRE_2",
+      "x": 17,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 42,
+      "elevation": 3,
+      "var": "VAR_SEAFLOOR_CAVERN_STATE",
+      "var_value": "0",
+      "script": "SeafloorCavern_Room9_EventScript_234DC9"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 6ab802ee4..4c630a1d4 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 4
 	setvar VAR_0x8007, 5
-	applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C
 	waitmovement 0
@@ -15,15 +15,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT
 	closemessage
 	addobject VAR_0x8004
-	applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E
+	applymovement VAR_0x8004, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC
@@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
 	special sub_80B0534
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 150
 	removeobject 7
@@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setvar VAR_0x8007, 5
 	msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT
 	playse SE_PC_LOGIN
-	applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT
 	closemessage
@@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	closemessage
 	playse SE_PC_OFF
 	delay 20
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT
 	closemessage
@@ -103,13 +103,13 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057
 	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E
 	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT
 	playse SE_PIN
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598
+	applymovement VAR_0x8004, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A
+	applymovement VAR_0x8004, Common_Movement_Delay48
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT
 	msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT
@@ -118,8 +118,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT
-	setvar VAR_0x407B, 1
-	setvar VAR_0x405E, 1
+	setvar VAR_ROUTE128_STATE, 1
+	setvar VAR_RAYQUAZA_STATE, 1
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
@@ -133,14 +133,14 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setflag FLAG_SYS_WEATHER_CTRL
 	setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
-	setvar VAR_0x40C6, 2
-	setvar VAR_0x40A2, 1
+	setvar VAR_STEVENS_HOUSE_STATE, 2
+	setvar VAR_SEAFLOOR_CAVERN_STATE, 1
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	warp MAP_ROUTE128, 255, 38, 22
 	waitstate
 	releaseall
diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc
deleted file mode 100644
index ddd6c15ec..000000000
--- a/data/maps/SealedChamber_InnerRoom/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SealedChamber_InnerRoom_MapWarps: @ 8536F00
-	warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM
-
-SealedChamber_InnerRoom_MapBGEvents: @ 8536F08
-	bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8
-	bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255
-	bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F
-	bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239269
-	bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239273
-	bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23927D
-	bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239287
-	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8
-	bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8
-
-SealedChamber_InnerRoom_MapEvents:: @ 8536F74
-	map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents
-
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
deleted file mode 100644
index 5fa5dccc9..000000000
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SealedChamber_InnerRoom: @ 84846A0
-	.4byte SealedChamber_InnerRoom_Layout
-	.4byte SealedChamber_InnerRoom_MapEvents
-	.4byte SealedChamber_InnerRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_MABOROSI
-	.2byte 304
-	.byte MAPSEC_SEALED_CHAMBER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json
new file mode 100644
index 000000000..e0e6097ec
--- /dev/null
+++ b/data/maps/SealedChamber_InnerRoom/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_SEALED_CHAMBER_INNER_ROOM",
+  "name": "SealedChamber_InnerRoom",
+  "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM",
+  "music": "MUS_MABOROSI",
+  "region_map_section": "MAPSEC_SEALED_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SEALED_CHAMBER_OUTER_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_239255"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_23925F"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 13,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_239269"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 13,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_239273"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_23927D"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_239287"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc
deleted file mode 100644
index 3cd1b9714..000000000
--- a/data/maps/SealedChamber_OuterRoom/events.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-SealedChamber_OuterRoom_MapWarps: @ 8536D88
-	warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM
-
-SealedChamber_OuterRoom_MapBGEvents: @ 8536D90
-	bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C
-	bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176
-	bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180
-	bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A
-	bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194
-	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E
-	bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8
-	bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC
-	bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391B2
-	bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391C6
-	bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391D0
-	bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C
-	bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C
-	bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176
-	bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176
-	bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180
-	bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180
-	bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A
-	bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A
-	bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194
-	bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194
-	bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E
-	bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E
-	bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8
-	bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8
-	bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC
-	bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC
-	bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED
-	bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED
-
-SealedChamber_OuterRoom_MapEvents:: @ 8536EEC
-	map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents
-
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
deleted file mode 100644
index 3930e818d..000000000
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SealedChamber_OuterRoom: @ 8484684
-	.4byte SealedChamber_OuterRoom_Layout
-	.4byte SealedChamber_OuterRoom_MapEvents
-	.4byte SealedChamber_OuterRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_MABOROSI
-	.2byte 284
-	.byte MAPSEC_SEALED_CHAMBER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json
new file mode 100644
index 000000000..cc9c32272
--- /dev/null
+++ b/data/maps/SealedChamber_OuterRoom/map.json
@@ -0,0 +1,261 @@
+{
+  "id": "MAP_SEALED_CHAMBER_OUTER_ROOM",
+  "name": "SealedChamber_OuterRoom",
+  "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM",
+  "music": "MUS_MABOROSI",
+  "region_map_section": "MAPSEC_SEALED_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SEALED_CHAMBER_INNER_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239176"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239180"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239194"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391B2"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391C6"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391D0"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239176"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239176"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239180"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239180"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239194"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_239194"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 9,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 15,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391ED"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 2,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SealedChamber_OuterRoom_EventScript_2391ED"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 4b461a684..71e6426fe 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -1,7 +1,7 @@
 SealedChamber_OuterRoom_MapScripts:: @ 8239106
-	map_script 5, SealedChamber_OuterRoom_MapScript1_239116
-	map_script 3, SealedChamber_OuterRoom_MapScript1_239127
-	map_script 1, SealedChamber_OuterRoom_MapScript1_23912B
+	map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116
+	map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_239127
+	map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B
 	.byte 0
 
 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc
deleted file mode 100644
index 95e52b889..000000000
--- a/data/maps/SecretBase_BlueCave1/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave1_EventObjects: @ 8537BEC
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BlueCave1_MapWarps: @ 8537D54
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_BlueCave1_MapEvents:: @ 8537D5C
-	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
deleted file mode 100644
index 60eeeab32..000000000
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave1: @ 8484AC8
-	.4byte SecretBase_BlueCave1_Layout
-	.4byte SecretBase_BlueCave1_MapEvents
-	.4byte SecretBase_BlueCave1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 199
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json
new file mode 100644
index 000000000..8f255972f
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave1/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BLUE_CAVE1",
+  "name": "SecretBase_BlueCave1",
+  "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BlueCave1_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc
deleted file mode 100644
index 62c4b8dcd..000000000
--- a/data/maps/SecretBase_BlueCave2/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave2_EventObjects: @ 8538504
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BlueCave2_MapWarps: @ 853866C
-	warp_def 7, 5, 0, 126, MAP_NONE
-
-SecretBase_BlueCave2_MapEvents:: @ 8538674
-	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
deleted file mode 100644
index 348a5cd02..000000000
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave2: @ 8484B70
-	.4byte SecretBase_BlueCave2_Layout
-	.4byte SecretBase_BlueCave2_MapEvents
-	.4byte SecretBase_BlueCave2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 205
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json
new file mode 100644
index 000000000..ec5d74d2f
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave2/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BLUE_CAVE2",
+  "name": "SecretBase_BlueCave2",
+  "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BlueCave2_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc
deleted file mode 100644
index 14c7460ad..000000000
--- a/data/maps/SecretBase_BlueCave3/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave3_EventObjects: @ 8538E1C
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BlueCave3_MapWarps: @ 8538F84
-	warp_def 4, 15, 0, 126, MAP_NONE
-
-SecretBase_BlueCave3_MapEvents:: @ 8538F8C
-	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
deleted file mode 100644
index 26ab5ef93..000000000
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave3: @ 8484C18
-	.4byte SecretBase_BlueCave3_Layout
-	.4byte SecretBase_BlueCave3_MapEvents
-	.4byte SecretBase_BlueCave3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 211
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json
new file mode 100644
index 000000000..07be1610a
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave3/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BLUE_CAVE3",
+  "name": "SecretBase_BlueCave3",
+  "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BlueCave3_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc
deleted file mode 100644
index 1d047cd42..000000000
--- a/data/maps/SecretBase_BlueCave4/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave4_EventObjects: @ 8539734
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BlueCave4_MapWarps: @ 853989C
-	warp_def 4, 15, 0, 126, MAP_NONE
-
-SecretBase_BlueCave4_MapEvents:: @ 85398A4
-	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
deleted file mode 100644
index 5e253d51e..000000000
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BlueCave4: @ 8484CC0
-	.4byte SecretBase_BlueCave4_Layout
-	.4byte SecretBase_BlueCave4_MapEvents
-	.4byte SecretBase_BlueCave4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 217
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json
new file mode 100644
index 000000000..45762d619
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave4/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BLUE_CAVE4",
+  "name": "SecretBase_BlueCave4",
+  "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BlueCave4_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc
deleted file mode 100644
index 43d144535..000000000
--- a/data/maps/SecretBase_BrownCave1/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave1_EventObjects: @ 8537A68
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BrownCave1_MapWarps: @ 8537BD0
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_BrownCave1_MapEvents:: @ 8537BD8
-	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
deleted file mode 100644
index ab531bf5c..000000000
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave1: @ 8484AAC
-	.4byte SecretBase_BrownCave1_Layout
-	.4byte SecretBase_BrownCave1_MapEvents
-	.4byte SecretBase_BrownCave1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 198
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json
new file mode 100644
index 000000000..679564ba7
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave1/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BROWN_CAVE1",
+  "name": "SecretBase_BrownCave1",
+  "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BrownCave1_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc
deleted file mode 100644
index 09bb03327..000000000
--- a/data/maps/SecretBase_BrownCave2/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave2_EventObjects: @ 8538380
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BrownCave2_MapWarps: @ 85384E8
-	warp_def 1, 7, 0, 126, MAP_NONE
-
-SecretBase_BrownCave2_MapEvents:: @ 85384F0
-	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
deleted file mode 100644
index 464bcd059..000000000
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave2: @ 8484B54
-	.4byte SecretBase_BrownCave2_Layout
-	.4byte SecretBase_BrownCave2_MapEvents
-	.4byte SecretBase_BrownCave2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 204
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json
new file mode 100644
index 000000000..35d5be558
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave2/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BROWN_CAVE2",
+  "name": "SecretBase_BrownCave2",
+  "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BrownCave2_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc
deleted file mode 100644
index 12ec86587..000000000
--- a/data/maps/SecretBase_BrownCave3/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave3_EventObjects: @ 8538C98
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BrownCave3_MapWarps: @ 8538E00
-	warp_def 11, 9, 0, 126, MAP_NONE
-
-SecretBase_BrownCave3_MapEvents:: @ 8538E08
-	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
deleted file mode 100644
index 923b2c4be..000000000
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave3: @ 8484BFC
-	.4byte SecretBase_BrownCave3_Layout
-	.4byte SecretBase_BrownCave3_MapEvents
-	.4byte SecretBase_BrownCave3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 210
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json
new file mode 100644
index 000000000..5424ee85e
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave3/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BROWN_CAVE3",
+  "name": "SecretBase_BrownCave3",
+  "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 1,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BrownCave3_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc
deleted file mode 100644
index 15fab00be..000000000
--- a/data/maps/SecretBase_BrownCave4/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave4_EventObjects: @ 85395B0
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_BrownCave4_MapWarps: @ 8539718
-	warp_def 2, 8, 0, 126, MAP_NONE
-
-SecretBase_BrownCave4_MapEvents:: @ 8539720
-	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
deleted file mode 100644
index 6d61f06a7..000000000
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_BrownCave4: @ 8484CA4
-	.4byte SecretBase_BrownCave4_Layout
-	.4byte SecretBase_BrownCave4_MapEvents
-	.4byte SecretBase_BrownCave4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 216
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json
new file mode 100644
index 000000000..de3b4709e
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave4/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_BROWN_CAVE4",
+  "name": "SecretBase_BrownCave4",
+  "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_BrownCave4_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc
deleted file mode 100644
index e0d718068..000000000
--- a/data/maps/SecretBase_RedCave1/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave1_EventObjects: @ 85378E4
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_RedCave1_MapWarps: @ 8537A4C
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_RedCave1_MapEvents:: @ 8537A54
-	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
deleted file mode 100644
index 82fc8c4e3..000000000
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave1: @ 8484A90
-	.4byte SecretBase_RedCave1_Layout
-	.4byte SecretBase_RedCave1_MapEvents
-	.4byte SecretBase_RedCave1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 197
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json
new file mode 100644
index 000000000..eac0366c1
--- /dev/null
+++ b/data/maps/SecretBase_RedCave1/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_RED_CAVE1",
+  "name": "SecretBase_RedCave1",
+  "layout": "LAYOUT_SECRET_BASE_RED_CAVE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_RedCave1_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc
deleted file mode 100644
index 365e3f353..000000000
--- a/data/maps/SecretBase_RedCave2/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave2_EventObjects: @ 85381FC
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_RedCave2_MapWarps: @ 8538364
-	warp_def 3, 14, 0, 126, MAP_NONE
-
-SecretBase_RedCave2_MapEvents:: @ 853836C
-	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
deleted file mode 100644
index e4a2176d7..000000000
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave2: @ 8484B38
-	.4byte SecretBase_RedCave2_Layout
-	.4byte SecretBase_RedCave2_MapEvents
-	.4byte SecretBase_RedCave2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 203
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json
new file mode 100644
index 000000000..bcbfbd0f2
--- /dev/null
+++ b/data/maps/SecretBase_RedCave2/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_RED_CAVE2",
+  "name": "SecretBase_RedCave2",
+  "layout": "LAYOUT_SECRET_BASE_RED_CAVE2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_RedCave2_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc
deleted file mode 100644
index 16e14d49f..000000000
--- a/data/maps/SecretBase_RedCave3/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave3_EventObjects: @ 8538B14
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_RedCave3_MapWarps: @ 8538C7C
-	warp_def 3, 6, 0, 126, MAP_NONE
-
-SecretBase_RedCave3_MapEvents:: @ 8538C84
-	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
deleted file mode 100644
index 9317921e2..000000000
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave3: @ 8484BE0
-	.4byte SecretBase_RedCave3_Layout
-	.4byte SecretBase_RedCave3_MapEvents
-	.4byte SecretBase_RedCave3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 209
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json
new file mode 100644
index 000000000..00c14d3f3
--- /dev/null
+++ b/data/maps/SecretBase_RedCave3/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_RED_CAVE3",
+  "name": "SecretBase_RedCave3",
+  "layout": "LAYOUT_SECRET_BASE_RED_CAVE3",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_RedCave3_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc
deleted file mode 100644
index eaf227506..000000000
--- a/data/maps/SecretBase_RedCave4/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave4_EventObjects: @ 853942C
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_RedCave4_MapWarps: @ 8539594
-	warp_def 2, 12, 0, 126, MAP_NONE
-
-SecretBase_RedCave4_MapEvents:: @ 853959C
-	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
deleted file mode 100644
index 62fd094a4..000000000
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_RedCave4: @ 8484C88
-	.4byte SecretBase_RedCave4_Layout
-	.4byte SecretBase_RedCave4_MapEvents
-	.4byte SecretBase_RedCave4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 215
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json
new file mode 100644
index 000000000..b54974c4c
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_RED_CAVE4",
+  "name": "SecretBase_RedCave4",
+  "layout": "LAYOUT_SECRET_BASE_RED_CAVE4",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_RedCave4_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc
deleted file mode 100644
index 07eb2e1bd..000000000
--- a/data/maps/SecretBase_Shrub1/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub1_EventObjects: @ 8538078
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Shrub1_MapWarps: @ 85381E0
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_Shrub1_MapEvents:: @ 85381E8
-	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
deleted file mode 100644
index 4807cc485..000000000
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub1: @ 8484B1C
-	.4byte SecretBase_Shrub1_Layout
-	.4byte SecretBase_Shrub1_MapEvents
-	.4byte SecretBase_Shrub1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 202
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json
new file mode 100644
index 000000000..38cb8997f
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_SHRUB1",
+  "name": "SecretBase_Shrub1",
+  "layout": "LAYOUT_SECRET_BASE_SHRUB1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Shrub1_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc
deleted file mode 100644
index 385500c5f..000000000
--- a/data/maps/SecretBase_Shrub2/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub2_EventObjects: @ 8538990
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Shrub2_MapWarps: @ 8538AF8
-	warp_def 7, 5, 0, 126, MAP_NONE
-
-SecretBase_Shrub2_MapEvents:: @ 8538B00
-	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
deleted file mode 100644
index 56df5fd2f..000000000
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub2: @ 8484BC4
-	.4byte SecretBase_Shrub2_Layout
-	.4byte SecretBase_Shrub2_MapEvents
-	.4byte SecretBase_Shrub2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 208
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json
new file mode 100644
index 000000000..728226fdc
--- /dev/null
+++ b/data/maps/SecretBase_Shrub2/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_SHRUB2",
+  "name": "SecretBase_Shrub2",
+  "layout": "LAYOUT_SECRET_BASE_SHRUB2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Shrub2_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc
deleted file mode 100644
index 8cc399fed..000000000
--- a/data/maps/SecretBase_Shrub3/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub3_EventObjects: @ 85392A8
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Shrub3_MapWarps: @ 8539410
-	warp_def 6, 9, 0, 126, MAP_NONE
-
-SecretBase_Shrub3_MapEvents:: @ 8539418
-	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
deleted file mode 100644
index 3b5ade8f3..000000000
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub3: @ 8484C6C
-	.4byte SecretBase_Shrub3_Layout
-	.4byte SecretBase_Shrub3_MapEvents
-	.4byte SecretBase_Shrub3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 214
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json
new file mode 100644
index 000000000..a3c5cdf05
--- /dev/null
+++ b/data/maps/SecretBase_Shrub3/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_SHRUB3",
+  "name": "SecretBase_Shrub3",
+  "layout": "LAYOUT_SECRET_BASE_SHRUB3",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Shrub3_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc
deleted file mode 100644
index 16dfd4ba1..000000000
--- a/data/maps/SecretBase_Shrub4/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub4_EventObjects: @ 8539BC0
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Shrub4_MapWarps: @ 8539D28
-	warp_def 11, 8, 0, 126, MAP_NONE
-
-SecretBase_Shrub4_MapEvents:: @ 8539D30
-	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
deleted file mode 100644
index 816b963cb..000000000
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Shrub4: @ 8484D14
-	.4byte SecretBase_Shrub4_Layout
-	.4byte SecretBase_Shrub4_MapEvents
-	.4byte SecretBase_Shrub4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 220
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json
new file mode 100644
index 000000000..9977f6eeb
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_SHRUB4",
+  "name": "SecretBase_Shrub4",
+  "layout": "LAYOUT_SECRET_BASE_SHRUB4",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Shrub4_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc
deleted file mode 100644
index 8c7c05e6e..000000000
--- a/data/maps/SecretBase_Tree1/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree1_EventObjects: @ 8537EF4
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Tree1_MapWarps: @ 853805C
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_Tree1_MapEvents:: @ 8538064
-	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
deleted file mode 100644
index f1ed545a5..000000000
--- a/data/maps/SecretBase_Tree1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree1: @ 8484B00
-	.4byte SecretBase_Tree1_Layout
-	.4byte SecretBase_Tree1_MapEvents
-	.4byte SecretBase_Tree1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 201
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json
new file mode 100644
index 000000000..5d3309cc7
--- /dev/null
+++ b/data/maps/SecretBase_Tree1/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_TREE1",
+  "name": "SecretBase_Tree1",
+  "layout": "LAYOUT_SECRET_BASE_TREE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Tree1_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc
deleted file mode 100644
index e6b5c627b..000000000
--- a/data/maps/SecretBase_Tree2/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree2_EventObjects: @ 853880C
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Tree2_MapWarps: @ 8538974
-	warp_def 3, 14, 0, 126, MAP_NONE
-
-SecretBase_Tree2_MapEvents:: @ 853897C
-	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
deleted file mode 100644
index 2d8c2652c..000000000
--- a/data/maps/SecretBase_Tree2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree2: @ 8484BA8
-	.4byte SecretBase_Tree2_Layout
-	.4byte SecretBase_Tree2_MapEvents
-	.4byte SecretBase_Tree2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 207
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json
new file mode 100644
index 000000000..67deb9a10
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_TREE2",
+  "name": "SecretBase_Tree2",
+  "layout": "LAYOUT_SECRET_BASE_TREE2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Tree2_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc
deleted file mode 100644
index 921c4f102..000000000
--- a/data/maps/SecretBase_Tree3/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree3_EventObjects: @ 8539124
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Tree3_MapWarps: @ 853928C
-	warp_def 8, 6, 0, 126, MAP_NONE
-
-SecretBase_Tree3_MapEvents:: @ 8539294
-	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
deleted file mode 100644
index e4f703d21..000000000
--- a/data/maps/SecretBase_Tree3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree3: @ 8484C50
-	.4byte SecretBase_Tree3_Layout
-	.4byte SecretBase_Tree3_MapEvents
-	.4byte SecretBase_Tree3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 213
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json
new file mode 100644
index 000000000..6e4494836
--- /dev/null
+++ b/data/maps/SecretBase_Tree3/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_TREE3",
+  "name": "SecretBase_Tree3",
+  "layout": "LAYOUT_SECRET_BASE_TREE3",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Tree3_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc
deleted file mode 100644
index ee2495e79..000000000
--- a/data/maps/SecretBase_Tree4/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree4_EventObjects: @ 8539A3C
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_Tree4_MapWarps: @ 8539BA4
-	warp_def 7, 12, 0, 126, MAP_NONE
-
-SecretBase_Tree4_MapEvents:: @ 8539BAC
-	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
deleted file mode 100644
index 7cf8ef024..000000000
--- a/data/maps/SecretBase_Tree4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_Tree4: @ 8484CF8
-	.4byte SecretBase_Tree4_Layout
-	.4byte SecretBase_Tree4_MapEvents
-	.4byte SecretBase_Tree4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 219
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json
new file mode 100644
index 000000000..465b1d50b
--- /dev/null
+++ b/data/maps/SecretBase_Tree4/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_TREE4",
+  "name": "SecretBase_Tree4",
+  "layout": "LAYOUT_SECRET_BASE_TREE4",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_Tree4_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc
deleted file mode 100644
index 6beae3454..000000000
--- a/data/maps/SecretBase_YellowCave1/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave1_EventObjects: @ 8537D70
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_YellowCave1_MapWarps: @ 8537ED8
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_YellowCave1_MapEvents:: @ 8537EE0
-	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
deleted file mode 100644
index 9bc1b071e..000000000
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave1: @ 8484AE4
-	.4byte SecretBase_YellowCave1_Layout
-	.4byte SecretBase_YellowCave1_MapEvents
-	.4byte SecretBase_YellowCave1_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 200
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json
new file mode 100644
index 000000000..a14826a3a
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave1/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_YELLOW_CAVE1",
+  "name": "SecretBase_YellowCave1",
+  "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_YellowCave1_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc
deleted file mode 100644
index 9378718c4..000000000
--- a/data/maps/SecretBase_YellowCave2/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave2_EventObjects: @ 8538688
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_YellowCave2_MapWarps: @ 85387F0
-	warp_def 12, 7, 0, 126, MAP_NONE
-
-SecretBase_YellowCave2_MapEvents:: @ 85387F8
-	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
deleted file mode 100644
index 60c0f49f0..000000000
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave2: @ 8484B8C
-	.4byte SecretBase_YellowCave2_Layout
-	.4byte SecretBase_YellowCave2_MapEvents
-	.4byte SecretBase_YellowCave2_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 206
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json
new file mode 100644
index 000000000..97b6baa22
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave2/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_YELLOW_CAVE2",
+  "name": "SecretBase_YellowCave2",
+  "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_YellowCave2_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 12,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc
deleted file mode 100644
index 3a60b042b..000000000
--- a/data/maps/SecretBase_YellowCave3/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave3_EventObjects: @ 8538FA0
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_YellowCave3_MapWarps: @ 8539108
-	warp_def 5, 9, 0, 126, MAP_NONE
-
-SecretBase_YellowCave3_MapEvents:: @ 8539110
-	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
deleted file mode 100644
index b82555cf4..000000000
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave3: @ 8484C34
-	.4byte SecretBase_YellowCave3_Layout
-	.4byte SecretBase_YellowCave3_MapEvents
-	.4byte SecretBase_YellowCave3_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 212
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json
new file mode 100644
index 000000000..581a3479f
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave3/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_YELLOW_CAVE3",
+  "name": "SecretBase_YellowCave3",
+  "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_YellowCave3_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc
deleted file mode 100644
index 13757dbef..000000000
--- a/data/maps/SecretBase_YellowCave4/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave4_EventObjects: @ 85398B8
-	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
-	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
-	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
-	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
-	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
-	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
-	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
-	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
-	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
-	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
-	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
-	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_YellowCave4_MapWarps: @ 8539A20
-	warp_def 6, 12, 0, 126, MAP_NONE
-
-SecretBase_YellowCave4_MapEvents:: @ 8539A28
-	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
deleted file mode 100644
index d7056f380..000000000
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave4: @ 8484CDC
-	.4byte SecretBase_YellowCave4_Layout
-	.4byte SecretBase_YellowCave4_MapEvents
-	.4byte SecretBase_YellowCave4_MapScripts
-	.4byte 0x0
-	.2byte MUS_MACHI_S3
-	.2byte 218
-	.byte MAPSEC_SECRET_BASE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_SECRET_BASE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json
new file mode 100644
index 000000000..3dfa7cc08
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/map.json
@@ -0,0 +1,224 @@
+{
+  "id": "MAP_SECRET_BASE_YELLOW_CAVE4",
+  "name": "SecretBase_YellowCave4",
+  "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4",
+  "music": "MUS_MACHI_S3",
+  "region_map_section": "MAPSEC_SECRET_BASE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_SECRET_BASE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+      "x": 9,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SecretBase_YellowCave4_EventScript_275D64",
+      "flag": "FLAG_DECORATION_0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 0,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 0,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 0,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 0,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 0,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 1,
+      "y": 0,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+      "x": 1,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_9"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+      "x": 1,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_10"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_DECORATION_14"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 126
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
index 32da39388..805d7e299 100644
--- a/data/maps/SecretBase_YellowCave4/scripts.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
@@ -1,12 +1,12 @@
 SecretBase_YellowCave4_MapScripts:: @ 823B483
-	map_script 4, SecretBase_RedCave1_MapScript2_23B498
-	map_script 3, SecretBase_RedCave1_MapScript1_23B4A2
-	map_script 2, SecretBase_RedCave1_MapScript2_23B4AE
-	map_script 5, SecretBase_RedCave1_MapScript1_23B4B8
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498
+	map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE
+	map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8
 	.byte 0
 
 SecretBase_RedCave1_MapScript2_23B498: @ 823B498
-	map_script_2 VAR_0x4089, 0, EventScript_275D0C
+	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C
 	.2byte 0
 
 SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
@@ -16,7 +16,7 @@ SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
 	end
 
 SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE
-	map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81
+	map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_RedCave1_EventScript_275B81
 	.2byte 0
 
 SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
deleted file mode 100644
index e04abe693..000000000
--- a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-ShoalCave_HighTideEntranceRoom_MapEvents:: @ 853644C
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
deleted file mode 100644
index c4d7d39e9..000000000
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_HighTideEntranceRoom: @ 8484438
-	.4byte ShoalCave_HighTideEntranceRoom_Layout
-	.4byte ShoalCave_HighTideEntranceRoom_MapEvents
-	.4byte ShoalCave_HighTideEntranceRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 168
-	.byte MAPSEC_SHOAL_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json
new file mode 100644
index 000000000..046fe4966
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM",
+  "name": "ShoalCave_HighTideEntranceRoom",
+  "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_SHOAL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
deleted file mode 100644
index 20d59a56f..000000000
--- a/data/maps/ShoalCave_HighTideInnerRoom/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-ShoalCave_HighTideInnerRoom_MapEvents:: @ 8536460
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
deleted file mode 100644
index f9983a781..000000000
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_HighTideInnerRoom: @ 8484454
-	.4byte ShoalCave_HighTideInnerRoom_Layout
-	.4byte ShoalCave_HighTideInnerRoom_MapEvents
-	.4byte ShoalCave_HighTideInnerRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 169
-	.byte MAPSEC_SHOAL_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json
new file mode 100644
index 000000000..ff2231d67
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM",
+  "name": "ShoalCave_HighTideInnerRoom",
+  "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_SHOAL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
deleted file mode 100644
index 899ad3eb8..000000000
--- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL
-	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0
-
-ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
-	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:: @ 85362CC
-	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
deleted file mode 100644
index 656df8188..000000000
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideEntranceRoom: @ 84843C8
-	.4byte ShoalCave_LowTideEntranceRoom_Layout
-	.4byte ShoalCave_LowTideEntranceRoom_MapEvents
-	.4byte ShoalCave_LowTideEntranceRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 164
-	.byte MAPSEC_SHOAL_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
new file mode 100644
index 000000000..1ebb9f555
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
@@ -0,0 +1,76 @@
+{
+  "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+  "name": "ShoalCave_LowTideEntranceRoom",
+  "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_SHOAL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 30,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0",
+      "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 18,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 20,
+      "y": 30,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE125",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 27,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index c596ba687..218cabc67 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA
-	map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0
+	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0
 	.byte 0
 
 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0
@@ -8,17 +8,17 @@ ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0
 	goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5
 
 ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1
-	setmaplayoutindex 168
+	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5
-	setmaplayoutindex 164
+	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9
 	checkitem ITEM_SHOAL_SALT, 4
 	compare VAR_RESULT, 0
@@ -39,7 +39,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9
 	takeitem ITEM_SHOAL_SHELL, 4
 	giveitem_std ITEM_SHELL_BELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	release
diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc
deleted file mode 100644
index 99ab13475..000000000
--- a/data/maps/ShoalCave_LowTideIceRoom/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-ShoalCave_LowTideIceRoom_EventObjects: @ 8537100
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE
-
-ShoalCave_LowTideIceRoom_MapWarps: @ 8537130
-	warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-
-ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138
-	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
deleted file mode 100644
index 58669c0c6..000000000
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideIceRoom: @ 84847D4
-	.4byte ShoalCave_LowTideIceRoom_Layout
-	.4byte ShoalCave_LowTideIceRoom_MapEvents
-	.4byte ShoalCave_LowTideIceRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 328
-	.byte MAPSEC_SHOAL_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json
new file mode 100644
index 000000000..dffef7da9
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideIceRoom/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
+  "name": "ShoalCave_LowTideIceRoom",
+  "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_SHOAL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 12,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideIceRoom_EventScript_2913E7",
+      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 12,
+      "y": 21,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideIceRoom_EventScript_2913F4",
+      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
deleted file mode 100644
index 4f446148e..000000000
--- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY
-
-ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8
-	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: @ 8536338
-	bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C
-	bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8
-	bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA
-	bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FF6
-	bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028
-	bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A
-
-ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380
-	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
deleted file mode 100644
index 7f21d0a22..000000000
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideInnerRoom: @ 84843E4
-	.4byte ShoalCave_LowTideInnerRoom_Layout
-	.4byte ShoalCave_LowTideInnerRoom_MapEvents
-	.4byte ShoalCave_LowTideInnerRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 165
-	.byte MAPSEC_SHOAL_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json
new file mode 100644
index 000000000..04e4ec67f
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json
@@ -0,0 +1,140 @@
+{
+  "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+  "name": "ShoalCave_LowTideInnerRoom",
+  "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_SHOAL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 26,
+      "y": 14,
+      "elevation": 5,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD",
+      "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 34,
+      "y": 29,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 38,
+      "y": 15,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 42,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 19,
+      "y": 14,
+      "elevation": 4,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 19,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 30,
+      "y": 25,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 14,
+      "y": 33,
+      "elevation": 5,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 40,
+      "y": 33,
+      "elevation": 5,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 31,
+      "y": 8,
+      "elevation": 5,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 26,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8"
+    },
+    {
+      "type": "sign",
+      "x": 41,
+      "y": 20,
+      "elevation": 5,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA"
+    },
+    {
+      "type": "sign",
+      "x": 41,
+      "y": 10,
+      "elevation": 5,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_237028"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 13,
+      "elevation": 5,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 65bdd73b8..f1a29b28a 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -1,6 +1,6 @@
 ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5
-	map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_236F16
-	map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_236F00
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16
+	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_236F00
 	.byte 0
 
 ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00
@@ -8,11 +8,11 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F12
 
 ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E
-	setmaplayoutindex 169
+	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12
-	setmaplayoutindex 165
+	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
 	end
 
 ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16
@@ -64,7 +64,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 20, 859, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_1
@@ -81,7 +81,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 10, 859, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_2
@@ -93,7 +93,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 6, 9, 859, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_3
@@ -105,7 +105,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 16, 13, 859, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_4
@@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 31, 8, 858, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_1
@@ -134,7 +134,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 14, 26, 858, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_2
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
deleted file mode 100644
index b487edcd7..000000000
--- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0
-
-ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C
-	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: @ 853642C
-	bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176
-
-ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438
-	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
deleted file mode 100644
index 21ea185ea..000000000
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideLowerRoom: @ 848441C
-	.4byte ShoalCave_LowTideLowerRoom_Layout
-	.4byte ShoalCave_LowTideLowerRoom_MapEvents
-	.4byte ShoalCave_LowTideLowerRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 167
-	.byte MAPSEC_SHOAL_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json
new file mode 100644
index 000000000..92f0fd11a
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json
@@ -0,0 +1,85 @@
+{
+  "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+  "name": "ShoalCave_LowTideLowerRoom",
+  "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_SHOAL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 25,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 19,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 28,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 2,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideLowerRoom_EventScript_237176"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index 60a6039be..8492afe5b 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156
-	map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_23715C
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C
 	.byte 0
 
 ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C
@@ -19,7 +19,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 18, 2, 858, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_4
@@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2
 	msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT
 	giveitem_std ITEM_FOCUS_BAND
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FOCUS_BAND
 	release
 	end
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
deleted file mode 100644
index 6dbf50eb5..000000000
--- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL
-
-ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC
-	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: @ 85363BC
-	bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A
-
-ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8
-	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
deleted file mode 100644
index 7d7089f85..000000000
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideStairsRoom: @ 8484400
-	.4byte ShoalCave_LowTideStairsRoom_Layout
-	.4byte ShoalCave_LowTideStairsRoom_MapEvents
-	.4byte ShoalCave_LowTideStairsRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 166
-	.byte MAPSEC_SHOAL_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json
new file mode 100644
index 000000000..239effc74
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json
@@ -0,0 +1,58 @@
+{
+  "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+  "name": "ShoalCave_LowTideStairsRoom",
+  "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_SHOAL_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 13,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "ShoalCave_LowTideStairsRoom_EventScript_2913DA",
+      "flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 11,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index 40275d809..74b653a5f 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA
-	map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_237100
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100
 	.byte 0
 
 ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100
@@ -19,7 +19,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 11, 11, 858, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_3
diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc
deleted file mode 100644
index b43b505bd..000000000
--- a/data/maps/SingleBattleColosseum/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SingleBattleColosseum_EventObjects: @ 8539D44
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0
-
-SingleBattleColosseum_MapWarps: @ 8539D5C
-	warp_def 6, 8, 3, 127, MAP_NONE
-	warp_def 7, 8, 3, 127, MAP_NONE
-
-SingleBattleColosseum_MapCoordEvents: @ 8539D6C
-	coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374
-	coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E
-
-SingleBattleColosseum_MapEvents:: @ 8539D8C
-	map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
-
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
deleted file mode 100644
index ac5f23b1e..000000000
--- a/data/maps/SingleBattleColosseum/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SingleBattleColosseum: @ 8484D30
-	.4byte SingleBattleColosseum_Layout
-	.4byte SingleBattleColosseum_MapEvents
-	.4byte SingleBattleColosseum_MapScripts
-	.4byte 0x0
-	.2byte MUS_RAINBOW
-	.2byte 221
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json
new file mode 100644
index 000000000..a7ad50f1b
--- /dev/null
+++ b/data/maps/SingleBattleColosseum/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_SINGLE_BATTLE_COLOSSEUM",
+  "name": "SingleBattleColosseum",
+  "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
+  "music": "MUS_RAINBOW",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SingleBattleColosseum_EventScript_2774A6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_SingleBattleColosseum_PlayerSpot0"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_SingleBattleColosseum_PlayerSpot1"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc
deleted file mode 100644
index 59ac1aac0..000000000
--- a/data/maps/SkyPillar_1F/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SkyPillar_1F_MapWarps: @ 8537058
-	warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE
-	warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE
-	warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F
-
-SkyPillar_1F_MapEvents:: @ 8537070
-	map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
deleted file mode 100644
index 9f76317d8..000000000
--- a/data/maps/SkyPillar_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_1F: @ 8484764
-	.4byte SkyPillar_1F_Layout
-	.4byte SkyPillar_1F_MapEvents
-	.4byte SkyPillar_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 322
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json
new file mode 100644
index 000000000..3d1fbf51a
--- /dev/null
+++ b/data/maps/SkyPillar_1F/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SKY_PILLAR_1F",
+  "name": "SkyPillar_1F",
+  "layout": "LAYOUT_SKY_PILLAR_1F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_OUTSIDE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_OUTSIDE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc
index 3d76a9fe2..18ec43ad6 100644
--- a/data/maps/SkyPillar_1F/scripts.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
@@ -1,13 +1,13 @@
 SkyPillar_1F_MapScripts:: @ 8239615
-	map_script 3, SkyPillar_1F_MapScript1_23961B
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_23961B
 	.byte 0
 
 SkyPillar_1F_MapScript1_23961B: @ 823961B
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_1F_EventScript_239627
 	end
 
 SkyPillar_1F_EventScript_239627:: @ 8239627
-	setmaplayoutindex 433
+	setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc
deleted file mode 100644
index 780db9ccc..000000000
--- a/data/maps/SkyPillar_2F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SkyPillar_2F_MapWarps: @ 8537084
-	warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F
-	warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F
-
-SkyPillar_2F_MapEvents:: @ 8537094
-	map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
deleted file mode 100644
index 833510702..000000000
--- a/data/maps/SkyPillar_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_2F: @ 8484780
-	.4byte SkyPillar_2F_Layout
-	.4byte SkyPillar_2F_MapEvents
-	.4byte SkyPillar_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 323
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json
new file mode 100644
index 000000000..1e543db40
--- /dev/null
+++ b/data/maps/SkyPillar_2F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_SKY_PILLAR_2F",
+  "name": "SkyPillar_2F",
+  "layout": "LAYOUT_SKY_PILLAR_2F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index 0474a829c..9059bd246 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -1,17 +1,17 @@
 SkyPillar_2F_MapScripts:: @ 823962B
-	map_script 2, SkyPillar_2F_MapScript2_2A8327
-	map_script 3, SkyPillar_2F_MapScript1_23963B
-	map_script 5, SkyPillar_2F_MapScript1_239650
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_23963B
+	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650
 	.byte 0
 
 SkyPillar_2F_MapScript1_23963B: @ 823963B
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_2F_EventScript_23964C
 	copyvar VAR_ICE_STEP_COUNT, 0x1
 	end
 
 SkyPillar_2F_EventScript_23964C:: @ 823964C
-	setmaplayoutindex 434
+	setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN
 	return
 
 SkyPillar_2F_MapScript1_239650: @ 8239650
diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc
deleted file mode 100644
index 2e7697395..000000000
--- a/data/maps/SkyPillar_3F/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SkyPillar_3F_MapWarps: @ 85370A8
-	warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F
-	warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F
-	warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F
-
-SkyPillar_3F_MapEvents:: @ 85370C0
-	map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
deleted file mode 100644
index 5381079f6..000000000
--- a/data/maps/SkyPillar_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_3F: @ 848479C
-	.4byte SkyPillar_3F_Layout
-	.4byte SkyPillar_3F_MapEvents
-	.4byte SkyPillar_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 324
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json
new file mode 100644
index 000000000..56a85256f
--- /dev/null
+++ b/data/maps/SkyPillar_3F/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SKY_PILLAR_3F",
+  "name": "SkyPillar_3F",
+  "layout": "LAYOUT_SKY_PILLAR_3F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 11,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_4F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc
index 777d53b62..ba6a5128d 100644
--- a/data/maps/SkyPillar_3F/scripts.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
@@ -1,13 +1,13 @@
 SkyPillar_3F_MapScripts:: @ 823965B
-	map_script 3, SkyPillar_3F_MapScript1_239661
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_239661
 	.byte 0
 
 SkyPillar_3F_MapScript1_239661: @ 8239661
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_3F_EventScript_23966D
 	end
 
 SkyPillar_3F_EventScript_23966D:: @ 823966D
-	setmaplayoutindex 435
+	setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc
deleted file mode 100644
index 248e36f95..000000000
--- a/data/maps/SkyPillar_4F/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SkyPillar_4F_MapWarps: @ 85370D4
-	warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F
-	warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F
-	warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F
-
-SkyPillar_4F_MapEvents:: @ 85370EC
-	map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
deleted file mode 100644
index ff91215e0..000000000
--- a/data/maps/SkyPillar_4F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_4F: @ 84847B8
-	.4byte SkyPillar_4F_Layout
-	.4byte SkyPillar_4F_MapEvents
-	.4byte SkyPillar_4F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 325
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json
new file mode 100644
index 000000000..babc00f6c
--- /dev/null
+++ b/data/maps/SkyPillar_4F/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SKY_PILLAR_4F",
+  "name": "SkyPillar_4F",
+  "layout": "LAYOUT_SKY_PILLAR_4F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_3F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_5F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
index 262492169..355530fdc 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -1,17 +1,17 @@
 SkyPillar_4F_MapScripts:: @ 8239671
-	map_script 2, SkyPillar_4F_MapScript2_2A8327
-	map_script 3, SkyPillar_4F_MapScript1_239681
-	map_script 5, SkyPillar_4F_MapScript1_239696
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_239681
+	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696
 	.byte 0
 
 SkyPillar_4F_MapScript1_239681: @ 8239681
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_4F_EventScript_239692
 	copyvar VAR_ICE_STEP_COUNT, 0x1
 	end
 
 SkyPillar_4F_EventScript_239692:: @ 8239692
-	setmaplayoutindex 436
+	setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN
 	return
 
 SkyPillar_4F_MapScript1_239696: @ 8239696
diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc
deleted file mode 100644
index c0acb14c0..000000000
--- a/data/maps/SkyPillar_5F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SkyPillar_5F_MapWarps: @ 853714C
-	warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F
-	warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP
-
-SkyPillar_5F_MapEvents:: @ 853715C
-	map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
deleted file mode 100644
index 06618c766..000000000
--- a/data/maps/SkyPillar_5F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_5F: @ 84847F0
-	.4byte SkyPillar_5F_Layout
-	.4byte SkyPillar_5F_MapEvents
-	.4byte SkyPillar_5F_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 330
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json
new file mode 100644
index 000000000..233e86dfe
--- /dev/null
+++ b/data/maps/SkyPillar_5F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_SKY_PILLAR_5F",
+  "name": "SkyPillar_5F",
+  "layout": "LAYOUT_SKY_PILLAR_5F",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_4F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 10,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_TOP",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc
index 41546899f..ba35e16f2 100644
--- a/data/maps/SkyPillar_5F/scripts.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
@@ -1,13 +1,13 @@
 SkyPillar_5F_MapScripts:: @ 82396A2
-	map_script 3, SkyPillar_5F_MapScript1_2396A8
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_2396A8
 	.byte 0
 
 SkyPillar_5F_MapScript1_2396A8: @ 82396A8
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_5F_EventScript_2396B4
 	return
 
 SkyPillar_5F_EventScript_2396B4:: @ 82396B4
-	setmaplayoutindex 437
+	setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc
deleted file mode 100644
index 92cf0da9b..000000000
--- a/data/maps/SkyPillar_Entrance/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SkyPillar_Entrance_MapWarps: @ 8536FF8
-	warp_def 6, 16, 3, 0, MAP_ROUTE131
-	warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE
-
-SkyPillar_Entrance_MapEvents:: @ 8537008
-	map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
deleted file mode 100644
index 434b1f85a..000000000
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_Entrance: @ 848472C
-	.4byte SkyPillar_Entrance_Layout
-	.4byte SkyPillar_Entrance_MapEvents
-	.4byte SkyPillar_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 320
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json
new file mode 100644
index 000000000..379d6fcfb
--- /dev/null
+++ b/data/maps/SkyPillar_Entrance/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_SKY_PILLAR_ENTRANCE",
+  "name": "SkyPillar_Entrance",
+  "layout": "LAYOUT_SKY_PILLAR_ENTRANCE",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE131",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_OUTSIDE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index 09ee9eae2..40d57a485 100644
--- a/data/maps/SkyPillar_Entrance/scripts.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 SkyPillar_Entrance_MapScripts:: @ 823929E
-	map_script 3, SkyPillar_Entrance_MapScript1_2392A4
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_2392A4
 	.byte 0
 
 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4
diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc
deleted file mode 100644
index 9519d1248..000000000
--- a/data/maps/SkyPillar_Outside/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SkyPillar_Outside_EventObjects: @ 853701C
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE
-
-SkyPillar_Outside_MapWarps: @ 8537034
-	warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE
-	warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F
-
-SkyPillar_Outside_MapEvents:: @ 8537044
-	map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
deleted file mode 100644
index 3ca072c80..000000000
--- a/data/maps/SkyPillar_Outside/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_Outside: @ 8484748
-	.4byte SkyPillar_Outside_Layout
-	.4byte SkyPillar_Outside_MapEvents
-	.4byte SkyPillar_Outside_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 321
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json
new file mode 100644
index 000000000..6a3764aa9
--- /dev/null
+++ b/data/maps/SkyPillar_Outside/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_SKY_PILLAR_OUTSIDE",
+  "name": "SkyPillar_Outside",
+  "layout": "LAYOUT_SKY_PILLAR_OUTSIDE",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLACE",
+      "x": 13,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SkyPillar_Outside_EventScript_2393F8",
+      "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 17,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_SKY_PILLAR_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index eb57d1227..c4769c990 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -1,22 +1,22 @@
 SkyPillar_Outside_MapScripts:: @ 82392A8
-	map_script 3, SkyPillar_Outside_MapScript1_2392B8
-	map_script 1, SkyPillar_Outside_MapScript1_2392DD
-	map_script 2, SkyPillar_Outside_MapScript2_2392FA
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_2392B8
+	map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA
 	.byte 0
 
 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
-	compare VAR_0x405E, 3
+	compare VAR_RAYQUAZA_STATE, 3
 	call_if_eq SkyPillar_Outside_EventScript_2392CF
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	call_if_ge SkyPillar_Outside_EventScript_2392D3
 	end
 
 SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
-	call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	return
 
 SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
@@ -29,14 +29,14 @@ SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
 	return
 
 SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
-	map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304
+	map_script_2 VAR_RAYQUAZA_STATE, 3, SkyPillar_Outside_EventScript_239304
 	.2byte 0
 
 SkyPillar_Outside_EventScript_239304:: @ 8239304
 	lockall
 	applymovement 1, SkyPillar_Outside_Movement_2393D3
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT
 	closemessage
@@ -60,19 +60,19 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	special sub_8139560
 	waitstate
 	delay 20
-	applymovement 1, SkyPillar_Outside_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 10
-	applymovement 1, SkyPillar_Outside_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 20
-	applymovement 1, SkyPillar_Outside_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_SYS_WEATHER_CTRL
-	setweather WEATHER_15
+	setweather WEATHER_ALTERNATING
 	doweather
 	special WaitWeather
 	waitstate
@@ -81,8 +81,8 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	closemessage
 	playse SE_KAIDAN
 	fadescreenswapbuffers 1
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x405E, 4
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
+	setvar VAR_RAYQUAZA_STATE, 4
 	removeobject 1
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
 	fadescreenswapbuffers 0
diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc
deleted file mode 100644
index a47e5e77f..000000000
--- a/data/maps/SkyPillar_Top/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SkyPillar_Top_EventObjects: @ 8537170
-	object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2
-	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
-
-SkyPillar_Top_MapWarps: @ 85371A0
-	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
-
-SkyPillar_Top_MapCoordEvents: @ 85371A8
-	coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A
-
-SkyPillar_Top_MapEvents:: @ 85371B8
-	map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0
-
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
deleted file mode 100644
index 07dbd38bb..000000000
--- a/data/maps/SkyPillar_Top/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SkyPillar_Top: @ 848480C
-	.4byte SkyPillar_Top_Layout
-	.4byte SkyPillar_Top_MapEvents
-	.4byte SkyPillar_Top_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 331
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json
new file mode 100644
index 000000000..2d1a6fa1a
--- /dev/null
+++ b/data/maps/SkyPillar_Top/map.json
@@ -0,0 +1,65 @@
+{
+  "id": "MAP_SKY_PILLAR_TOP",
+  "name": "SkyPillar_Top",
+  "layout": "LAYOUT_SKY_PILLAR_TOP",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_1",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SkyPillar_Top_EventScript_239722",
+      "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_5F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE",
+      "var_value": "0",
+      "script": "SkyPillar_Top_EventScript_23979A"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index c091991a3..d08b0b554 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -1,7 +1,7 @@
 SkyPillar_Top_MapScripts:: @ 82396B8
-	map_script 5, SkyPillar_Top_MapScript1_2396C8
-	map_script 3, SkyPillar_Top_MapScript1_2396E6
-	map_script 4, SkyPillar_Top_MapScript2_239713
+	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_2396E6
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713
 	.byte 0
 
 SkyPillar_Top_MapScript1_2396C8: @ 82396C8
@@ -11,19 +11,19 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8
 SkyPillar_Top_EventScript_2396D2:: @ 82396D2
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne SkyPillar_Top_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
 SkyPillar_Top_MapScript1_2396E6: @ 82396E6
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_Top_EventScript_2396FD
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_ge SkyPillar_Top_EventScript_239705
 	end
 
 SkyPillar_Top_EventScript_2396FD:: @ 82396FD
-	setmaplayoutindex 438
+	setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
@@ -36,7 +36,7 @@ SkyPillar_Top_EventScript_23970F:: @ 823970F
 	return
 
 SkyPillar_Top_MapScript2_239713: @ 8239713
-	map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D
+	map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_23971D
 	.2byte 0
 
 SkyPillar_Top_EventScript_23971D:: @ 823971D
@@ -94,7 +94,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785
 SkyPillar_Top_EventScript_23979A:: @ 823979A
 	lockall
 	fadeoutbgm 1
-	applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	special SpawnCameraObject
 	applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858
@@ -130,9 +130,9 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
 	applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C
 	waitmovement 0
 	special RemoveCameraObject
-	setvar VAR_0x405E, 5
-	setvar VAR_0x40CA, 1
-	setvar VAR_0x40D7, 1
+	setvar VAR_RAYQUAZA_STATE, 5
+	setvar VAR_SKY_PILLAR_STATE, 1
+	setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1
 	releaseall
 	end
 
diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc
deleted file mode 100644
index 1485b313b..000000000
--- a/data/maps/SlateportCity/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SlateportCity_MapConnectionsList: @ 84866F4
-	connection up, 0, MAP_ROUTE110
-	connection down, 0, MAP_ROUTE109
-	connection right, 0, MAP_ROUTE134
-
-SlateportCity_MapConnections: @ 8486718
-	.4byte 0x3
-	.4byte SlateportCity_MapConnectionsList
-
diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc
deleted file mode 100644
index 2987c2020..000000000
--- a/data/maps/SlateportCity/events.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-SlateportCity_EventObjects: @ 85261CC
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0
-	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0
-	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0
-	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
-	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
-	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
-	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0
-	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0
-	object_event 14, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0
-	object_event 15, EVENT_OBJ_GFX_MAN_3, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0
-	object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0
-	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0
-	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0
-	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0
-	object_event 22, EVENT_OBJ_GFX_MAN_5, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0
-	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
-	object_event 25, EVENT_OBJ_GFX_POKEFAN_M, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0
-	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
-	object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0
-	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT
-
-SlateportCity_MapWarps: @ 8526514
-	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_BATTLE_TENT_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_MapCoordEvents: @ 852656C
-	coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC
-
-SlateportCity_MapBGEvents: @ 852657C
-	bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2
-	bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73
-	bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73
-	bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A
-	bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF94
-	bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A
-	bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF8B
-	bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF79
-	bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF82
-	bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF70
-	bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF36
-	bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F
-	bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643
-
-SlateportCity_MapEvents:: @ 8526618
-	map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents
-
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
deleted file mode 100644
index b8454f656..000000000
--- a/data/maps/SlateportCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity: @ 84824D4
-	.4byte SlateportCity_Layout
-	.4byte SlateportCity_MapEvents
-	.4byte SlateportCity_MapScripts
-	.4byte SlateportCity_MapConnections
-	.2byte MUS_FINECITY
-	.2byte 2
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json
new file mode 100644
index 000000000..f548b7349
--- /dev/null
+++ b/data/maps/SlateportCity/map.json
@@ -0,0 +1,685 @@
+{
+  "id": "MAP_SLATEPORT_CITY",
+  "name": "SlateportCity",
+  "layout": "LAYOUT_SLATEPORT_CITY",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE110"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_ROUTE109"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE134"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 21,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCED9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 34,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCEF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
+      "x": 5,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCEB8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 26,
+      "y": 29,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCF17",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 31,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD009",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_COOK",
+      "x": 5,
+      "y": 43,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCE42",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
+      "x": 20,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCE63",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 8,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCE84",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
+      "x": 29,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD353",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 28,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD35C",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 28,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD1F8",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 37,
+      "y": 41,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCFE5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 28,
+      "y": 46,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCFEE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 9,
+      "y": 50,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCFF7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 16,
+      "y": 46,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD000",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 8,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCFBB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 15,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCFDC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 30,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD020",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 29,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD037",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 6,
+      "y": 38,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD198",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 5,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD16A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+      "x": 34,
+      "y": 51,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD365",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCDE4",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 11,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD1D8",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 5,
+      "y": 47,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DCDBD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 22,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD04E",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 23,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD065",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 24,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD07C",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 21,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD093",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 20,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD0AA",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 26,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD0C1",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 28,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD14A",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 25,
+      "y": 27,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD153",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 11,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_EventScript_1DD36E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 10,
+      "y": 12,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 26,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 4,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 30,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 5,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 28,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_HARBOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 40,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_HARBOR",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 21,
+      "y": 44,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_HOUSE2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE",
+      "var_value": "2",
+      "script": "SlateportCity_EventScript_1DD5DC"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 19,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCFB2"
+    },
+    {
+      "type": "sign",
+      "x": 20,
+      "y": 19,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 21,
+      "y": 19,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 26,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCF94"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 26,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCF8B"
+    },
+    {
+      "type": "sign",
+      "x": 26,
+      "y": 26,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCF79"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 22,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCF82"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 26,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCF70"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 13,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCF36"
+    },
+    {
+      "type": "sign",
+      "x": 23,
+      "y": 38,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_EventScript_1DCF3F"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 36,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SlateportCity_EventScript_1DD643"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 2e7859fba..1830c3f00 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -1,20 +1,20 @@
 SlateportCity_MapScripts:: @ 81DCC61
-	map_script 3, SlateportCity_MapScript1_1DCC6C
-	map_script 2, SlateportCity_MapScript2_1DCD12
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_1DCC6C
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12
 	.byte 0
 
 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C
-	setvar VAR_0x40AA, 0
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
 	call SlateportCity_EventScript_1DCC8D
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCC99
-	compare VAR_0x40D2, 1
+	compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCCE7
 	end
 
 SlateportCity_EventScript_1DCC8D:: @ 81DCC8D
 	setflag FLAG_VISITED_SLATEPORT_CITY
-	setvar VAR_0x4086, 0
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
 	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
 	return
 
@@ -36,7 +36,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
 	return
 
 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 30
 	goto_if_eq SlateportCity_EventScript_1DCD06
@@ -50,7 +50,7 @@ SlateportCity_EventScript_1DCD06:: @ 81DCD06
 	return
 
 SlateportCity_MapScript2_1DCD12: @ 81DCD12
-	map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C
+	map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C
 	.2byte 0
 
 SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
@@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	waitmovement 0
 	msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT
 	closemessage
-	applymovement 35, SlateportCity_Movement_2725A4
+	applymovement 35, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 60
 	msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT
-	applymovement 35, SlateportCity_Movement_2725A8
+	applymovement 35, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT
 	closemessage
@@ -83,9 +83,9 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	removeobject 35
 	setobjectxyperm 35, 10, 12
 	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x40D2, 2
-	addvar VAR_0x40D1, 1
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
+	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
+	addvar VAR_SCOTT_STATE, 1
 	releaseall
 	end
 
@@ -170,7 +170,7 @@ SlateportCity_EventScript_1DCE38:: @ 81DCE38
 SlateportCity_EventScript_1DCE42:: @ 81DCE42
 	lock
 	faceplayer
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCE59
 	msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT
 	release
@@ -184,7 +184,7 @@ SlateportCity_EventScript_1DCE59:: @ 81DCE59
 SlateportCity_EventScript_1DCE63:: @ 81DCE63
 	lock
 	faceplayer
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCE7A
 	msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT
 	release
@@ -198,7 +198,7 @@ SlateportCity_EventScript_1DCE7A:: @ 81DCE7A
 SlateportCity_EventScript_1DCE84:: @ 81DCE84
 	lock
 	faceplayer
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCEA4
 	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE
 	msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT
@@ -218,7 +218,7 @@ SlateportCity_EventScript_1DCEAE:: @ 81DCEAE
 SlateportCity_EventScript_1DCEB8:: @ 81DCEB8
 	lock
 	faceplayer
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCECF
 	msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT
 	release
@@ -230,7 +230,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF
 	end
 
 SlateportCity_EventScript_1DCED9:: @ 81DCED9
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	goto_if_eq SlateportCity_EventScript_1DCEED
 	msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC
 	end
@@ -242,7 +242,7 @@ SlateportCity_EventScript_1DCEED:: @ 81DCEED
 SlateportCity_EventScript_1DCEF6:: @ 81DCEF6
 	lock
 	faceplayer
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCF0D
 	msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT
 	release
@@ -323,7 +323,7 @@ SlateportCity_EventScript_1DCFB2:: @ 81DCFB2
 SlateportCity_EventScript_1DCFBB:: @ 81DCFBB
 	lock
 	faceplayer
-	compare VAR_0x4058, 1
+	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCFD2
 	msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT
 	release
@@ -359,7 +359,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009
 	faceplayer
 	msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, SlateportCity_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -369,7 +369,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020
 	faceplayer
 	msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 18, SlateportCity_Movement_2725A2
+	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -379,7 +379,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037
 	faceplayer
 	msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 19, SlateportCity_Movement_2725A2
+	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -389,7 +389,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E
 	faceplayer
 	msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT
 	closemessage
-	applymovement 26, SlateportCity_Movement_2725A2
+	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -399,7 +399,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065
 	faceplayer
 	msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT
 	closemessage
-	applymovement 27, SlateportCity_Movement_2725A2
+	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -409,7 +409,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C
 	faceplayer
 	msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT
 	closemessage
-	applymovement 28, SlateportCity_Movement_2725A2
+	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -419,7 +419,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093
 	faceplayer
 	msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT
 	closemessage
-	applymovement 29, SlateportCity_Movement_2725A2
+	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -429,7 +429,7 @@ SlateportCity_EventScript_1DD0AA:: @ 81DD0AA
 	faceplayer
 	msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 30, SlateportCity_Movement_2725A2
+	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -438,31 +438,31 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
 	lock
 	faceplayer
 	playse SE_PIN
-	applymovement 31, SlateportCity_Movement_272598
+	applymovement 31, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_27259A
+	applymovement 31, Common_Movement_Delay48
 	waitmovement 0
 	msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, SlateportCity_Movement_2725A2
+	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	applymovement 31, SlateportCity_Movement_1DD147
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_27259E
+	applymovement 31, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, SlateportCity_Movement_2725A2
+	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	applymovement 31, SlateportCity_Movement_1DD147
 	waitmovement 0
 	msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, SlateportCity_Movement_27259E
+	applymovement 31, Common_Movement_FacePlayer
 	waitmovement 0
 	applymovement 31, SlateportCity_Movement_1DD147
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_2725A2
+	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -481,7 +481,7 @@ SlateportCity_EventScript_1DD153:: @ 81DD153
 	faceplayer
 	msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT
 	closemessage
-	applymovement 33, SlateportCity_Movement_2725A2
+	applymovement 33, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT
 	msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 10, SlateportCity_Movement_2725A8
+	applymovement 10, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 10
-	applymovement 9, SlateportCity_Movement_2725AA
+	applymovement 9, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 25
 	applymovement 11, SlateportCity_Movement_1DD33C
@@ -577,26 +577,26 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	removeobject 10
 	removeobject 9
 	msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT
-	applymovement 11, SlateportCity_Movement_2725A6
+	applymovement 11, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT
 	playbgm MUS_AQA_0, 0
 	msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT
-	applymovement 6, SlateportCity_Movement_2725A4
-	applymovement 1, SlateportCity_Movement_2725A4
+	applymovement 6, Common_Movement_WalkInPlaceLeft
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	applymovement 7, SlateportCity_Movement_1DD309
 	applymovement 3, SlateportCity_Movement_272596
 	applymovement 2, SlateportCity_Movement_1DD311
 	waitmovement 0
-	applymovement 11, SlateportCity_Movement_2725AA
+	applymovement 11, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT
 	playse SE_PIN
-	applymovement 11, SlateportCity_Movement_272598
+	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 11, SlateportCity_Movement_27259A
+	applymovement 11, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 11, SlateportCity_Movement_2725A6
+	applymovement 11, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT
 	msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT
@@ -609,7 +609,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
-	setvar VAR_0x4058, 2
+	setvar VAR_SLATEPORT_STATE, 2
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
 	waitstate
 	releaseall
@@ -885,7 +885,7 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE
 
 SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	opendoor 10, 12
 	waitdooranim
@@ -901,8 +901,8 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
 	applymovement 35, SlateportCity_Movement_1DD63A
 	waitmovement 0
 	removeobject 35
-	addvar VAR_0x40D1, 1
-	setvar VAR_0x40D2, 3
+	addvar VAR_SCOTT_STATE, 1
+	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
 	releaseall
 	end
 
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
deleted file mode 100644
index 71e8d6d3a..000000000
--- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524
-	map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
deleted file mode 100644
index e9044f1e9..000000000
--- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_BattleTentBattleRoom: @ 848314C
-	.4byte BattleTentBattleRoom_Layout
-	.4byte SlateportCity_BattleTentBattleRoom_MapEvents
-	.4byte SlateportCity_BattleTentBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 386
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json
new file mode 100644
index 000000000..e39f04363
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json
@@ -0,0 +1,60 @@
+{
+  "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM",
+  "name": "SlateportCity_BattleTentBattleRoom",
+  "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 1,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index 9df0e0a6a..a5e2a493c 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -1,7 +1,7 @@
 SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
-	map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970
-	map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A
-	map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_209970
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4
 	.byte 0
 
 SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970
diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc
deleted file mode 100644
index 4fe072b50..000000000
--- a/data/maps/SlateportCity_BattleTentCorridor/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8
-	map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc
deleted file mode 100644
index 0a273edef..000000000
--- a/data/maps/SlateportCity_BattleTentCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_BattleTentCorridor: @ 8483130
-	.4byte BattleTentCorridor_Layout
-	.4byte SlateportCity_BattleTentCorridor_MapEvents
-	.4byte SlateportCity_BattleTentCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 385
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json
new file mode 100644
index 000000000..eea0cac80
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentCorridor/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR",
+  "name": "SlateportCity_BattleTentCorridor",
+  "layout": "LAYOUT_BATTLE_TENT_CORRIDOR",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index 4bd28996b..27f7fa3b9 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -1,6 +1,6 @@
 SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26
-	map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B
-	map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31
 	.byte 0
 
 SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31
@@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
 	msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	opendoor 2, 1
 	waitdooranim
diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc
deleted file mode 100644
index 3eadecd27..000000000
--- a/data/maps/SlateportCity_BattleTentLobby/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SlateportCity_BattleTentLobby_EventObjects: @ 852F408
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0
-
-SlateportCity_BattleTentLobby_MapWarps: @ 852F480
-	warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY
-	warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY
-
-SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490
-	bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99
-
-SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C
-	map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents
-
diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc
deleted file mode 100644
index 6bbbbf45f..000000000
--- a/data/maps/SlateportCity_BattleTentLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_BattleTentLobby: @ 8483114
-	.4byte BattleTentLobby_Layout
-	.4byte SlateportCity_BattleTentLobby_MapEvents
-	.4byte SlateportCity_BattleTentLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 384
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json
new file mode 100644
index 000000000..45783e2c9
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentLobby/map.json
@@ -0,0 +1,110 @@
+{
+  "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY",
+  "name": "SlateportCity_BattleTentLobby",
+  "layout": "LAYOUT_BATTLE_TENT_LOBBY",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_BattleTentLobby_EventScript_2088AA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_BattleTentLobby_EventScript_208A3D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_BattleTentLobby_EventScript_208A7E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_BattleTentLobby_EventScript_208A87",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 11,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_BattleTentLobby_EventScript_208A90",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_BattleTentLobby_EventScript_208A99"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index 8851c5fa8..19416c91b 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -1,6 +1,6 @@
 SlateportCity_BattleTentLobby_MapScripts:: @ 8208730
-	map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F
-	map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_MapScript2_20874F
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_MapScript2_20873B
 	.byte 0
 
 SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B
@@ -165,7 +165,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
 	special CallFrontierUtilFunc
 	closemessage
 	delay 2
-	call SlateportCity_BattleTentLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14
@@ -249,7 +249,7 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D
 	msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM41
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM41
 	msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc
deleted file mode 100644
index e0781c2cb..000000000
--- a/data/maps/SlateportCity_Harbor/events.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SlateportCity_Harbor_EventObjects: @ 852FA68
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
-	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
-	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
-	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
-	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
-
-SlateportCity_Harbor_MapWarps: @ 852FB28
-	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: @ 852FB48
-	coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB
-	coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7
-	coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3
-	coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF
-
-SlateportCity_Harbor_MapEvents:: @ 852FB88
-	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
deleted file mode 100644
index 922f84f1a..000000000
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_Harbor: @ 84831D8
-	.4byte Harbor_Layout
-	.4byte SlateportCity_Harbor_MapEvents
-	.4byte SlateportCity_Harbor_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 88
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json
new file mode 100644
index 000000000..c61c5a5e6
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/map.json
@@ -0,0 +1,191 @@
+{
+  "id": "MAP_SLATEPORT_CITY_HARBOR",
+  "name": "SlateportCity_Harbor",
+  "layout": "LAYOUT_HARBOR",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_Harbor_EventScript_20CAF1",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_Harbor_EventScript_20CC52",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 1,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_Harbor_EventScript_20CC99",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_Harbor_EventScript_20CCA2",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
+      "x": 8,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 7,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 8,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW",
+      "x": 7,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 12,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 19,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 20,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
+      "var_value": "1",
+      "script": "SlateportCity_Harbor_EventScript_20C9BB"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
+      "var_value": "1",
+      "script": "SlateportCity_Harbor_EventScript_20C9C7"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
+      "var_value": "1",
+      "script": "SlateportCity_Harbor_EventScript_20C9D3"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 14,
+      "elevation": 3,
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
+      "var_value": "1",
+      "script": "SlateportCity_Harbor_EventScript_20C9DF"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index 24e139edf..8f9f77e97 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -1,11 +1,11 @@
 SlateportCity_Harbor_MapScripts:: @ 820C97D
-	map_script 3, SlateportCity_Harbor_MapScript1_20C983
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_20C983
 	.byte 0
 
 SlateportCity_Harbor_MapScript1_20C983: @ 820C983
 	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
 	setvar VAR_TEMP_1, 0
-	compare VAR_0x40A0, 1
+	compare VAR_SLATEPORT_HARBOR_STATE, 1
 	call_if_eq SlateportCity_Harbor_EventScript_20C9A9
 	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5
 	end
@@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF
 	end
 
 SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
-	applymovement 7, SlateportCity_Harbor_Movement_2725AA
+	applymovement 7, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	applymovement 6, SlateportCity_Harbor_Movement_2725AA
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6
+	applymovement 6, Common_Movement_WalkInPlaceDown
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT
 	closemessage
@@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	removeobject 6
 	removeobject 7
 	removeobject 8
-	setvar VAR_0x40A0, 2
+	setvar VAR_SLATEPORT_HARBOR_STATE, 2
 	setflag FLAG_MET_TEAM_AQUA_HARBOR
 	setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT
 	compare VAR_0x8008, 0
@@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89
 	applymovement 4, SlateportCity_Harbor_Movement_20CAE0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E
 	applymovement 4, SlateportCity_Harbor_Movement_20CAE6
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3
 	applymovement 4, SlateportCity_Harbor_Movement_20CAEB
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD
 SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
 	msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
@@ -296,11 +296,11 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2
 	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00
 	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6
 	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9
-	compare VAR_0x40A0, 2
+	compare VAR_SLATEPORT_HARBOR_STATE, 2
 	goto_if_eq SlateportCity_Harbor_EventScript_20CCDF
 	msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -358,7 +358,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B
 	goto_if_eq SlateportCity_Harbor_EventScript_20CE05
 	giveitem_std ITEM_DEEP_SEA_TOOTH
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	takeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
@@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB
 	goto_if_eq SlateportCity_Harbor_EventScript_20CE05
 	giveitem_std ITEM_DEEP_SEA_SCALE
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	takeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc
deleted file mode 100644
index 9917c0a24..000000000
--- a/data/maps/SlateportCity_House1/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SlateportCity_House1_EventObjects: @ 852F538
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0
-
-SlateportCity_House1_MapWarps: @ 852F550
-	warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY
-	warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY
-
-SlateportCity_House1_MapEvents:: @ 852F560
-	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
deleted file mode 100644
index 1e48dfb54..000000000
--- a/data/maps/SlateportCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_House1: @ 8483168
-	.4byte HouseWithBed_Layout
-	.4byte SlateportCity_House1_MapEvents
-	.4byte SlateportCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 80
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json
new file mode 100644
index 000000000..47943e517
--- /dev/null
+++ b/data/maps/SlateportCity_House1/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_SLATEPORT_CITY_HOUSE1",
+  "name": "SlateportCity_House1",
+  "layout": "LAYOUT_HOUSE_WITH_BED",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_House1_EventScript_209AA5",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc
index 2e973663b..155081a1b 100644
--- a/data/maps/SlateportCity_House1/scripts.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
@@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50
 
 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A
 	msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT
-	call SlateportCity_House1_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare VAR_RESULT, 1
diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc
deleted file mode 100644
index 2dfffdaec..000000000
--- a/data/maps/SlateportCity_House2/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SlateportCity_House2_EventObjects: @ 852FB9C
-	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0
-
-SlateportCity_House2_MapWarps: @ 852FBCC
-	warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY
-	warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY
-
-SlateportCity_House2_MapEvents:: @ 852FBDC
-	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
deleted file mode 100644
index 6028d12fb..000000000
--- a/data/maps/SlateportCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_House2: @ 84831F4
-	.4byte House2_Layout
-	.4byte SlateportCity_House2_MapEvents
-	.4byte SlateportCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 60
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json
new file mode 100644
index 000000000..a6a686cf7
--- /dev/null
+++ b/data/maps/SlateportCity_House2/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_SLATEPORT_CITY_HOUSE2",
+  "name": "SlateportCity_House2",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_House2_EventScript_20D9AF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_House2_EventScript_20D9B8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc
deleted file mode 100644
index 9cc5b9829..000000000
--- a/data/maps/SlateportCity_Mart/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SlateportCity_Mart_EventObjects: @ 852FCF0
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0
-
-SlateportCity_Mart_MapWarps: @ 852FD38
-	warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY
-	warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY
-
-SlateportCity_Mart_MapEvents:: @ 852FD48
-	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
deleted file mode 100644
index 2d53ac8c3..000000000
--- a/data/maps/SlateportCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_Mart: @ 8483248
-	.4byte Mart_Layout
-	.4byte SlateportCity_Mart_MapEvents
-	.4byte SlateportCity_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json
new file mode 100644
index 000000000..597abbf06
--- /dev/null
+++ b/data/maps/SlateportCity_Mart/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_SLATEPORT_CITY_MART",
+  "name": "SlateportCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_Mart_EventScript_20DC49",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_Mart_EventScript_20DC76",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_Mart_EventScript_20DC7F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
deleted file mode 100644
index 8d727f483..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
-	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
-	object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT
-	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-
-SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0
-	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: @ 852F7D8
-	coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F
-	coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0
-
-SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8
-	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83
-	bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C
-	bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
-	bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
-	bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
-	bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
-	bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7
-	bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0
-	bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9
-	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
-	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
-	bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
-	bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
-
-SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894
-	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
deleted file mode 100644
index b75a12f60..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_OceanicMuseum_1F: @ 84831A0
-	.4byte SlateportCity_OceanicMuseum_1F_Layout
-	.4byte SlateportCity_OceanicMuseum_1F_MapEvents
-	.4byte SlateportCity_OceanicMuseum_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FUNE_KAN
-	.2byte 86
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
new file mode 100644
index 000000000..eefb843f4
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
@@ -0,0 +1,349 @@
+{
+  "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+  "name": "SlateportCity_OceanicMuseum_1F",
+  "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+  "music": "MUS_FUNE_KAN",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 18,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 14,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 10,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 17,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "x": 18,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 9,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_M",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 10,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
+      "var_value": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
+      "var_value": "0",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE83"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE8C"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEA7"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB0"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB9"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index b574ce448..5a4947c8a 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96
 
 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
 	end
@@ -42,7 +42,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
 	updatemoneybox 0, 0
 	nop
 	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT
-	setvar VAR_0x40AA, 1
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox
 	nop
 	nop
@@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18
 
 SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
 	msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT
-	setvar VAR_0x40AA, 1
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox
 	nop
 	nop
@@ -155,9 +155,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8
 	faceplayer
 	delay 8
 	playse SE_PIN
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598
+	applymovement 13, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A
+	applymovement 13, Common_Movement_Delay48
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM46
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
deleted file mode 100644
index 14499f35b..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-	object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-	object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
-
-SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950
-	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
-
-SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958
-	bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A
-	bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13
-	bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
-	bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
-	bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
-	bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
-	bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
-	bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-	bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-	bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
-	bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
-	bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
-	bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
-	bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
-	bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
-	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
-	bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
-	bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
-	bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
-	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-	bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-
-SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54
-	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
deleted file mode 100644
index a571c2372..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_OceanicMuseum_2F: @ 84831BC
-	.4byte SlateportCity_OceanicMuseum_2F_Layout
-	.4byte SlateportCity_OceanicMuseum_2F_MapEvents
-	.4byte SlateportCity_OceanicMuseum_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FUNE_KAN
-	.2byte 87
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json
new file mode 100644
index 000000000..6eaecba97
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json
@@ -0,0 +1,289 @@
+{
+  "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
+  "name": "SlateportCity_OceanicMuseum_2F",
+  "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
+  "music": "MUS_FUNE_KAN",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "x": 6,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76",
+      "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD0A"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD13"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25"
+    },
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+    },
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 204ffb4eb..96ae96685 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -43,8 +43,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
 	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceDown
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT
 	closemessage
@@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	fadescreen 0
 	delay 30
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 269
@@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	setflag FLAG_DELIVERED_DEVON_GOODS
 	clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
 	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
-	setvar VAR_0x40D2, 1
+	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
 	fadescreen 0
 	release
 	end
@@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C
 	return
 
 SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D
-	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -268,7 +268,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76
 	faceplayer
 	msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index f5409bdf0..000000000
--- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0
-
-SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38
-	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:: @ 852FC50
-	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
deleted file mode 100644
index 37f19272d..000000000
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_PokemonCenter_1F: @ 8483210
-	.4byte PokemonCenter_1F_Layout
-	.4byte SlateportCity_PokemonCenter_1F_MapEvents
-	.4byte SlateportCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..3e87ae256
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json
@@ -0,0 +1,82 @@
+{
+  "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F",
+  "name": "SlateportCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index db8cc19d7..8c1f87e63 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
-	map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_20DACA
-	map_script 5, SlateportCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_20DACA
+	map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index c28c3111a..000000000
--- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4
-	warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC
-	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
deleted file mode 100644
index 1cac2f35e..000000000
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_PokemonCenter_2F: @ 848322C
-	.4byte PokemonCenter_2F_Layout
-	.4byte SlateportCity_PokemonCenter_2F_MapEvents
-	.4byte SlateportCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..e6ad0518b
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F",
+  "name": "SlateportCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index 3138f20d6..1ddbcc0be 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21
-	map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, SlateportCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36
diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc
deleted file mode 100644
index 74b2a6acf..000000000
--- a/data/maps/SlateportCity_PokemonFanClub/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SlateportCity_PokemonFanClub_EventObjects: @ 852F574
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0
-	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0
-	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0
-	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0
-	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0
-	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0
-	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0
-
-SlateportCity_PokemonFanClub_MapWarps: @ 852F64C
-	warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY
-	warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY
-
-SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C
-	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
deleted file mode 100644
index b3b0dc899..000000000
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_PokemonFanClub: @ 8483184
-	.4byte SlateportCity_PokemonFanClub_Layout
-	.4byte SlateportCity_PokemonFanClub_MapEvents
-	.4byte SlateportCity_PokemonFanClub_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 85
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json
new file mode 100644
index 000000000..045a0c315
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonFanClub/map.json
@@ -0,0 +1,153 @@
+{
+  "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB",
+  "name": "SlateportCity_PokemonFanClub",
+  "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 11,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 1,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
+      "x": 11,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_28C943",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 6,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_20A17E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 6,
+      "y": 5,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_209E96",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_20A20D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SKITTY",
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZUMARILL",
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_20A220",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "x": 11,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 7,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 3faf350fc..866bf2963 100644
--- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
@@ -6,7 +6,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
 	faceplayer
 	goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152
 	call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172
-	switch VAR_0x40B7
+	switch VAR_SLATEPORT_FAN_CLUB_STATE
 	case 0, SlateportCity_PokemonFanClub_EventScript_209ED2
 	case 1, SlateportCity_PokemonFanClub_EventScript_209EE5
 	case 2, SlateportCity_PokemonFanClub_EventScript_209F3B
@@ -14,7 +14,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
 	end
 
 SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2
-	setvar VAR_0x40B7, 1
+	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1
 	msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_209F45
 	end
@@ -28,7 +28,7 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5
 	call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
 	compare VAR_TEMP_2, 5
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA
-	compare VAR_0x40B7, 2
+	compare VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B
 	msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_209F45
@@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45
 	end
 
 SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA
-	setvar VAR_0x40B7, 2
+	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	return
 
 SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0
@@ -211,14 +211,14 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E
 
 SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3
 	playse SE_PIN
-	applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598
+	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A
+	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
 	msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOOTHE_BELL
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SOOTHE_BELL
 	release
 	end
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
deleted file mode 100644
index 5bad8c5e2..000000000
--- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0
-	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
-
-SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
-	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:: @ 852F390
-	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
deleted file mode 100644
index e702530ef..000000000
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_SternsShipyard_1F: @ 84830DC
-	.4byte SlateportCity_SternsShipyard_1F_Layout
-	.4byte SlateportCity_SternsShipyard_1F_MapEvents
-	.4byte SlateportCity_SternsShipyard_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 81
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json
new file mode 100644
index 000000000..351431280
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
+  "name": "SlateportCity_SternsShipyard_1F",
+  "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 18,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 12,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF",
+      "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index adf1bd3a2..6c554387a 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
@@ -8,11 +8,11 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40
 	goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9
 	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA
 	msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_DOCK_REJECTED_DEVON_GOODS
 	setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA
@@ -20,31 +20,31 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT
 	releaseall
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
deleted file mode 100644
index f34a52726..000000000
--- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0
-
-SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC
-	warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
-
-SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4
-	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
deleted file mode 100644
index 8139d7604..000000000
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SlateportCity_SternsShipyard_2F: @ 84830F8
-	.4byte SlateportCity_SternsShipyard_2F_Layout
-	.4byte SlateportCity_SternsShipyard_2F_MapEvents
-	.4byte SlateportCity_SternsShipyard_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 82
-	.byte MAPSEC_SLATEPORT_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json
new file mode 100644
index 000000000..2e57c63fd
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
+  "name": "SlateportCity_SternsShipyard_2F",
+  "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
+  "music": "MUS_FINECITY",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 0,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SlateportCity_SternsShipyard_2F_EventScript_208647",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity/connections.inc b/data/maps/SootopolisCity/connections.inc
deleted file mode 100644
index 230f56b2e..000000000
--- a/data/maps/SootopolisCity/connections.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SootopolisCity_MapConnectionsList:: @ 84867F0
-	@ empty
-
-SootopolisCity_MapConnections:: @ 84867F0
-	.4byte 0
-	.4byte SootopolisCity_MapConnectionsList
diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc
deleted file mode 100644
index 9ca0bb20d..000000000
--- a/data/maps/SootopolisCity/events.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-SootopolisCity_EventObjects: @ 8527314
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
-	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0
-	object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
-	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
-	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0
-	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON
-	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE
-	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA
-	object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
-	object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
-	object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
-	object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
-	object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
-	object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
-	object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
-
-SootopolisCity_MapWarps: @ 85274C4
-	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_LOTAD_AND_SEEDOT_HOUSE
-	warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
-
-SootopolisCity_MapBGEvents: @ 852752C
-	bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B
-	bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A
-	bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73
-	bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73
-	bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A
-	bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154
-
-SootopolisCity_MapEvents:: @ 8527574
-	map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents
-
diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc
deleted file mode 100644
index 1b6832fbe..000000000
--- a/data/maps/SootopolisCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity: @ 848257C
-	.4byte SootopolisCity_Layout
-	.4byte SootopolisCity_MapEvents
-	.4byte SootopolisCity_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 8
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_CITY
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json
new file mode 100644
index 000000000..183c3ce46
--- /dev/null
+++ b/data/maps/SootopolisCity/map.json
@@ -0,0 +1,396 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY",
+  "name": "SootopolisCity",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_CITY",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 31,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E5E8D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 47,
+      "y": 33,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E5FE2",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 9,
+      "y": 43,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E5ED8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "x": 51,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E608E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 43,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E60E3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 26,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E6017",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_STEVEN",
+      "x": 20,
+      "y": 36,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E6166",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 49,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E6038",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GROUDON_3",
+      "x": 28,
+      "y": 44,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KYOGRE_3",
+      "x": 34,
+      "y": 44,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2",
+      "x": 31,
+      "y": 41,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 17,
+      "y": 44,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E6411",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 14,
+      "y": 42,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E63DB",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 17,
+      "y": 40,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E6393",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 19,
+      "y": 37,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E635D",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+      "x": 29,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E64F2",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+      "x": 31,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E651F",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLACE",
+      "x": 31,
+      "y": 18,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_EventScript_1E6446",
+      "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 43,
+      "y": 31,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 32,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 31,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 45,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE3",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 44,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE4",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE5",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 53,
+      "y": 28,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE6",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 35,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE7",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 48,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 51,
+      "y": 36,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 33,
+      "y": 34,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SootopolisCity_EventScript_1E614B"
+    },
+    {
+      "type": "sign",
+      "x": 19,
+      "y": 29,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 44,
+      "y": 31,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 45,
+      "y": 31,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 29,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 41,
+      "y": 37,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SootopolisCity_EventScript_1E6154"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index a116aeb56..ad72120f9 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -1,9 +1,9 @@
 SootopolisCity_MapScripts:: @ 81E565C
-	map_script 1, SootopolisCity_MapScript1_1E5676
-	map_script 3, SootopolisCity_MapScript1_1E56EF
-	map_script 5, SootopolisCity_MapScript1_1E590B
-	map_script 2, SootopolisCity_MapScript2_1E5914
-	map_script 4, SootopolisCity_MapScript2_1E58DB
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_1E56EF
+	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB
 	.byte 0
 
 SootopolisCity_MapScript1_1E5676: @ 81E5676
@@ -33,36 +33,36 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5
 
 SootopolisCity_MapScript1_1E56EF: @ 81E56EF
 	setflag FLAG_VISITED_SOOTOPOLIS_CITY
-	compare VAR_0x405E, 1
+	compare VAR_RAYQUAZA_STATE, 1
 	call_if_eq SootopolisCity_EventScript_1E5781
-	compare VAR_0x40CA, 1
+	compare VAR_SKY_PILLAR_STATE, 1
 	call_if_eq SootopolisCity_EventScript_1E5781
 	call SootopolisCity_EventScript_1E5805
 	call SootopolisCity_EventScript_1E57B2
-	compare VAR_0x405E, 1
+	compare VAR_RAYQUAZA_STATE, 1
 	call_if_eq SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 2
+	compare VAR_RAYQUAZA_STATE, 2
 	call_if_eq SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 3
+	compare VAR_RAYQUAZA_STATE, 3
 	call_if_eq SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	call_if_eq SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	call_if_eq SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 2
+	compare VAR_RAYQUAZA_STATE, 2
 	call_if_eq SootopolisCity_EventScript_1E5842
-	compare VAR_0x405E, 3
+	compare VAR_RAYQUAZA_STATE, 3
 	call_if_eq SootopolisCity_EventScript_1E5842
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	call_if_eq SootopolisCity_EventScript_1E585B
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	call_if_eq SootopolisCity_EventScript_1E5871
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	call_if_eq SootopolisCity_EventScript_1E58D3
 	end
 
 SootopolisCity_EventScript_1E5781:: @ 81E5781
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 SootopolisCity_EventScript_1E5785:: @ 81E5785
@@ -77,19 +77,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
 	return
 
 SootopolisCity_EventScript_1E57B2:: @ 81E57B2
-	compare VAR_0x405E, 0
+	compare VAR_RAYQUAZA_STATE, 0
 	goto_if_eq SootopolisCity_EventScript_1E5800
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E5800
-	compare VAR_0x405E, 1
+	compare VAR_RAYQUAZA_STATE, 1
 	goto_if_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x405E, 2
+	compare VAR_RAYQUAZA_STATE, 2
 	goto_if_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x405E, 3
+	compare VAR_RAYQUAZA_STATE, 3
 	goto_if_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	goto_if_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x40CA, 1
+	compare VAR_SKY_PILLAR_STATE, 1
 	goto_if_le SootopolisCity_EventScript_1E5801
 	return
 
@@ -97,20 +97,20 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800
 	return
 
 SootopolisCity_EventScript_1E5801:: @ 81E5801
-	setmaplayoutindex 357
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE
 	return
 
 SootopolisCity_EventScript_1E5805:: @ 81E5805
-	compare VAR_0x405E, 0
+	compare VAR_RAYQUAZA_STATE, 0
 	goto_if_eq SootopolisCity_EventScript_1E583D
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E583D
-	compare VAR_0x405E, 1
+	compare VAR_RAYQUAZA_STATE, 1
 	goto_if_eq SootopolisCity_EventScript_1E583E
-	compare VAR_0x40CA, 1
+	compare VAR_SKY_PILLAR_STATE, 1
 	goto_if_eq SootopolisCity_EventScript_1E583E
-	compare VAR_0x40CA, 1
-	goto_if_le SootopolisCity_EventScript_27207A
+	compare VAR_SKY_PILLAR_STATE, 1
+	goto_if_le Common_EventScript_SetWeather15
 	return
 
 SootopolisCity_EventScript_1E583D:: @ 81E583D
@@ -140,11 +140,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871
 	setobjectxyperm 7, 29, 33
 	setobjectxyperm 16, 33, 35
 	setobjectxyperm 17, 34, 35
-	compare VAR_0x40D8, 0
+	compare VAR_SOOTOPOLIS_STATE, 0
 	call_if_eq SootopolisCity_EventScript_1E58AF
-	compare VAR_0x40D8, 1
+	compare VAR_SOOTOPOLIS_STATE, 1
 	call_if_eq SootopolisCity_EventScript_1E58BB
-	compare VAR_0x40D8, 2
+	compare VAR_SOOTOPOLIS_STATE, 2
 	call_if_eq SootopolisCity_EventScript_1E58C7
 	return
 
@@ -168,13 +168,13 @@ SootopolisCity_EventScript_1E58D3:: @ 81E58D3
 	return
 
 SootopolisCity_MapScript2_1E58DB: @ 81E58DB
-	map_script_2 VAR_0x405E, 5, SootopolisCity_EventScript_1E58E5
+	map_script_2 VAR_RAYQUAZA_STATE, 5, SootopolisCity_EventScript_1E58E5
 	.2byte 0
 
 SootopolisCity_EventScript_1E58E5:: @ 81E58E5
-	compare VAR_0x40CA, 1
+	compare VAR_SKY_PILLAR_STATE, 1
 	call_if_eq SootopolisCity_EventScript_1E58FC
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_eq SootopolisCity_EventScript_1E5901
 	end
 
@@ -184,7 +184,7 @@ SootopolisCity_EventScript_1E58FC:: @ 81E58FC
 
 SootopolisCity_EventScript_1E5901:: @ 81E5901
 	turnobject EVENT_OBJ_ID_PLAYER, 2
-	setvar VAR_0x40CA, 3
+	setvar VAR_SKY_PILLAR_STATE, 3
 	return
 
 SootopolisCity_MapScript1_1E590B: @ 81E590B
@@ -192,8 +192,8 @@ SootopolisCity_MapScript1_1E590B: @ 81E590B
 	end
 
 SootopolisCity_MapScript2_1E5914: @ 81E5914
-	map_script_2 VAR_0x405E, 1, SootopolisCity_EventScript_1E5926
-	map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE
+	map_script_2 VAR_RAYQUAZA_STATE, 1, SootopolisCity_EventScript_1E5926
+	map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE
 	.2byte 0
 
 SootopolisCity_EventScript_1E5926:: @ 81E5926
@@ -214,13 +214,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	setweather WEATHER_15
+	setweather WEATHER_ALTERNATING
 	doweather
 	setvar VAR_0x8004, 0
 	special sub_813B7D8
 	waitstate
-	applymovement 10, SootopolisCity_Movement_2725A4
-	applymovement 9, SootopolisCity_Movement_2725A8
+	applymovement 10, Common_Movement_WalkInPlaceLeft
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 60
 	waitse
@@ -271,8 +271,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75
 	waitmovement 0
 	special RemoveCameraObject
-	setvar VAR_0x405E, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_RAYQUAZA_STATE, 2
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
@@ -314,13 +314,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	setweather WEATHER_15
+	setweather WEATHER_ALTERNATING
 	doweather
 	setvar VAR_0x8004, 0
 	special sub_813B7D8
 	waitstate
-	applymovement 10, SootopolisCity_Movement_2725A4
-	applymovement 9, SootopolisCity_Movement_2725A8
+	applymovement 10, Common_Movement_WalkInPlaceLeft
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 60
 	waitse
@@ -371,8 +371,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE
 	waitmovement 0
 	special RemoveCameraObject
-	setvar VAR_0x405E, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_RAYQUAZA_STATE, 2
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
@@ -540,11 +540,11 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	special WaitWeather
 	waitstate
 	clearflag FLAG_SYS_WEATHER_CTRL
-	setvar VAR_0x40CA, 3
+	setvar VAR_SKY_PILLAR_STATE, 3
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm MUS_RUNECITY
 	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
 	waitstate
 	end
@@ -593,11 +593,11 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	special WaitWeather
 	waitstate
 	clearflag FLAG_SYS_WEATHER_CTRL
-	setvar VAR_0x40CA, 2
+	setvar VAR_SKY_PILLAR_STATE, 2
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm MUS_NAMINORI
 	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
 	waitstate
 	end
@@ -694,11 +694,11 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F
 SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
 	lock
 	faceplayer
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E5EC4
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E5ECE
-	compare VAR_0x405E, 2
+	compare VAR_RAYQUAZA_STATE, 2
 	goto_if_ge SootopolisCity_EventScript_1E5EBA
 	msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT
 	release
@@ -722,15 +722,15 @@ SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE
 SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
 	lock
 	faceplayer
-	compare VAR_0x405E, 1
+	compare VAR_RAYQUAZA_STATE, 1
 	goto_if_le SootopolisCity_EventScript_1E5F1B
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E5F1B
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E5F10
 	msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, SootopolisCity_Movement_2725A2
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -742,7 +742,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10
 	end
 
 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
-	dodailyevents
+	dotimebasedevents
 	special GetPlayerBigGuyGirlString
 	goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_1E5FBB
 	msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT
@@ -751,7 +751,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY
 	msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT
 	random 2
@@ -764,7 +764,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
 SootopolisCity_EventScript_1E5F79:: @ 81E5F79
 	giveitem_std ITEM_FIGY_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
 	release
 	end
@@ -772,7 +772,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79
 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
 	giveitem_std ITEM_IAPAPA_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
 	release
 	end
@@ -792,13 +792,13 @@ SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8
 
 SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
 	lockall
-	applymovement 2, SootopolisCity_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E600D
 	msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, SootopolisCity_Movement_2725A2
+	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -811,7 +811,7 @@ SootopolisCity_EventScript_1E600D:: @ 81E600D
 SootopolisCity_EventScript_1E6017:: @ 81E6017
 	lock
 	faceplayer
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E602E
 	msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT
 	release
@@ -825,11 +825,11 @@ SootopolisCity_EventScript_1E602E:: @ 81E602E
 SootopolisCity_EventScript_1E6038:: @ 81E6038
 	lock
 	faceplayer
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E607A
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E6084
-	compare VAR_0x405E, 2
+	compare VAR_RAYQUAZA_STATE, 2
 	goto_if_ge SootopolisCity_EventScript_1E6065
 	msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT
 	release
@@ -838,7 +838,7 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038
 SootopolisCity_EventScript_1E6065:: @ 81E6065
 	msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, SootopolisCity_Movement_2725A2
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -855,17 +855,17 @@ SootopolisCity_EventScript_1E6084:: @ 81E6084
 
 SootopolisCity_EventScript_1E608E:: @ 81E608E
 	lockall
-	applymovement 4, SootopolisCity_Movement_27259E
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E60D9
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E60CF
-	compare VAR_0x405E, 1
+	compare VAR_RAYQUAZA_STATE, 1
 	goto_if_le SootopolisCity_EventScript_1E60CF
 	msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, SootopolisCity_Movement_2725A2
+	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -882,18 +882,18 @@ SootopolisCity_EventScript_1E60D9:: @ 81E60D9
 
 SootopolisCity_EventScript_1E60E3:: @ 81E60E3
 	lockall
-	applymovement 5, SootopolisCity_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E612D
 	goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137
-	compare VAR_0x405E, 6
+	compare VAR_RAYQUAZA_STATE, 6
 	goto_if_ge SootopolisCity_EventScript_1E6141
-	compare VAR_0x405E, 1
+	compare VAR_RAYQUAZA_STATE, 1
 	goto_if_le SootopolisCity_EventScript_1E6141
 	msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, SootopolisCity_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -927,14 +927,14 @@ EventScript_ClosedSootopolisDoor:: @ 81E615D
 
 SootopolisCity_EventScript_1E6166:: @ 81E6166
 	lockall
-	applymovement 7, SootopolisCity_Movement_27259E
+	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
 	call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC
-	compare VAR_0x405E, 2
+	compare VAR_RAYQUAZA_STATE, 2
 	goto_if_eq SootopolisCity_EventScript_1E61AE
-	compare VAR_0x405E, 3
+	compare VAR_RAYQUAZA_STATE, 3
 	goto_if_eq SootopolisCity_EventScript_1E61C2
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	goto_if_eq SootopolisCity_EventScript_1E61C2
 	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8
 	msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT
@@ -1261,13 +1261,13 @@ SootopolisCity_Movement_1E635A: @ 81E635A
 
 SootopolisCity_EventScript_1E635D:: @ 81E635D
 	lockall
-	applymovement 15, SootopolisCity_Movement_27259E
+	applymovement 15, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E6388
 	msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 15, SootopolisCity_Movement_2725A2
+	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -1280,21 +1280,21 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388
 
 SootopolisCity_EventScript_1E6393:: @ 81E6393
 	lockall
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E63C7
 	msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT
 	closemessage
-	applymovement 14, SootopolisCity_Movement_27259E
+	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 14, SootopolisCity_Movement_2725A2
+	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SootopolisCity_EventScript_1E63C7:: @ 81E63C7
-	applymovement 14, SootopolisCity_Movement_27259E
+	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT
 	releaseall
@@ -1302,13 +1302,13 @@ SootopolisCity_EventScript_1E63C7:: @ 81E63C7
 
 SootopolisCity_EventScript_1E63DB:: @ 81E63DB
 	lockall
-	applymovement 13, SootopolisCity_Movement_27259E
+	applymovement 13, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E6406
 	msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 13, SootopolisCity_Movement_2725A2
+	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -1321,13 +1321,13 @@ SootopolisCity_EventScript_1E6406:: @ 81E6406
 
 SootopolisCity_EventScript_1E6411:: @ 81E6411
 	lockall
-	applymovement 12, SootopolisCity_Movement_27259E
+	applymovement 12, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E643C
 	msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT
 	closemessage
-	applymovement 12, SootopolisCity_Movement_2725A2
+	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -1340,7 +1340,7 @@ SootopolisCity_EventScript_1E643C:: @ 81E643C
 SootopolisCity_EventScript_1E6446:: @ 81E6446
 	lock
 	faceplayer
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	goto_if_eq SootopolisCity_EventScript_1E64D8
 	goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2
 	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F
@@ -1367,14 +1367,14 @@ SootopolisCity_EventScript_1E64B2:: @ 81E64B2
 	applymovement 18, SootopolisCity_Movement_1E64EC
 	waitmovement 0
 	moveobjectoffscreen 18
-	setvar VAR_0x40D8, 1
+	setvar VAR_SOOTOPOLIS_STATE, 1
 	return
 
 SootopolisCity_EventScript_1E64C5:: @ 81E64C5
 	applymovement 18, SootopolisCity_Movement_1E64EF
 	waitmovement 0
 	moveobjectoffscreen 18
-	setvar VAR_0x40D8, 2
+	setvar VAR_SOOTOPOLIS_STATE, 2
 	return
 
 SootopolisCity_EventScript_1E64D8:: @ 81E64D8
@@ -1399,7 +1399,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF
 
 SootopolisCity_EventScript_1E64F2:: @ 81E64F2
 	lockall
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E6509
 	msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT
 	closemessage
@@ -1415,7 +1415,7 @@ SootopolisCity_EventScript_1E6509:: @ 81E6509
 
 SootopolisCity_EventScript_1E651F:: @ 81E651F
 	lockall
-	compare VAR_0x405E, 5
+	compare VAR_RAYQUAZA_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_1E6536
 	msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT
 	closemessage
@@ -1435,7 +1435,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C
 	setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE
 	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
 	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
-	setvar VAR_0x40B9, 2
+	setvar VAR_MT_PYRE_STATE, 2
 	warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34
 	waitstate
 	releaseall
diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc
deleted file mode 100644
index 36d8d7b27..000000000
--- a/data/maps/SootopolisCity_Gym_1F/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SootopolisCity_Gym_1F_EventObjects: @ 8532FF4
-	object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0
-
-SootopolisCity_Gym_1F_MapWarps: @ 8533024
-	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: @ 853303C
-	bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F
-	bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F
-
-SootopolisCity_Gym_1F_MapEvents:: @ 8533054
-	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
deleted file mode 100644
index 1d71e0923..000000000
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_Gym_1F: @ 8483A28
-	.4byte SootopolisCity_Gym_1F_Layout
-	.4byte SootopolisCity_Gym_1F_MapEvents
-	.4byte SootopolisCity_Gym_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 109
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json
new file mode 100644
index 000000000..6b8cab149
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/map.json
@@ -0,0 +1,86 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+  "name": "SootopolisCity_Gym_1F",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_JUAN",
+      "x": 8,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_Gym_1F_EventScript_224F44",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 7,
+      "y": 24,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_Gym_1F_EventScript_225040",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 25,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 11,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 24,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SootopolisCity_Gym_1F_EventScript_22505F"
+    },
+    {
+      "type": "sign",
+      "x": 10,
+      "y": 24,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SootopolisCity_Gym_1F_EventScript_22506F"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index 22cd864cf..b9abdf656 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -1,8 +1,8 @@
 SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C
-	map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB
-	map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67
-	map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A
-	map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB
+	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_224E61
 	.byte 0
 
 SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61
@@ -99,14 +99,14 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44
 SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
 	message SootopolisCity_Gym_1F_Text_225598
 	waitmessage
-	call SootopolisCity_Gym_1F_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	setflag FLAG_BADGE08_GET
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
-	setvar VAR_0x405E, 6
+	setvar VAR_RAYQUAZA_STATE, 6
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
 	setvar VAR_0x8008, 8
 	call SootopolisCity_Gym_1F_EventScript_271F43
@@ -125,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4
 	giveitem_std ITEM_TM03
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM03
 	return
@@ -133,7 +133,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4
 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7
 	giveitem_std ITEM_TM03
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_Gym_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM03
 	release
diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc
deleted file mode 100644
index 0ca0287ad..000000000
--- a/data/maps/SootopolisCity_Gym_B1F/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SootopolisCity_Gym_B1F_EventObjects: @ 8533068
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0
-	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0
-	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0
-	object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0
-	object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0
-	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0
-	object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0
-
-SootopolisCity_Gym_B1F_MapWarps: @ 8533158
-	warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F
-
-SootopolisCity_Gym_B1F_MapEvents:: @ 8533160
-	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
deleted file mode 100644
index c06afbc1b..000000000
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_Gym_B1F: @ 8483A44
-	.4byte SootopolisCity_Gym_B1F_Layout
-	.4byte SootopolisCity_Gym_B1F_MapEvents
-	.4byte SootopolisCity_Gym_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GIM
-	.2byte 110
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_GYM
-
diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json
new file mode 100644
index 000000000..d378f84e2
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_B1F/map.json
@@ -0,0 +1,159 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F",
+  "name": "SootopolisCity_Gym_B1F",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F",
+  "music": "MUS_GIM",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 7,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225C8B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 9,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225CD0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225CB9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 11,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225CE7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225D15",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225D2C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 4,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225CA2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BEAUTY",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225CFE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225D5A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "SootopolisCity_Gym_B1F_EventScript_225D43",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 22,
+      "elevation": 3,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc
deleted file mode 100644
index 38885d648..000000000
--- a/data/maps/SootopolisCity_House1/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House1_EventObjects: @ 85332F8
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0
-	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0
-
-SootopolisCity_House1_MapWarps: @ 8533328
-	warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House1_MapEvents:: @ 8533338
-	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
deleted file mode 100644
index f7621f917..000000000
--- a/data/maps/SootopolisCity_House1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House1: @ 8483AB4
-	.4byte SootopolisCity_House1_Layout
-	.4byte SootopolisCity_House1_MapEvents
-	.4byte SootopolisCity_House1_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 307
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json
new file mode 100644
index 000000000..2be2adebe
--- /dev/null
+++ b/data/maps/SootopolisCity_House1/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_HOUSE1",
+  "name": "SootopolisCity_House1",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House1_EventScript_22694D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House1_EventScript_22698E",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc
index 9dcc1031d..13b581c71 100644
--- a/data/maps/SootopolisCity_House1/scripts.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
@@ -8,7 +8,7 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D
 	msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM31
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_House1_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM31
 	msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc
deleted file mode 100644
index 509eeb46f..000000000
--- a/data/maps/SootopolisCity_House2/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House2_EventObjects: @ 853334C
-	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0
-
-SootopolisCity_House2_MapWarps: @ 8533364
-	warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House2_MapEvents:: @ 8533374
-	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
deleted file mode 100644
index c32962718..000000000
--- a/data/maps/SootopolisCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House2: @ 8483AD0
-	.4byte SootopolisCity_House2_Layout
-	.4byte SootopolisCity_House2_MapEvents
-	.4byte SootopolisCity_House2_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 308
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json
new file mode 100644
index 000000000..af03fdff5
--- /dev/null
+++ b/data/maps/SootopolisCity_House2/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_HOUSE2",
+  "name": "SootopolisCity_House2",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House2_EventScript_226A77",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc
deleted file mode 100644
index 5a91765c5..000000000
--- a/data/maps/SootopolisCity_House3/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House3_EventObjects: @ 8533388
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0
-
-SootopolisCity_House3_MapWarps: @ 85333B8
-	warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House3_MapEvents:: @ 85333C8
-	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
deleted file mode 100644
index bd90fabc0..000000000
--- a/data/maps/SootopolisCity_House3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House3: @ 8483AEC
-	.4byte SootopolisCity_House3_Layout
-	.4byte SootopolisCity_House3_MapEvents
-	.4byte SootopolisCity_House3_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 309
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json
new file mode 100644
index 000000000..af925c4c9
--- /dev/null
+++ b/data/maps/SootopolisCity_House3/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_HOUSE3",
+  "name": "SootopolisCity_House3",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House3_EventScript_226B72",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_2",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House3_EventScript_226B9B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc
deleted file mode 100644
index 3bd0aed0e..000000000
--- a/data/maps/SootopolisCity_House4/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SootopolisCity_House4_EventObjects: @ 85333DC
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0
-	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0
-
-SootopolisCity_House4_MapWarps: @ 8533424
-	warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House4_MapEvents:: @ 8533434
-	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
deleted file mode 100644
index f71568287..000000000
--- a/data/maps/SootopolisCity_House4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House4: @ 8483B08
-	.4byte SootopolisCity_House1_Layout
-	.4byte SootopolisCity_House4_MapEvents
-	.4byte SootopolisCity_House4_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 307
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json
new file mode 100644
index 000000000..db7ffd5d4
--- /dev/null
+++ b/data/maps/SootopolisCity_House4/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_HOUSE4",
+  "name": "SootopolisCity_House4",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_1",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House4_EventScript_226D16",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+      "x": 5,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House4_EventScript_226D1F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_AZUMARILL",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House4_EventScript_226D28",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 7
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 7
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc
deleted file mode 100644
index 321de8b64..000000000
--- a/data/maps/SootopolisCity_House5/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House5_EventObjects: @ 8533448
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0
-
-SootopolisCity_House5_MapWarps: @ 8533478
-	warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House5_MapEvents:: @ 8533488
-	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
deleted file mode 100644
index d3d90fb05..000000000
--- a/data/maps/SootopolisCity_House5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House5: @ 8483B24
-	.4byte SootopolisCity_House2_Layout
-	.4byte SootopolisCity_House5_MapEvents
-	.4byte SootopolisCity_House5_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 308
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json
new file mode 100644
index 000000000..5e20e33df
--- /dev/null
+++ b/data/maps/SootopolisCity_House5/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_HOUSE5",
+  "name": "SootopolisCity_House5",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MANIAC",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House5_EventScript_226E94",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House5_EventScript_226E9D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 8
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 8
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc
deleted file mode 100644
index 40fd1d0a7..000000000
--- a/data/maps/SootopolisCity_House6/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House6_EventObjects: @ 853349C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0
-
-SootopolisCity_House6_MapWarps: @ 85334B4
-	warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House6_MapEvents:: @ 85334C4
-	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
deleted file mode 100644
index e3daef4ed..000000000
--- a/data/maps/SootopolisCity_House6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House6: @ 8483B40
-	.4byte SootopolisCity_House3_Layout
-	.4byte SootopolisCity_House6_MapEvents
-	.4byte SootopolisCity_House6_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 309
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json
new file mode 100644
index 000000000..717590318
--- /dev/null
+++ b/data/maps/SootopolisCity_House6/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_HOUSE6",
+  "name": "SootopolisCity_House6",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 4,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House6_EventScript_226F5C",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 9
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 9
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc
index efa197c8d..0f175478a 100644
--- a/data/maps/SootopolisCity_House6/scripts.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
@@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3
 
 SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD
 	bufferdecorationname 1, 117
-	msgbox gUnknown_08272B1A, MSGBOX_DEFAULT
+	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc
deleted file mode 100644
index d2f4e1ff2..000000000
--- a/data/maps/SootopolisCity_House7/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House7_EventObjects: @ 85334D8
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0
-	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0
-
-SootopolisCity_House7_MapWarps: @ 8533508
-	warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House7_MapEvents:: @ 8533518
-	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
deleted file mode 100644
index db988ed22..000000000
--- a/data/maps/SootopolisCity_House7/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_House7: @ 8483B5C
-	.4byte SootopolisCity_House1_Layout
-	.4byte SootopolisCity_House7_MapEvents
-	.4byte SootopolisCity_House7_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 307
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json
new file mode 100644
index 000000000..4d500fcb0
--- /dev/null
+++ b/data/maps/SootopolisCity_House7/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_HOUSE7",
+  "name": "SootopolisCity_House7",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 5,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House7_EventScript_2270CC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_House7_EventScript_2270D5",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 10
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 10
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc
deleted file mode 100644
index 07c18bae5..000000000
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C
-	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0
-
-SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C
-	warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C
-	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D
-	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B
-
-SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584
-	map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents
-
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
deleted file mode 100644
index 47f68b58f..000000000
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_LotadAndSeedotHouse: @ 8483B78
-	.4byte SootopolisCity_LotadAndSeedotHouse_Layout
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapEvents
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 297
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
new file mode 100644
index 000000000..d7ed8b980
--- /dev/null
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
@@ -0,0 +1,79 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
+  "name": "SootopolisCity_LotadAndSeedotHouse",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 11
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 11
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22734D"
+    },
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22735B"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc
deleted file mode 100644
index 32fc081d2..000000000
--- a/data/maps/SootopolisCity_Mart/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SootopolisCity_Mart_EventObjects: @ 853328C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0
-
-SootopolisCity_Mart_MapWarps: @ 85332D4
-	warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_Mart_MapEvents:: @ 85332E4
-	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
deleted file mode 100644
index 131540c7a..000000000
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_Mart: @ 8483A98
-	.4byte Mart_Layout
-	.4byte SootopolisCity_Mart_MapEvents
-	.4byte SootopolisCity_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json
new file mode 100644
index 000000000..e9b978013
--- /dev/null
+++ b/data/maps/SootopolisCity_Mart/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_MART",
+  "name": "SootopolisCity_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_Mart_EventScript_226795",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_Mart_EventScript_2267C2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_Mart_EventScript_2267EC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 4a152bcf0..fe0270d62 100644
--- a/data/maps/SootopolisCity_Mart/scripts.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
@@ -28,7 +28,7 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC
 SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2
 	lock
 	faceplayer
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	goto_if_ge SootopolisCity_Mart_EventScript_2267E2
 	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2
 	msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT
@@ -43,7 +43,7 @@ SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2
 SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC
 	lock
 	faceplayer
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	goto_if_ge SootopolisCity_Mart_EventScript_22680C
 	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C
 	msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
deleted file mode 100644
index 65a265578..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0
-
-SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0
-	warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY
-	warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F
-
-SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8
-	map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
deleted file mode 100644
index 153be53cb..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_MysteryEventsHouse_1F: @ 8483B94
-	.4byte SootopolisCity_MysteryEventsHouse_1F_Layout
-	.4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents
-	.4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 439
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
new file mode 100644
index 000000000..791b9fdaa
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
+  "name": "SootopolisCity_MysteryEventsHouse_1F",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
+      "x": 6,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 12
+    },
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 0493cb05f..c7ceb0a4f 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -1,6 +1,6 @@
 SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
-	map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E
-	map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
 	.byte 0
 
 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
@@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
-	compare VAR_0x40C0, 0
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
 	call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
 	end
 
@@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 3, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
-	setmaplayoutindex 441
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
@@ -25,9 +25,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
-	map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
 	.2byte 0
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
@@ -37,16 +37,16 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
 	applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
 	waitmovement 0
 	moveobjectoffscreen 1
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
-	compare VAR_0x40C0, 1
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
-	compare VAR_0x40C0, 2
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
-	compare VAR_0x40C0, 3
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
 	special LoadPlayerParty
-	setvar VAR_0x40C0, 0
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
 	releaseall
 	end
 
@@ -102,7 +102,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
 	special LoadPlayerParty
-	call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
 	special SavePlayerParty
@@ -129,7 +129,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT
 	fadescreen 1
-	special sub_80F9438
+	special ChooseHalfPartyForBattle
 	waitstate
 	return
 
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
deleted file mode 100644
index 5cdbf0559..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC
-	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
-
-SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4
-	warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
-
-SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC
-	map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
deleted file mode 100644
index e0355b074..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_Layout
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_RUNECITY
-	.2byte 440
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json
new file mode 100644
index 000000000..dbb651a44
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
+  "name": "SootopolisCity_MysteryEventsHouse_B1F",
+  "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
+  "music": "MUS_RUNECITY",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 6,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
index 0de8651d7..374aa6270 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
@@ -1,6 +1,6 @@
 SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F
-	map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A
-	map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E
 	.byte 0
 
 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A
@@ -40,19 +40,19 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	end
 
 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF
-	setvar VAR_0x40C0, 3
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
 	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT
 	return
 
 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD
-	setvar VAR_0x40C0, 1
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
-	setvar VAR_0x40C0, 2
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
deleted file mode 100644
index b5a221dad..000000000
--- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0
-
-SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4
-	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:: @ 85331EC
-	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
deleted file mode 100644
index 75da1fc47..000000000
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_PokemonCenter_1F: @ 8483A60
-	.4byte PokemonCenter_1F_Layout
-	.4byte SootopolisCity_PokemonCenter_1F_MapEvents
-	.4byte SootopolisCity_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..90a8dcdad
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F",
+  "name": "SootopolisCity_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 12,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 2,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_SOOTOPOLIS_CITY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index 2e7e804ce..97cb2d4d7 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
-	map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC
-	map_script 5, SootopolisCity_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC
+	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC
@@ -18,7 +18,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500
 SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E
 	lock
 	faceplayer
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E
 	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E
 	msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT
@@ -33,7 +33,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E
 SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538
 	lock
 	faceplayer
-	compare VAR_0x40CA, 2
+	compare VAR_SKY_PILLAR_STATE, 2
 	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558
 	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558
 	msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
deleted file mode 100644
index 0062c87e1..000000000
--- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260
-	warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278
-	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
deleted file mode 100644
index f9e1c5189..000000000
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_PokemonCenter_2F: @ 8483A7C
-	.4byte PokemonCenter_2F_Layout
-	.4byte SootopolisCity_PokemonCenter_2F_MapEvents
-	.4byte SootopolisCity_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_SOOTOPOLIS_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..33308de7b
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F",
+  "name": "SootopolisCity_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 43d8a9d2f..275fe3046 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D
-	map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782
diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc
deleted file mode 100644
index 14dc7169b..000000000
--- a/data/maps/SouthernIsland_Exterior/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SouthernIsland_Exterior_EventObjects: @ 853B83C
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
-
-SouthernIsland_Exterior_MapWarps: @ 853B86C
-	warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR
-	warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR
-
-SouthernIsland_Exterior_MapBGEvents: @ 853B87C
-	bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C
-
-SouthernIsland_Exterior_MapEvents:: @ 853B888
-	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
deleted file mode 100644
index 4aa0eff1a..000000000
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SouthernIsland_Exterior: @ 8485238
-	.4byte SouthernIsland_Exterior_Layout
-	.4byte SouthernIsland_Exterior_MapEvents
-	.4byte SouthernIsland_Exterior_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 290
-	.byte MAPSEC_SOUTHERN_ISLAND
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json
new file mode 100644
index 000000000..26447c163
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/map.json
@@ -0,0 +1,71 @@
+{
+  "id": "MAP_SOUTHERN_ISLAND_EXTERIOR",
+  "name": "SouthernIsland_Exterior",
+  "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_SOUTHERN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+      "x": 13,
+      "y": 23,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "SouthernIsland_Exterior_EventScript_2429D2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
+      "x": 13,
+      "y": 25,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 15,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 7,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "SouthernIsland_Exterior_EventScript_242A3C"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
index 388410821..618ce864a 100644
--- a/data/maps/SouthernIsland_Exterior/scripts.inc
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
@@ -1,5 +1,5 @@
 SouthernIsland_Exterior_MapScripts:: @ 82429C8
-	map_script 3, SouthernIsland_Exterior_MapScript1_2429CE
+	map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_2429CE
 	.byte 0
 
 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE
@@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2
 	goto_if_eq SouthernIsland_Exterior_EventScript_242A17
 	msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR
diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc
deleted file mode 100644
index 000386c33..000000000
--- a/data/maps/SouthernIsland_Interior/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SouthernIsland_Interior_EventObjects: @ 853B89C
-	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
-	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
-
-SouthernIsland_Interior_MapWarps: @ 853B8CC
-	warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
-	warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR
-
-SouthernIsland_Interior_MapBGEvents: @ 853B8DC
-	bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4
-
-SouthernIsland_Interior_MapEvents:: @ 853B8E8
-	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
deleted file mode 100644
index b1238c4f7..000000000
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SouthernIsland_Interior: @ 8485254
-	.4byte SouthernIsland_Interior_Layout
-	.4byte SouthernIsland_Interior_MapEvents
-	.4byte SouthernIsland_Interior_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN02
-	.2byte 291
-	.byte MAPSEC_SOUTHERN_ISLAND
-	.byte 0
-	.byte WEATHER_SHADE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json
new file mode 100644
index 000000000..5fd8354f6
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/map.json
@@ -0,0 +1,71 @@
+{
+  "id": "MAP_SOUTHERN_ISLAND_INTERIOR",
+  "name": "SouthernIsland_Interior",
+  "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR",
+  "music": "MUS_DAN02",
+  "region_map_section": "MAPSEC_SOUTHERN_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 13,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 13,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 14,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 11,
+      "elevation": 3,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SouthernIsland_Interior_EventScript_242AC4"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 4f8dba7e5..958c5f546 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -1,6 +1,6 @@
 SouthernIsland_Interior_MapScripts:: @ 8242A45
-	map_script 5, SouthernIsland_Interior_MapScript1_242A50
-	map_script 3, SouthernIsland_Interior_MapScript1_242A6E
+	map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50
+	map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_242A6E
 	.byte 0
 
 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
@@ -10,14 +10,14 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne SouthernIsland_Interior_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 2
 	return
 
 SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E
-	compare VAR_0x40D5, 0
+	compare VAR_ROAMER_POKEMON, 0
 	call_if_eq SouthernIsland_Interior_EventScript_242A8A
-	compare VAR_0x40D5, 0
+	compare VAR_ROAMER_POKEMON, 0
 	call_if_ne SouthernIsland_Interior_EventScript_242A95
 	call SouthernIsland_Interior_EventScript_242AA0
 	end
@@ -77,9 +77,9 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
 	delay 50
 	special RemoveCameraObject
 	setvar VAR_LAST_TALKED, 2
-	compare VAR_0x40D5, 0
+	compare VAR_ROAMER_POKEMON, 0
 	call_if_eq SouthernIsland_Interior_EventScript_242BA4
-	compare VAR_0x40D5, 0
+	compare VAR_ROAMER_POKEMON, 0
 	call_if_ne SouthernIsland_Interior_EventScript_242BB7
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special BattleSetup_StartLatiBattle
diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc
deleted file mode 100644
index 553b4151a..000000000
--- a/data/maps/TerraCave_End/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-TerraCave_End_EventObjects: @ 8537850
-	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON
-
-TerraCave_End_MapWarps: @ 8537868
-	warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE
-
-TerraCave_End_MapCoordEvents: @ 8537870
-	coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC
-
-TerraCave_End_MapEvents:: @ 8537880
-	map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0
-
diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc
deleted file mode 100644
index 8ba9f7d45..000000000
--- a/data/maps/TerraCave_End/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TerraCave_End: @ 8484A3C
-	.4byte TerraCave_End_Layout
-	.4byte TerraCave_End_MapEvents
-	.4byte TerraCave_End_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 409
-	.byte MAPSEC_TERRA_CAVE
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json
new file mode 100644
index 000000000..991743d63
--- /dev/null
+++ b/data/maps/TerraCave_End/map.json
@@ -0,0 +1,52 @@
+{
+  "id": "MAP_TERRA_CAVE_END",
+  "name": "TerraCave_End",
+  "layout": "LAYOUT_TERRA_CAVE_END",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_TERRA_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GROUDON_1",
+      "x": 17,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_TERRA_CAVE_GROUDON"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "dest_map": "MAP_TERRA_CAVE_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 26,
+      "elevation": 3,
+      "var": "VAR_TEMP_1",
+      "var_value": "1",
+      "script": "TerraCave_End_EventScript_23B0EC"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
index a3164136d..b5a664a76 100644
--- a/data/maps/TerraCave_End/scripts.inc
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -1,6 +1,6 @@
 TerraCave_End_MapScripts:: @ 823B0B0
-	map_script 5, TerraCave_End_MapScript1_23B0BB
-	map_script 3, TerraCave_End_MapScript1_23B0D9
+	map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB
+	map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_23B0D9
 	.byte 0
 
 TerraCave_End_MapScript1_23B0BB: @ 823B0BB
@@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB
 TerraCave_End_EventScript_23B0C5:: @ 823B0C5
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne TerraCave_End_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 
@@ -25,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3
 
 TerraCave_End_EventScript_23B0EC:: @ 823B0EC
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	applymovement 1, TerraCave_End_Movement_23B16E
 	waitmovement 0
@@ -47,13 +47,13 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC
 	goto_if_eq TerraCave_End_EventScript_23B163
 	compare VAR_RESULT, 5
 	goto_if_eq TerraCave_End_EventScript_23B163
-	setvar VAR_0x4039, 1
+	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_GROUDON
 	releaseall
 	end
 
 TerraCave_End_EventScript_23B155:: @ 823B155
-	setvar VAR_0x4039, 1
+	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_GROUDON
 	goto TerraCave_End_EventScript_27376D
 	end
diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc
deleted file mode 100644
index a176c548d..000000000
--- a/data/maps/TerraCave_Entrance/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TerraCave_Entrance_MapWarps: @ 853782C
-	warp_def 8, 18, 0, 127, MAP_NONE
-	warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END
-
-TerraCave_Entrance_MapEvents:: @ 853783C
-	map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc
deleted file mode 100644
index b75c86799..000000000
--- a/data/maps/TerraCave_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TerraCave_Entrance: @ 8484A20
-	.4byte TerraCave_Entrance_Layout
-	.4byte TerraCave_Entrance_MapEvents
-	.4byte TerraCave_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 408
-	.byte MAPSEC_TERRA_CAVE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json
new file mode 100644
index 000000000..8ca5c69df
--- /dev/null
+++ b/data/maps/TerraCave_Entrance/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_TERRA_CAVE_ENTRANCE",
+  "name": "TerraCave_Entrance",
+  "layout": "LAYOUT_TERRA_CAVE_ENTRANCE",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_TERRA_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 14,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TERRA_CAVE_END",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc
index b9a17701b..b9e3e5910 100644
--- a/data/maps/TerraCave_Entrance/scripts.inc
+++ b/data/maps/TerraCave_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 TerraCave_Entrance_MapScripts:: @ 823B0A6
-	map_script 3, TerraCave_Entrance_MapScript1_23B0AC
+	map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_23B0AC
 	.byte 0
 
 TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC
diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc
deleted file mode 100644
index 8991b6aab..000000000
--- a/data/maps/TradeCenter/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-TradeCenter_EventObjects: @ 8539DA0
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0
-
-TradeCenter_MapWarps: @ 8539DB8
-	warp_def 5, 8, 3, 127, MAP_NONE
-	warp_def 6, 8, 3, 127, MAP_NONE
-
-TradeCenter_MapCoordEvents: @ 8539DC8
-	coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5
-	coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF
-
-TradeCenter_MapEvents:: @ 8539DE8
-	map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
-
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
deleted file mode 100644
index 9b621cb02..000000000
--- a/data/maps/TradeCenter/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TradeCenter: @ 8484D4C
-	.4byte TradeCenter_Layout
-	.4byte TradeCenter_MapEvents
-	.4byte TradeCenter_MapScripts
-	.4byte 0x0
-	.2byte MUS_RAINBOW
-	.2byte 222
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json
new file mode 100644
index 000000000..1c409132d
--- /dev/null
+++ b/data/maps/TradeCenter/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_TRADE_CENTER",
+  "name": "TradeCenter",
+  "layout": "LAYOUT_TRADE_CENTER",
+  "music": "MUS_RAINBOW",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TradeCenter_EventScript_2774B6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_TradeCenter_Chair0"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": "0",
+      "script": "EventScript_TradeCenter_Chair1"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc
deleted file mode 100644
index 2a2428f57..000000000
--- a/data/maps/TrainerHill_1F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_1F_MapWarps: @ 853D934
-	warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE
-	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F
-
-TrainerHill_1F_MapEvents:: @ 853D944
-	map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc
deleted file mode 100644
index 3c6b58119..000000000
--- a/data/maps/TrainerHill_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_1F: @ 84857E8
-	.4byte TrainerHill_1F_Layout
-	.4byte TrainerHill_1F_MapEvents
-	.4byte TrainerHill_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 415
-	.byte MAPSEC_TRAINER_HILL
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json
new file mode 100644
index 000000000..77c8ee094
--- /dev/null
+++ b/data/maps/TrainerHill_1F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_TRAINER_HILL_1F",
+  "name": "TrainerHill_1F",
+  "layout": "LAYOUT_TRAINER_HILL_1F",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_HILL",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc
index 465a6d781..e726f8566 100644
--- a/data/maps/TrainerHill_1F/scripts.inc
+++ b/data/maps/TrainerHill_1F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_1F_MapScripts:: @ 8268F71
-	map_script 5, TrainerHill_1F_MapScript1_2C8336
-	map_script 4, TrainerHill_1F_MapScript2_2C8372
-	map_script 2, TrainerHill_1F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381
 	.byte 0
 
diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc
deleted file mode 100644
index ca50380d5..000000000
--- a/data/maps/TrainerHill_2F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_2F_MapWarps: @ 853D958
-	warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F
-	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F
-
-TrainerHill_2F_MapEvents:: @ 853D968
-	map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc
deleted file mode 100644
index d8343060c..000000000
--- a/data/maps/TrainerHill_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_2F: @ 8485804
-	.4byte TrainerHill_2F_Layout
-	.4byte TrainerHill_2F_MapEvents
-	.4byte TrainerHill_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 416
-	.byte MAPSEC_TRAINER_HILL
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json
new file mode 100644
index 000000000..a10f68baf
--- /dev/null
+++ b/data/maps/TrainerHill_2F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_TRAINER_HILL_2F",
+  "name": "TrainerHill_2F",
+  "layout": "LAYOUT_TRAINER_HILL_2F",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_HILL",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_3F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc
index ca8eeff72..dd1f356de 100644
--- a/data/maps/TrainerHill_2F/scripts.inc
+++ b/data/maps/TrainerHill_2F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_2F_MapScripts:: @ 8268F81
-	map_script 5, TrainerHill_2F_MapScript1_2C8336
-	map_script 4, TrainerHill_2F_MapScript2_2C8372
-	map_script 2, TrainerHill_2F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381
 	.byte 0
 
diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc
deleted file mode 100644
index e12394655..000000000
--- a/data/maps/TrainerHill_3F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_3F_MapWarps: @ 853D97C
-	warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F
-	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F
-
-TrainerHill_3F_MapEvents:: @ 853D98C
-	map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc
deleted file mode 100644
index db82eb277..000000000
--- a/data/maps/TrainerHill_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_3F: @ 8485820
-	.4byte TrainerHill_3F_Layout
-	.4byte TrainerHill_3F_MapEvents
-	.4byte TrainerHill_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 417
-	.byte MAPSEC_TRAINER_HILL
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json
new file mode 100644
index 000000000..dfaa57f59
--- /dev/null
+++ b/data/maps/TrainerHill_3F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_TRAINER_HILL_3F",
+  "name": "TrainerHill_3F",
+  "layout": "LAYOUT_TRAINER_HILL_3F",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_HILL",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_4F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc
index 921a8d808..b4793f457 100644
--- a/data/maps/TrainerHill_3F/scripts.inc
+++ b/data/maps/TrainerHill_3F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_3F_MapScripts:: @ 8268F91
-	map_script 5, TrainerHill_3F_MapScript1_2C8336
-	map_script 2, TrainerHill_3F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381
 	.byte 0
 
diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc
deleted file mode 100644
index e9696de15..000000000
--- a/data/maps/TrainerHill_4F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_4F_MapWarps: @ 853D9A0
-	warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F
-	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF
-
-TrainerHill_4F_MapEvents:: @ 853D9B0
-	map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc
deleted file mode 100644
index d699f53d5..000000000
--- a/data/maps/TrainerHill_4F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_4F: @ 848583C
-	.4byte TrainerHill_4F_Layout
-	.4byte TrainerHill_4F_MapEvents
-	.4byte TrainerHill_4F_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 418
-	.byte MAPSEC_TRAINER_HILL
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json
new file mode 100644
index 000000000..01f20a8f7
--- /dev/null
+++ b/data/maps/TrainerHill_4F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_TRAINER_HILL_4F",
+  "name": "TrainerHill_4F",
+  "layout": "LAYOUT_TRAINER_HILL_4F",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_HILL",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_3F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_ROOF",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc
index 0f710152c..66b8ed3bb 100644
--- a/data/maps/TrainerHill_4F/scripts.inc
+++ b/data/maps/TrainerHill_4F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_4F_MapScripts:: @ 8268F9C
-	map_script 5, TrainerHill_4F_MapScript1_2C8336
-	map_script 2, TrainerHill_4F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381
 	.byte 0
 
diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc
deleted file mode 100644
index 0125c9936..000000000
--- a/data/maps/TrainerHill_Elevator/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-TrainerHill_Elevator_EventObjects: @ 853DD84
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0
-
-TrainerHill_Elevator_MapWarps: @ 853DD9C
-	warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF
-	warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF
-
-TrainerHill_Elevator_MapEvents:: @ 853DDAC
-	map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc
deleted file mode 100644
index 936b7712d..000000000
--- a/data/maps/TrainerHill_Elevator/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_Elevator: @ 8485ADC
-	.4byte BattleElevator_Layout
-	.4byte TrainerHill_Elevator_MapEvents
-	.4byte TrainerHill_Elevator_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 266
-	.byte MAPSEC_TRAINER_HILL
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json
new file mode 100644
index 000000000..03354b0da
--- /dev/null
+++ b/data/maps/TrainerHill_Elevator/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_TRAINER_HILL_ELEVATOR",
+  "name": "TrainerHill_Elevator",
+  "layout": "LAYOUT_BATTLE_ELEVATOR",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_HILL",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 0,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TrainerHill_Elevator_EventScript_26935F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_ROOF",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_ROOF",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc
index c3a71d492..ecc48a9e9 100644
--- a/data/maps/TrainerHill_Elevator/scripts.inc
+++ b/data/maps/TrainerHill_Elevator/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_Elevator_MapScripts:: @ 826934F
-	map_script 2, TrainerHill_Elevator_MapScript2_269355
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355
 	.byte 0
 
 TrainerHill_Elevator_MapScript2_269355: @ 8269355
diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc
deleted file mode 100644
index 30817defc..000000000
--- a/data/maps/TrainerHill_Entrance/events.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-TrainerHill_Entrance_EventObjects: @ 853D874
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0
-	object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0
-	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0
-
-TrainerHill_Entrance_MapWarps: @ 853D8EC
-	warp_def 9, 16, 3, 4, MAP_ROUTE111
-	warp_def 10, 16, 3, 4, MAP_ROUTE111
-	warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F
-
-TrainerHill_Entrance_MapCoordEvents: @ 853D904
-	coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229
-
-TrainerHill_Entrance_MapBGEvents: @ 853D914
-	bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388
-
-TrainerHill_Entrance_MapEvents:: @ 853D920
-	map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents
-
diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc
deleted file mode 100644
index 79d6c8b96..000000000
--- a/data/maps/TrainerHill_Entrance/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_Entrance: @ 84857CC
-	.4byte TrainerHill_Entrance_Layout
-	.4byte TrainerHill_Entrance_MapEvents
-	.4byte TrainerHill_Entrance_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 414
-	.byte MAPSEC_TRAINER_HILL
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json
new file mode 100644
index 000000000..42f1daa9d
--- /dev/null
+++ b/data/maps/TrainerHill_Entrance/map.json
@@ -0,0 +1,127 @@
+{
+  "id": "MAP_TRAINER_HILL_ENTRANCE",
+  "name": "TrainerHill_Entrance",
+  "layout": "LAYOUT_TRAINER_HILL_ENTRANCE",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_HILL",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 11,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TrainerHill_Entrance_EventScript_2681FD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TrainerHill_Entrance_EventScript_2681EF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TrainerHill_Entrance_EventScript_2683C7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+      "x": 5,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TrainerHill_Entrance_EventScript_2683AC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TrainerHill_Entrance_EventScript_268391",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE111",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TRAINER_HILL_IS_ACTIVE",
+      "var_value": "0",
+      "script": "TrainerHill_Entrance_EventScript_268229"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "TrainerHill_Entrance_EventScript_268388"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 846b7f6c3..63e067a9a 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -1,9 +1,9 @@
 TrainerHill_Entrance_MapScripts:: @ 82680AC
-	map_script 5, TrainerHill_Entrance_MapScript1_2680D0
-	map_script 7, TrainerHill_Entrance_MapScript1_26811B
-	map_script 3, TrainerHill_Entrance_MapScript1_2680C6
-	map_script 1, TrainerHill_Entrance_MapScript1_268128
-	map_script 2, TrainerHill_Entrance_MapScript2_26813E
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_MapScript1_2680C6
+	map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E
 	.byte 0
 
 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6
@@ -15,10 +15,10 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
 	end
 
 TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_9
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 0
 	goto_if_eq TrainerHill_Entrance_EventScript_2680FF
@@ -27,7 +27,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
 	end
 
 TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
-	setvar VAR_0x8004, 16
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_16
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_Entrance_EventScript_26811A
@@ -74,12 +74,12 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
 
 TrainerHill_Entrance_EventScript_268182:: @ 8268182
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Entrance_EventScript_2681B5
-	case 1, TrainerHill_Entrance_EventScript_2681CA
-	case 2, TrainerHill_Entrance_EventScript_2681EE
+	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_2681B5
+	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_2681CA
+	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_2681EE
 
 TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5
 	lockall
@@ -96,7 +96,7 @@ TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
 	closemessage
 	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
 	waitmovement 0
-	setvar VAR_0x40D6, 0
+	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special HealPlayerParty
 	releaseall
 
@@ -114,7 +114,7 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
 TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
 	lock
 	faceplayer
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_10
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 0
 	goto_if_eq TrainerHill_Entrance_EventScript_26821F
@@ -133,11 +133,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229
 	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
 	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
 	msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_13
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 0
 	call_if_eq TrainerHill_Entrance_EventScript_26832E
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_8
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_Entrance_EventScript_268275
@@ -168,14 +168,14 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
 	switch VAR_RESULT
 	case 4, TrainerHill_Entrance_EventScript_268314
 	case 127, TrainerHill_Entrance_EventScript_268314
-	setvar VAR_0x8004, 17
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
 	copyvar VAR_0x8005, VAR_RESULT
 	special CallTrainerHillFunction
-	setvar VAR_0x40D6, 1
+	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
 	msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_START
 	special CallTrainerHillFunction
 	releaseall
 	end
@@ -191,18 +191,18 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314
 
 TrainerHill_Entrance_EventScript_26832E:: @ 826832E
 	msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_5, 1
-	call TrainerHill_Entrance_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq TrainerHill_Entrance_EventScript_26835C
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
 	special CallTrainerHillFunction
 	return
 
 TrainerHill_Entrance_EventScript_26835C:: @ 826835C
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_15
 	special CallTrainerHillFunction
 	goto TrainerHill_Entrance_EventScript_268314
 	end
diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc
deleted file mode 100644
index eeab57317..000000000
--- a/data/maps/TrainerHill_Roof/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-TrainerHill_Roof_EventObjects: @ 853D9C4
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0
-
-TrainerHill_Roof_MapWarps: @ 853D9DC
-	warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F
-	warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR
-
-TrainerHill_Roof_MapEvents:: @ 853D9EC
-	map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc
deleted file mode 100644
index 9f0b0dd3b..000000000
--- a/data/maps/TrainerHill_Roof/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TrainerHill_Roof: @ 8485858
-	.4byte TrainerHill_Roof_Layout
-	.4byte TrainerHill_Roof_MapEvents
-	.4byte TrainerHill_Roof_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 419
-	.byte MAPSEC_TRAINER_HILL
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json
new file mode 100644
index 000000000..8a623028e
--- /dev/null
+++ b/data/maps/TrainerHill_Roof/map.json
@@ -0,0 +1,49 @@
+{
+  "id": "MAP_TRAINER_HILL_ROOF",
+  "name": "TrainerHill_Roof",
+  "layout": "LAYOUT_TRAINER_HILL_ROOF",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_HILL",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 12,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "TrainerHill_Roof_EventScript_268FB2",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_HILL_4F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_HILL_ELEVATOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index b959481f2..bf467e100 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -1,14 +1,14 @@
 TrainerHill_Roof_MapScripts:: @ 8268FA7
-	map_script 5, TrainerHill_Roof_MapScript1_2C8336
-	map_script 2, TrainerHill_Roof_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381
 	.byte 0
 
 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_12
 	special CallTrainerHillFunction
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_1
 	special CallTrainerHillFunction
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_268FEA
@@ -19,7 +19,7 @@ TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA
 	msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT
 
 TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_2
 	special CallTrainerHillFunction
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_269020
@@ -41,7 +41,7 @@ TrainerHill_Roof_EventScript_269037:: @ 8269037
 	goto TrainerHill_Roof_EventScript_269054
 
 TrainerHill_Roof_EventScript_269054:: @ 8269054
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_3
 	special CallTrainerHillFunction
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_269082
diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc
deleted file mode 100644
index b0b1aa108..000000000
--- a/data/maps/Underwater1/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Underwater1_MapConnectionsList: @ 8486D38
-	connection down, 0, MAP_UNDERWATER2
-	connection emerge, 0, MAP_ROUTE124
-
-Underwater1_MapConnections: @ 8486D50
-	.4byte 0x2
-	.4byte Underwater1_MapConnectionsList
-
diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc
deleted file mode 100644
index 7d3866eb0..000000000
--- a/data/maps/Underwater1/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Underwater1_MapBGEvents: @ 852CEB4
-	bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS
-	bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD
-	bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL
-	bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL
-	bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1
-	bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM
-	bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2
-
-Underwater1_MapEvents:: @ 852CF08
-	map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents
-
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
deleted file mode 100644
index 7cf954299..000000000
--- a/data/maps/Underwater1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater1: @ 8482A30
-	.4byte Underwater1_Layout
-	.4byte Underwater1_MapEvents
-	.4byte Underwater1_MapScripts
-	.4byte Underwater1_MapConnections
-	.2byte MUS_DEEPDEEP
-	.2byte 274
-	.byte MAPSEC_UNDERWATER_124
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json
new file mode 100644
index 000000000..7fd45b45f
--- /dev/null
+++ b/data/maps/Underwater1/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_UNDERWATER1",
+  "name": "Underwater1",
+  "layout": "LAYOUT_UNDERWATER1",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_124",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_UNDERWATER2"
+    },
+    {
+      "direction": "emerge",
+      "offset": 0,
+      "map": "MAP_ROUTE124"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 42,
+      "y": 51,
+      "elevation": 0,
+      "item": "ITEM_CARBOS",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS"
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 40,
+      "elevation": 0,
+      "item": "ITEM_GREEN_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD"
+    },
+    {
+      "type": "hidden_item",
+      "x": 66,
+      "y": 34,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 64,
+      "y": 54,
+      "elevation": 3,
+      "item": "ITEM_BIG_PEARL",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 70,
+      "y": 64,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1"
+    },
+    {
+      "type": "hidden_item",
+      "x": 42,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_CALCIUM",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM"
+    },
+    {
+      "type": "hidden_item",
+      "x": 45,
+      "y": 36,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc
deleted file mode 100644
index 11df3eaec..000000000
--- a/data/maps/Underwater2/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Underwater2_MapConnectionsList: @ 8486D6C
-	connection up, 0, MAP_UNDERWATER1
-	connection right, 0, MAP_UNDERWATER3
-	connection emerge, 0, MAP_ROUTE126
-
-Underwater2_MapConnections: @ 8486D90
-	.4byte 0x3
-	.4byte Underwater2_MapConnectionsList
-
diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc
deleted file mode 100644
index dd2421506..000000000
--- a/data/maps/Underwater2/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Underwater2_MapWarps: @ 852CF1C
-	warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY
-
-Underwater2_MapBGEvents: @ 852CF24
-	bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE
-	bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL
-	bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST
-	bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL
-	bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON
-	bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD
-	bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL
-	bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD
-
-Underwater2_MapEvents:: @ 852CF84
-	map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents
-
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
deleted file mode 100644
index a4c14ab28..000000000
--- a/data/maps/Underwater2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater2: @ 8482A4C
-	.4byte Underwater2_Layout
-	.4byte Underwater2_MapEvents
-	.4byte Underwater2_MapScripts
-	.4byte Underwater2_MapConnections
-	.2byte MUS_DEEPDEEP
-	.2byte 51
-	.byte MAPSEC_UNDERWATER_125
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json
new file mode 100644
index 000000000..7977faa4f
--- /dev/null
+++ b/data/maps/Underwater2/map.json
@@ -0,0 +1,109 @@
+{
+  "id": "MAP_UNDERWATER2",
+  "name": "Underwater2",
+  "layout": "LAYOUT_UNDERWATER2",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_125",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_UNDERWATER1"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_UNDERWATER3"
+    },
+    {
+      "direction": "emerge",
+      "offset": 0,
+      "map": "MAP_ROUTE126"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 45,
+      "y": 65,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 30,
+      "y": 17,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 41,
+      "y": 19,
+      "elevation": 3,
+      "item": "ITEM_ULTRA_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 63,
+      "y": 19,
+      "elevation": 3,
+      "item": "ITEM_STARDUST",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST"
+    },
+    {
+      "type": "hidden_item",
+      "x": 10,
+      "y": 36,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 39,
+      "elevation": 3,
+      "item": "ITEM_IRON",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON"
+    },
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 35,
+      "elevation": 3,
+      "item": "ITEM_YELLOW_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD"
+    },
+    {
+      "type": "hidden_item",
+      "x": 65,
+      "y": 60,
+      "elevation": 3,
+      "item": "ITEM_BIG_PEARL",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL"
+    },
+    {
+      "type": "hidden_item",
+      "x": 9,
+      "y": 77,
+      "elevation": 3,
+      "item": "ITEM_BLUE_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc
deleted file mode 100644
index db8b0947b..000000000
--- a/data/maps/Underwater3/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Underwater3_MapConnectionsList: @ 8486D98
-	connection emerge, 0, MAP_ROUTE127
-	connection left, 0, MAP_UNDERWATER2
-	connection down, 0, MAP_UNDERWATER4
-
-Underwater3_MapConnections: @ 8486DBC
-	.4byte 0x3
-	.4byte Underwater3_MapConnectionsList
-
diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc
deleted file mode 100644
index 02ac86aa1..000000000
--- a/data/maps/Underwater3/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Underwater3_MapWarps: @ 852CF98
-	warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-	warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-
-Underwater3_MapBGEvents: @ 852CFA8
-	bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE
-	bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP
-	bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE
-	bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD
-
-Underwater3_MapEvents:: @ 852CFD8
-	map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents
-
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
deleted file mode 100644
index 4e91eb687..000000000
--- a/data/maps/Underwater3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater3: @ 8482A68
-	.4byte Underwater3_Layout
-	.4byte Underwater3_MapEvents
-	.4byte Underwater3_MapScripts
-	.4byte Underwater3_MapConnections
-	.2byte MUS_DEEPDEEP
-	.2byte 52
-	.byte MAPSEC_UNDERWATER_126
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json
new file mode 100644
index 000000000..ea87b5235
--- /dev/null
+++ b/data/maps/Underwater3/map.json
@@ -0,0 +1,84 @@
+{
+  "id": "MAP_UNDERWATER3",
+  "name": "Underwater3",
+  "layout": "LAYOUT_UNDERWATER3",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_126",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "emerge",
+      "offset": 0,
+      "map": "MAP_ROUTE127"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_UNDERWATER2"
+    },
+    {
+      "direction": "down",
+      "offset": 0,
+      "map": "MAP_UNDERWATER4"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 57,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 67,
+      "y": 38,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 12,
+      "y": 42,
+      "elevation": 3,
+      "item": "ITEM_STAR_PIECE",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 50,
+      "y": 36,
+      "elevation": 3,
+      "item": "ITEM_HP_UP",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP"
+    },
+    {
+      "type": "hidden_item",
+      "x": 34,
+      "y": 72,
+      "elevation": 3,
+      "item": "ITEM_HEART_SCALE",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE"
+    },
+    {
+      "type": "hidden_item",
+      "x": 72,
+      "y": 20,
+      "elevation": 3,
+      "item": "ITEM_RED_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc
index 463f7a0ff..53b80053f 100644
--- a/data/maps/Underwater3/scripts.inc
+++ b/data/maps/Underwater3/scripts.inc
@@ -1,8 +1,8 @@
 Underwater3_MapScripts:: @ 81F7724
-	map_script 5, Underwater3_MapScript1_1F772A
+	map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A
 	.byte 0
 
 Underwater3_MapScript1_1F772A: @ 81F772A
-	call Underwater3_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc
deleted file mode 100644
index 8a63d54a4..000000000
--- a/data/maps/Underwater4/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Underwater4_MapConnectionsList: @ 8486DC4
-	connection up, 0, MAP_UNDERWATER3
-	connection emerge, 0, MAP_ROUTE128
-
-Underwater4_MapConnections: @ 8486DDC
-	.4byte 0x2
-	.4byte Underwater4_MapConnectionsList
-
diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc
deleted file mode 100644
index 5a08e82f9..000000000
--- a/data/maps/Underwater4/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Underwater4_MapWarps: @ 852CFEC
-	warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN
-
-Underwater4_MapBGEvents: @ 852CFF4
-	bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN
-	bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL
-
-Underwater4_MapEvents:: @ 852D00C
-	map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents
-
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
deleted file mode 100644
index 804fb1d14..000000000
--- a/data/maps/Underwater4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater4: @ 8482A84
-	.4byte Underwater4_Layout
-	.4byte Underwater4_MapEvents
-	.4byte Underwater4_MapScripts
-	.4byte Underwater4_MapConnections
-	.2byte MUS_DEEPDEEP
-	.2byte 53
-	.byte MAPSEC_UNDERWATER_127
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json
new file mode 100644
index 000000000..9226717c3
--- /dev/null
+++ b/data/maps/Underwater4/map.json
@@ -0,0 +1,56 @@
+{
+  "id": "MAP_UNDERWATER4",
+  "name": "Underwater4",
+  "layout": "LAYOUT_UNDERWATER4",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_127",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": 0,
+      "map": "MAP_UNDERWATER3"
+    },
+    {
+      "direction": "emerge",
+      "offset": 0,
+      "map": "MAP_ROUTE128"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 38,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 38,
+      "y": 19,
+      "elevation": 3,
+      "item": "ITEM_PROTEIN",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN"
+    },
+    {
+      "type": "hidden_item",
+      "x": 69,
+      "y": 18,
+      "elevation": 3,
+      "item": "ITEM_PEARL",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc
deleted file mode 100644
index 15a3322ed..000000000
--- a/data/maps/Underwater5/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater5_MapConnectionsList: @ 8486DE4
-	connection emerge, 0, MAP_ROUTE129
-
-Underwater5_MapConnections: @ 8486DF0
-	.4byte 0x1
-	.4byte Underwater5_MapConnectionsList
-
diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc
deleted file mode 100644
index 4b902cf96..000000000
--- a/data/maps/Underwater5/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater5_MapWarps: @ 852D020
-	warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-	warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-
-Underwater5_MapEvents:: @ 852D030
-	map_events 0x0, Underwater5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc
deleted file mode 100644
index 8ad3b5ba2..000000000
--- a/data/maps/Underwater5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater5: @ 8482AA0
-	.4byte Underwater5_Layout
-	.4byte Underwater5_MapEvents
-	.4byte Underwater5_MapScripts
-	.4byte Underwater5_MapConnections
-	.2byte MUS_DEEPDEEP
-	.2byte 412
-	.byte MAPSEC_UNDERWATER_129
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json
new file mode 100644
index 000000000..abd13a187
--- /dev/null
+++ b/data/maps/Underwater5/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_UNDERWATER5",
+  "name": "Underwater5",
+  "layout": "LAYOUT_UNDERWATER5",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_129",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "emerge",
+      "offset": 0,
+      "map": "MAP_ROUTE129"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 26,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 32,
+      "y": 21,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc
index 9d0cc373c..fe068207e 100644
--- a/data/maps/Underwater5/scripts.inc
+++ b/data/maps/Underwater5/scripts.inc
@@ -1,8 +1,8 @@
 Underwater5_MapScripts:: @ 81F7731
-	map_script 5, Underwater5_MapScript1_1F7737
+	map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737
 	.byte 0
 
 Underwater5_MapScript1_1F7737: @ 81F7737
-	call Underwater5_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc
deleted file mode 100644
index 432ab625f..000000000
--- a/data/maps/Underwater6/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater6_MapConnectionsList: @ 8486D24
-	connection emerge, 0, MAP_ROUTE105
-
-Underwater6_MapConnections: @ 8486D30
-	.4byte 0x1
-	.4byte Underwater6_MapConnectionsList
-
diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc
deleted file mode 100644
index a624efba3..000000000
--- a/data/maps/Underwater6/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater6_MapWarps: @ 852D044
-	warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-	warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-
-Underwater6_MapEvents:: @ 852D054
-	map_events 0x0, Underwater6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc
deleted file mode 100644
index 4e978a1e7..000000000
--- a/data/maps/Underwater6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater6: @ 8482ABC
-	.4byte Underwater6_Layout
-	.4byte Underwater6_MapEvents
-	.4byte Underwater6_MapScripts
-	.4byte Underwater6_MapConnections
-	.2byte MUS_DEEPDEEP
-	.2byte 410
-	.byte MAPSEC_UNDERWATER_TERRA_CAVE
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json
new file mode 100644
index 000000000..9b19a1fe7
--- /dev/null
+++ b/data/maps/Underwater6/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_UNDERWATER6",
+  "name": "Underwater6",
+  "layout": "LAYOUT_UNDERWATER6",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "emerge",
+      "offset": 0,
+      "map": "MAP_ROUTE105"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 13,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 66,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc
index 047628c9c..d5a11c1bf 100644
--- a/data/maps/Underwater6/scripts.inc
+++ b/data/maps/Underwater6/scripts.inc
@@ -1,8 +1,8 @@
 Underwater6_MapScripts:: @ 81F773D
-	map_script 5, Underwater6_MapScript1_1F7743
+	map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743
 	.byte 0
 
 Underwater6_MapScript1_1F7743: @ 81F7743
-	call Underwater6_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc
deleted file mode 100644
index 82803997c..000000000
--- a/data/maps/Underwater7/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater7_MapConnectionsList: @ 8486D58
-	connection emerge, 0, MAP_ROUTE125
-
-Underwater7_MapConnections: @ 8486D64
-	.4byte 0x1
-	.4byte Underwater7_MapConnectionsList
-
diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc
deleted file mode 100644
index fba9324f6..000000000
--- a/data/maps/Underwater7/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater7_MapWarps: @ 852D068
-	warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-	warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE
-
-Underwater7_MapEvents:: @ 852D078
-	map_events 0x0, Underwater7_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc
deleted file mode 100644
index 132eb867e..000000000
--- a/data/maps/Underwater7/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater7: @ 8482AD8
-	.4byte Underwater7_Layout
-	.4byte Underwater7_MapEvents
-	.4byte Underwater7_MapScripts
-	.4byte Underwater7_MapConnections
-	.2byte MUS_DEEPDEEP
-	.2byte 411
-	.byte MAPSEC_UNDERWATER_UNK1
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json
new file mode 100644
index 000000000..afabfeeec
--- /dev/null
+++ b/data/maps/Underwater7/map.json
@@ -0,0 +1,41 @@
+{
+  "id": "MAP_UNDERWATER7",
+  "name": "Underwater7",
+  "layout": "LAYOUT_UNDERWATER7",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_UNK1",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "emerge",
+      "offset": 0,
+      "map": "MAP_ROUTE125"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 45,
+      "y": 30,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc
index dd757f98a..c3bee154e 100644
--- a/data/maps/Underwater7/scripts.inc
+++ b/data/maps/Underwater7/scripts.inc
@@ -1,8 +1,8 @@
 Underwater7_MapScripts:: @ 81F7749
-	map_script 5, Underwater7_MapScript1_1F774F
+	map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F
 	.byte 0
 
 Underwater7_MapScript1_1F774F: @ 81F774F
-	call Underwater7_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc
deleted file mode 100644
index 685abaa16..000000000
--- a/data/maps/Underwater_MarineCave/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Underwater_MarineCave_MapWarps: @ 85377B0
-	warp_def 9, 8, 0, 127, MAP_NONE
-
-Underwater_MarineCave_MapEvents:: @ 85377B8
-	map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc
deleted file mode 100644
index 88fe213ab..000000000
--- a/data/maps/Underwater_MarineCave/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_MarineCave: @ 84849CC
-	.4byte Underwater_MarineCave_Layout
-	.4byte Underwater_MarineCave_MapEvents
-	.4byte Underwater_MarineCave_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte 406
-	.byte MAPSEC_UNDERWATER_MARINE_CAVE
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json
new file mode 100644
index 000000000..c969239c5
--- /dev/null
+++ b/data/maps/Underwater_MarineCave/map.json
@@ -0,0 +1,28 @@
+{
+  "id": "MAP_UNDERWATER_MARINE_CAVE",
+  "name": "Underwater_MarineCave",
+  "layout": "LAYOUT_UNDERWATER_MARINE_CAVE",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc
index d6a3aa0db..9309d51f4 100644
--- a/data/maps/Underwater_MarineCave/scripts.inc
+++ b/data/maps/Underwater_MarineCave/scripts.inc
@@ -1,6 +1,6 @@
 Underwater_MarineCave_MapScripts:: @ 823AFB8
-	map_script 5, Underwater_MarineCave_MapScript1_23AFC7
-	map_script 3, Underwater_MarineCave_MapScript1_23AFC3
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_23AFC7
+	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_23AFC3
 	.byte 0
 
 Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3
diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc
deleted file mode 100644
index 3a5219511..000000000
--- a/data/maps/Underwater_Route134/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Underwater_Route134_MapWarps: @ 8536D44
-	warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER
-
-Underwater_Route134_MapEvents:: @ 8536D4C
-	map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
deleted file mode 100644
index 591dffa53..000000000
--- a/data/maps/Underwater_Route134/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_Route134: @ 848464C
-	.4byte Underwater_Route134_Layout
-	.4byte Underwater_Route134_MapEvents
-	.4byte Underwater_Route134_MapScripts
-	.4byte 0x0
-	.2byte MUS_DEEPDEEP
-	.2byte 282
-	.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json
new file mode 100644
index 000000000..f94f110e1
--- /dev/null
+++ b/data/maps/Underwater_Route134/map.json
@@ -0,0 +1,28 @@
+{
+  "id": "MAP_UNDERWATER_ROUTE134",
+  "name": "Underwater_Route134",
+  "layout": "LAYOUT_UNDERWATER_ROUTE134",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_SEALED_CHAMBER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc
index 786de1757..acffa23a2 100644
--- a/data/maps/Underwater_Route134/scripts.inc
+++ b/data/maps/Underwater_Route134/scripts.inc
@@ -1,5 +1,5 @@
 Underwater_Route134_MapScripts:: @ 82390B5
-	map_script 5, Underwater_Route134_MapScript1_2390BB
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB
 	.byte 0
 
 Underwater_Route134_MapScript1_2390BB: @ 82390BB
diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc
deleted file mode 100644
index 468dedcd6..000000000
--- a/data/maps/Underwater_SeafloorCavern/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Underwater_SeafloorCavern_EventObjects: @ 8535640
-	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
-	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
-	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
-	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
-
-Underwater_SeafloorCavern_MapWarps: @ 85356A0
-	warp_def 6, 7, 0, 0, MAP_UNDERWATER4
-
-Underwater_SeafloorCavern_MapEvents:: @ 85356A8
-	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
deleted file mode 100644
index 08eac747c..000000000
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_SeafloorCavern: @ 8484198
-	.4byte Underwater_SeafloorCavern_Layout
-	.4byte Underwater_SeafloorCavern_MapEvents
-	.4byte Underwater_SeafloorCavern_MapScripts
-	.4byte 0x0
-	.2byte MUS_DEEPDEEP
-	.2byte 146
-	.byte MAPSEC_UNDERWATER_128
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json
new file mode 100644
index 000000000..8e7d2c554
--- /dev/null
+++ b/data/maps/Underwater_SeafloorCavern/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN",
+  "name": "Underwater_SeafloorCavern",
+  "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_128",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Underwater_SeafloorCavern_EventScript_2343DC",
+      "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Underwater_SeafloorCavern_EventScript_2343DC",
+      "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Underwater_SeafloorCavern_EventScript_2343DC",
+      "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
+      "x": 8,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_INVISIBLE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Underwater_SeafloorCavern_EventScript_2343DC",
+      "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER4",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index efd2e9438..9dc5b406a 100644
--- a/data/maps/Underwater_SeafloorCavern/scripts.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -1,7 +1,7 @@
 Underwater_SeafloorCavern_MapScripts:: @ 823433B
-	map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3
-	map_script 3, Underwater_SeafloorCavern_MapScript1_23434B
-	map_script 1, Underwater_SeafloorCavern_MapScript1_23435C
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3
+	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_23434B
+	map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C
 	.byte 0
 
 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B
diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc
deleted file mode 100644
index e0bb19642..000000000
--- a/data/maps/Underwater_SealedChamber/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Underwater_SealedChamber_MapWarps: @ 8536D60
-	warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134
-
-Underwater_SealedChamber_MapBGEvents: @ 8536D68
-	bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC
-
-Underwater_SealedChamber_MapEvents:: @ 8536D74
-	map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents
-
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
deleted file mode 100644
index 94fcc6ba7..000000000
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_SealedChamber: @ 8484668
-	.4byte Underwater_SealedChamber_Layout
-	.4byte Underwater_SealedChamber_MapEvents
-	.4byte Underwater_SealedChamber_MapScripts
-	.4byte 0x0
-	.2byte MUS_DEEPDEEP
-	.2byte 283
-	.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json
new file mode 100644
index 000000000..2256ee670
--- /dev/null
+++ b/data/maps/Underwater_SealedChamber/map.json
@@ -0,0 +1,37 @@
+{
+  "id": "MAP_UNDERWATER_SEALED_CHAMBER",
+  "name": "Underwater_SealedChamber",
+  "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER_ROUTE134",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 12,
+      "y": 43,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Underwater_SealedChamber_EventScript_2390FC"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index de6ed50d1..9ec884781 100644
--- a/data/maps/Underwater_SealedChamber/scripts.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
@@ -1,5 +1,5 @@
 Underwater_SealedChamber_MapScripts:: @ 82390C4
-	map_script 6, Underwater_SealedChamber_MapScript1_2390CA
+	map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA
 	.byte 0
 
 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA
diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc
deleted file mode 100644
index 78839e8a1..000000000
--- a/data/maps/Underwater_SootopolisCity/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater_SootopolisCity_MapWarps: @ 8534330
-	warp_def 9, 8, 0, 0, MAP_UNDERWATER2
-	warp_def 10, 8, 0, 0, MAP_UNDERWATER2
-
-Underwater_SootopolisCity_MapEvents:: @ 8534340
-	map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
deleted file mode 100644
index 1611026e0..000000000
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Underwater_SootopolisCity: @ 8483F4C
-	.4byte Underwater_SootopolisCity_Layout
-	.4byte Underwater_SootopolisCity_MapEvents
-	.4byte Underwater_SootopolisCity_MapScripts
-	.4byte 0x0
-	.2byte MUS_DEEPDEEP
-	.2byte 130
-	.byte MAPSEC_UNDERWATER_SOOTOPOLIS
-	.byte 0
-	.byte WEATHER_BUBBLES
-	.byte MAP_TYPE_UNDERWATER
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json
new file mode 100644
index 000000000..a3b0a1290
--- /dev/null
+++ b/data/maps/Underwater_SootopolisCity/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY",
+  "name": "Underwater_SootopolisCity",
+  "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY",
+  "music": "MUS_DEEPDEEP",
+  "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS",
+  "requires_flash": false,
+  "weather": "WEATHER_BUBBLES",
+  "map_type": "MAP_TYPE_UNDERWATER",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERWATER2",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
index cbeefcb1d..d5040dba0 100644
--- a/data/maps/Underwater_SootopolisCity/scripts.inc
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
@@ -1,5 +1,5 @@
 Underwater_SootopolisCity_MapScripts:: @ 822D94C
-	map_script 5, Underwater_SootopolisCity_MapScript1_22D952
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952
 	.byte 0
 
 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952
diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc
deleted file mode 100644
index 3ab614468..000000000
--- a/data/maps/UnionRoom/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-UnionRoom_EventObjects: @ 853B020
-	object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4
-	object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8
-	object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, FLAG_HIDE_UNION_ROOM_PLAYER_7
-	object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, FLAG_HIDE_UNION_ROOM_PLAYER_6
-	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, FLAG_HIDE_UNION_ROOM_PLAYER_5
-	object_event 7, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, FLAG_HIDE_UNION_ROOM_PLAYER_3
-	object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2
-	object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1
-
-UnionRoom_MapWarps: @ 853B0F8
-	warp_def 7, 11, 3, 127, MAP_NONE
-	warp_def 8, 11, 3, 127, MAP_NONE
-
-UnionRoom_MapEvents:: @ 853B108
-	map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
deleted file mode 100644
index 29fd3cc3f..000000000
--- a/data/maps/UnionRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnionRoom: @ 8485120
-	.4byte UnionRoom_Layout
-	.4byte UnionRoom_MapEvents
-	.4byte UnionRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_RAINBOW
-	.2byte 393
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
new file mode 100644
index 000000000..c42cd362c
--- /dev/null
+++ b/data/maps/UnionRoom/map.json
@@ -0,0 +1,153 @@
+{
+  "id": "MAP_UNION_ROOM",
+  "name": "UnionRoom",
+  "layout": "LAYOUT_UNION_ROOM",
+  "music": "MUS_RAINBOW",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_UNION_ROOM_NURSE",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D236",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D204",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D22C",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D222",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 7,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D218",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D20E",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D1FA",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 13,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D1F0",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "UnionRoom_EventScript_23D1E6",
+      "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index f71c40e3d..0871ae033 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -1,6 +1,6 @@
 UnionRoom_MapScripts:: @ 823D1A6
-	map_script 5, UnionRoom_MapScript1_23D1B1
-	map_script 3, UnionRoom_MapScript1_23D1E5
+	map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1
+	map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5
 	.byte 0
 
 UnionRoom_MapScript1_23D1B1: @ 823D1B1
diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json
new file mode 100644
index 000000000..956a68158
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_29/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_29",
+  "name": "UnknownLinkContestRoom_25_29",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
+  "music": "MUS_NIBI",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_29/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json
new file mode 100644
index 000000000..526c6de2a
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_30/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_30",
+  "name": "UnknownLinkContestRoom_25_30",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
+  "music": "MUS_NIBI",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_30/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json
new file mode 100644
index 000000000..9548c1125
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_31/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_31",
+  "name": "UnknownLinkContestRoom_25_31",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
+  "music": "MUS_NIBI",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_31/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json
new file mode 100644
index 000000000..27411d28e
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_32/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_32",
+  "name": "UnknownLinkContestRoom_25_32",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
+  "music": "MUS_NIBI",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_32/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
new file mode 100644
index 000000000..1a15ae6d6
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_33/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_33",
+  "name": "UnknownLinkContestRoom_25_33",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
+  "music": "MUS_NIBI",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_33/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
new file mode 100644
index 000000000..4c90858b9
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_34/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_34",
+  "name": "UnknownLinkContestRoom_25_34",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
+  "music": "MUS_NIBI",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_34/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_29/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
deleted file mode 100644
index aa4ffc0cd..000000000
--- a/data/maps/UnknownMap_25_29/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_29: @ 8484DBC
-	.4byte UnknownMap_25_29_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_NIBI
-	.2byte 226
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_30/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
deleted file mode 100644
index 86e2d4f70..000000000
--- a/data/maps/UnknownMap_25_30/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_30: @ 8484DD8
-	.4byte UnknownMap_25_30_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_NIBI
-	.2byte 227
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_31/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
deleted file mode 100644
index 78ede2d65..000000000
--- a/data/maps/UnknownMap_25_31/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_31: @ 8484DF4
-	.4byte UnknownMap_25_31_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_NIBI
-	.2byte 228
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_32/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
deleted file mode 100644
index 826528119..000000000
--- a/data/maps/UnknownMap_25_32/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_32: @ 8484E10
-	.4byte UnknownMap_25_32_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_NIBI
-	.2byte 229
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_33/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
deleted file mode 100644
index 99502bb0f..000000000
--- a/data/maps/UnknownMap_25_33/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_33: @ 8484E2C
-	.4byte UnknownMap_25_33_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_NIBI
-	.2byte 230
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_34/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
deleted file mode 100644
index 6e95a8222..000000000
--- a/data/maps/UnknownMap_25_34/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_25_34: @ 8484E48
-	.4byte UnknownMap_25_34_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_NIBI
-	.2byte 231
-	.byte MAPSEC_DYNAMIC
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc
deleted file mode 100644
index de6fdface..000000000
--- a/data/maps/VerdanturfTown/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-VerdanturfTown_MapConnectionsList: @ 8486694
-	connection up, -80, MAP_ROUTE116
-	connection right, 0, MAP_ROUTE117
-
-VerdanturfTown_MapConnections: @ 84866AC
-	.4byte 0x2
-	.4byte VerdanturfTown_MapConnectionsList
-
diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc
deleted file mode 100644
index 971ad87c4..000000000
--- a/data/maps/VerdanturfTown/events.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-VerdanturfTown_EventObjects: @ 8527CDC
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0
-	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0
-	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0
-
-VerdanturfTown_MapWarps: @ 8527D3C
-	warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_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: @ 8527D74
-	bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A
-	bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9
-	bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73
-	bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5E2
-	bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A
-	bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73
-	bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB
-	bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4
-
-VerdanturfTown_MapEvents:: @ 8527DD4
-	map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
-
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
deleted file mode 100644
index 053a58712..000000000
--- a/data/maps/VerdanturfTown/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown: @ 8482640
-	.4byte VerdanturfTown_Layout
-	.4byte VerdanturfTown_MapEvents
-	.4byte VerdanturfTown_MapScripts
-	.4byte VerdanturfTown_MapConnections
-	.2byte MUS_GOMACHI0
-	.2byte 15
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_TOWN
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
new file mode 100644
index 000000000..7aef48724
--- /dev/null
+++ b/data/maps/VerdanturfTown/map.json
@@ -0,0 +1,199 @@
+{
+  "id": "MAP_VERDANTURF_TOWN",
+  "name": "VerdanturfTown",
+  "layout": "LAYOUT_VERDANTURF_TOWN",
+  "music": "MUS_GOMACHI0",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": -80,
+      "map": "MAP_ROUTE116"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE117"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "x": 4,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_EventScript_1EB5A8",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "x": 9,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_EventScript_1EB575",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "x": 7,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_EventScript_1EB5BA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 7,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_EventScript_1EB5B1",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN_MART",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 3,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTURF_TUNNEL",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 1,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN_HOUSE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "VerdanturfTown_EventScript_1EB5D9"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "VerdanturfTown_EventScript_1EB5E2"
+    },
+    {
+      "type": "sign",
+      "x": 13,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemartSign"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "Common_EventScript_ShowPokemonCenterSign"
+    },
+    {
+      "type": "sign",
+      "x": 1,
+      "y": 8,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "VerdanturfTown_EventScript_1EB5EB"
+    },
+    {
+      "type": "sign",
+      "x": 7,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "VerdanturfTown_EventScript_1EB5F4"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc
index c929633dd..bd2bce048 100644
--- a/data/maps/VerdanturfTown/scripts.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
@@ -1,10 +1,10 @@
 VerdanturfTown_MapScripts:: @ 81EB566
-	map_script 3, VerdanturfTown_MapScript1_1EB56C
+	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_1EB56C
 	.byte 0
 
 VerdanturfTown_MapScript1_1EB56C: @ 81EB56C
 	setflag FLAG_VISITED_VERDANTURF_TOWN
-	setvar VAR_0x4086, 0
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
 	end
 
 VerdanturfTown_EventScript_1EB575:: @ 81EB575
@@ -12,14 +12,14 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575
 	faceplayer
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594
 	msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT
-	applymovement 2, VerdanturfTown_Movement_2725A2
+	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 VerdanturfTown_EventScript_1EB594:: @ 81EB594
 	msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT
-	applymovement 2, VerdanturfTown_Movement_2725A2
+	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
deleted file mode 100644
index ee91fff2c..000000000
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734
-	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
-
-VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C
-	map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
deleted file mode 100644
index 8a95c60a3..000000000
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_BattleTentBattleRoom: @ 8482E90
-	.4byte VerdanturfTown_BattleTentBattleRoom_Layout
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapEvents
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 387
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json
new file mode 100644
index 000000000..2722518eb
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json
@@ -0,0 +1,60 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM",
+  "name": "VerdanturfTown_BattleTentBattleRoom",
+  "layout": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 11,
+      "y": 1,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index 52aed7618..9d98e790c 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -1,7 +1,7 @@
 VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA
-	map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A
-	map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E
-	map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541
+	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541
 	.byte 0
 
 VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A
@@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
 	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581
 	waitmovement 0
 	removeobject 2
-	applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA
-	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceDown
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT
 	special LoadPlayerParty
@@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8
 	case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA
-	applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8
-	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8
+	applymovement 3, Common_Movement_WalkInPlaceRight
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	closemessage
 	goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
deleted file mode 100644
index d0ca880ef..000000000
--- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720
-	map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
deleted file mode 100644
index 5aa6fcc46..000000000
--- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_BattleTentCorridor: @ 8482E74
-	.4byte BattleTentCorridor_Layout
-	.4byte VerdanturfTown_BattleTentCorridor_MapEvents
-	.4byte VerdanturfTown_BattleTentCorridor_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 385
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json
new file mode 100644
index 000000000..157745914
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json
@@ -0,0 +1,34 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR",
+  "name": "VerdanturfTown_BattleTentCorridor",
+  "layout": "LAYOUT_BATTLE_TENT_CORRIDOR",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 2,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
index e5d7e45e9..907ef3fd6 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A
-	map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_MapScript2_202090
 	.byte 0
 
 VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
deleted file mode 100644
index 1dfb49dd9..000000000
--- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648
-	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0
-
-VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8
-	warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN
-	warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8
-	bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02
-
-VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4
-	map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents
-
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
deleted file mode 100644
index 3f3eb1ae6..000000000
--- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_BattleTentLobby: @ 8482E58
-	.4byte BattleTentLobby_Layout
-	.4byte VerdanturfTown_BattleTentLobby_MapEvents
-	.4byte VerdanturfTown_BattleTentLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_TOWER
-	.2byte 384
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json
new file mode 100644
index 000000000..2a5660271
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json
@@ -0,0 +1,123 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY",
+  "name": "VerdanturfTown_BattleTentLobby",
+  "layout": "LAYOUT_BATTLE_TENT_LOBBY",
+  "music": "MUS_B_TOWER",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 6,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_201873",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
+      "x": 0,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_3",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 1,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+      "x": 12,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0",
+      "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 2,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 7,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index df56f41ed..daaaaea1b 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -1,6 +1,6 @@
 VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0
-	map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF
-	map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016EF
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016DB
 	.byte 0
 
 VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB
@@ -192,7 +192,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call VerdanturfTown_BattleTentLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D
@@ -281,7 +281,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B
 	msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM45
 	compare VAR_RESULT, 0
-	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM45
 	msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT
 	release
@@ -307,7 +307,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0
 	faceplayer
 	goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED
 	msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT
-	addvar VAR_0x40D1, 1
+	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_VERDANTURF
 	release
 	end
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
deleted file mode 100644
index 990bcd1f6..000000000
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0
-	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0
-
-VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8
-	warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN
-	warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08
-	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
deleted file mode 100644
index 43148f8ef..000000000
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_FriendshipRatersHouse: @ 8482F1C
-	.4byte House2_Layout
-	.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
-	.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOMACHI0
-	.2byte 60
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
new file mode 100644
index 000000000..955e00a83
--- /dev/null
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE",
+  "name": "VerdanturfTown_FriendshipRatersHouse",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "MUS_GOMACHI0",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 3,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PIKACHU",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc
deleted file mode 100644
index d714aa8a0..000000000
--- a/data/maps/VerdanturfTown_House/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-VerdanturfTown_House_EventObjects: @ 852EA1C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0
-
-VerdanturfTown_House_MapWarps: @ 852EA4C
-	warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN
-	warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_House_MapEvents:: @ 852EA5C
-	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
deleted file mode 100644
index 5c3e26d09..000000000
--- a/data/maps/VerdanturfTown_House/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_House: @ 8482F38
-	.4byte House1_Layout
-	.4byte VerdanturfTown_House_MapEvents
-	.4byte VerdanturfTown_House_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOMACHI0
-	.2byte 59
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json
new file mode 100644
index 000000000..9a357b495
--- /dev/null
+++ b/data/maps/VerdanturfTown_House/map.json
@@ -0,0 +1,62 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_HOUSE",
+  "name": "VerdanturfTown_House",
+  "layout": "LAYOUT_HOUSE1",
+  "music": "MUS_GOMACHI0",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_House_EventScript_20335F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 4,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_House_EventScript_203368",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc
deleted file mode 100644
index 9ae237dc8..000000000
--- a/data/maps/VerdanturfTown_Mart/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-VerdanturfTown_Mart_EventObjects: @ 852E790
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0
-
-VerdanturfTown_Mart_MapWarps: @ 852E7F0
-	warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN
-	warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_Mart_MapEvents:: @ 852E800
-	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
deleted file mode 100644
index 0441f8147..000000000
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_Mart: @ 8482EAC
-	.4byte Mart_Layout
-	.4byte VerdanturfTown_Mart_MapEvents
-	.4byte VerdanturfTown_Mart_MapScripts
-	.4byte 0x0
-	.2byte MUS_FRIENDLY
-	.2byte 63
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json
new file mode 100644
index 000000000..4f9b8296e
--- /dev/null
+++ b/data/maps/VerdanturfTown_Mart/map.json
@@ -0,0 +1,88 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_MART",
+  "name": "VerdanturfTown_Mart",
+  "layout": "LAYOUT_MART",
+  "music": "MUS_FRIENDLY",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+      "x": 1,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_Mart_EventScript_202587",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_Mart_EventScript_2025BA",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
+      "x": 8,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_Mart_EventScript_2025C3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LASS",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_Mart_EventScript_2025CC",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
deleted file mode 100644
index 246270361..000000000
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0
-	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0
-
-VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874
-	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:: @ 852E88C
-	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
deleted file mode 100644
index e1d7d3fa8..000000000
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_PokemonCenter_1F: @ 8482EC8
-	.4byte PokemonCenter_1F_Layout
-	.4byte VerdanturfTown_PokemonCenter_1F_MapEvents
-	.4byte VerdanturfTown_PokemonCenter_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 61
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
new file mode 100644
index 000000000..f9df06d33
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F",
+  "name": "VerdanturfTown_PokemonCenter_1F",
+  "layout": "LAYOUT_POKEMON_CENTER_1F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_NURSE",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index da8676aec..474448132 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726
-	map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_202731
-	map_script 5, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30
+	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_202731
+	map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30
 	.byte 0
 
 VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
deleted file mode 100644
index e3e959838..000000000
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
-
-VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900
-	warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
-	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
-
-VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918
-	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
deleted file mode 100644
index 933a3da18..000000000
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_PokemonCenter_2F: @ 8482EE4
-	.4byte PokemonCenter_2F_Layout
-	.4byte VerdanturfTown_PokemonCenter_2F_MapEvents
-	.4byte VerdanturfTown_PokemonCenter_2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_POKECEN
-	.2byte 62
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json
new file mode 100644
index 000000000..bfa6db09e
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json
@@ -0,0 +1,95 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F",
+  "name": "VerdanturfTown_PokemonCenter_2F",
+  "layout": "LAYOUT_POKEMON_CENTER_2F",
+  "music": "MUS_POKECEN",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 6,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 2,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 10,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN",
+      "x": 1,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03",
+      "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 6,
+      "elevation": 4,
+      "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_UNION_ROOM",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 9,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_TRADE_CENTER",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index 9e93a628e..b09335fb2 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897
-	map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B
-	map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C
-	map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE
-	map_script 3, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C
+	map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE
+	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
 VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC
diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
deleted file mode 100644
index f8d6f4db5..000000000
--- a/data/maps/VerdanturfTown_WandasHouse/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_WandasHouse_EventObjects: @ 852E92C
-	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
-	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
-	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
-
-VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4
-	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
-	warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4
-	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
deleted file mode 100644
index 573fe6f76..000000000
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_WandasHouse: @ 8482F00
-	.4byte VerdanturfTown_WandasHouse_Layout
-	.4byte VerdanturfTown_WandasHouse_MapEvents
-	.4byte VerdanturfTown_WandasHouse_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOMACHI0
-	.2byte 76
-	.byte MAPSEC_VERDANTURF_TOWN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json
new file mode 100644
index 000000000..514b2581e
--- /dev/null
+++ b/data/maps/VerdanturfTown_WandasHouse/map.json
@@ -0,0 +1,101 @@
+{
+  "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE",
+  "name": "VerdanturfTown_WandasHouse",
+  "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE",
+  "music": "MUS_GOMACHI0",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLY",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_WandasHouse_EventScript_2028BF",
+      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+      "x": 5,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_WandasHouse_EventScript_202913",
+      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+      "x": 7,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_WandasHouse_EventScript_2028E1",
+      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
+      "x": 2,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_WandasHouse_EventScript_20294E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VerdanturfTown_WandasHouse_EventScript_20291C",
+      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 8,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_VERDANTURF_TOWN",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc
deleted file mode 100644
index 05cafcc48..000000000
--- a/data/maps/VictoryRoad_1F/events.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-VictoryRoad_1F_EventObjects: @ 8535E04
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0
-	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, FLAG_ITEM_VICTORY_ROAD_1F_PP_UP
-	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
-	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0
-
-VictoryRoad_1F_MapWarps: @ 8535EDC
-	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: @ 8535F04
-	coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF
-	coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8
-
-VictoryRoad_1F_MapBGEvents: @ 8535F24
-	bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL
-
-VictoryRoad_1F_MapEvents:: @ 8535F30
-	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
deleted file mode 100644
index 950f26aa5..000000000
--- a/data/maps/VictoryRoad_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VictoryRoad_1F: @ 8484374
-	.4byte VictoryRoad_1F_Layout
-	.4byte VictoryRoad_1F_MapEvents
-	.4byte VictoryRoad_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 163
-	.byte MAPSEC_VICTORY_ROAD
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
new file mode 100644
index 000000000..05eb2b795
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -0,0 +1,202 @@
+{
+  "id": "MAP_VICTORY_ROAD_1F",
+  "name": "VictoryRoad_1F",
+  "layout": "LAYOUT_VICTORY_ROAD_1F",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_VICTORY_ROAD",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 33,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "VictoryRoad_1F_EventScript_235E73",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 6,
+      "y": 15,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "VictoryRoad_1F_EventScript_235EA1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 27,
+      "y": 34,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "VictoryRoad_1F_EventScript_235E8A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLY",
+      "x": 12,
+      "y": 25,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_1F_EventScript_235E2C",
+      "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 40,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_1F_EventScript_291483",
+      "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 37,
+      "y": 39,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_1F_EventScript_291490",
+      "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WALLY",
+      "x": 31,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_1F_EventScript_235E35",
+      "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 29,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_1F_EventScript_235ECF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 32,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_1F_EventScript_235EB8",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 40,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 39,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_EVER_GRANDE_CITY",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 21,
+      "y": 32,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B1F",
+      "dest_warp_id": 5
+    },
+    {
+      "x": 42,
+      "y": 38,
+      "elevation": 4,
+      "dest_map": "MAP_VICTORY_ROAD_B1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 14,
+      "elevation": 4,
+      "dest_map": "MAP_VICTORY_ROAD_B1F",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 23,
+      "elevation": 4,
+      "var": "VAR_VICTORY_ROAD_1F_STATE",
+      "var_value": "0",
+      "script": "VictoryRoad_1F_EventScript_235DAF"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 23,
+      "elevation": 4,
+      "var": "VAR_VICTORY_ROAD_1F_STATE",
+      "var_value": "0",
+      "script": "VictoryRoad_1F_EventScript_235DC8"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 30,
+      "y": 39,
+      "elevation": 4,
+      "item": "ITEM_ULTRA_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 2d1c63027..96f3c6f42 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -1,11 +1,11 @@
 VictoryRoad_1F_MapScripts:: @ 8235D7A
-	map_script 3, VictoryRoad_1F_MapScript1_235D80
+	map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_235D80
 	.byte 0
 
 VictoryRoad_1F_MapScript1_235D80: @ 8235D80
-	compare VAR_0x40C3, 1
+	compare VAR_VICTORY_ROAD_1F_STATE, 1
 	call_if_eq VictoryRoad_1F_EventScript_235D97
-	compare VAR_0x40C3, 2
+	compare VAR_VICTORY_ROAD_1F_STATE, 2
 	call_if_eq VictoryRoad_1F_EventScript_235DA3
 	end
 
@@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8
 	end
 
 VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
-	applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC
@@ -46,7 +46,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
 	clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	moveobjectoffscreen 4
 	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
-	copyvar VAR_0x40C3, VAR_0x8008
+	copyvar VAR_VICTORY_ROAD_1F_STATE, VAR_0x8008
 	releaseall
 	end
 
diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc
deleted file mode 100644
index 814d8a73d..000000000
--- a/data/maps/VictoryRoad_B1F/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-VictoryRoad_B1F_EventObjects: @ 8535F44
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_12
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_17
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_16
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1E
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_19
-	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1A
-	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1B
-	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1C
-	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1D
-	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1F
-	object_event 14, EVENT_OBJ_GFX_MAN_3, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0
-	object_event 16, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0
-	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_15
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, FLAG_ITEM_VICTORY_ROAD_B1F_TM_29
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE
-	object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0
-	object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0
-
-VictoryRoad_B1F_MapWarps: @ 853613C
-	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:: @ 8536174
-	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
deleted file mode 100644
index d89408de9..000000000
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VictoryRoad_B1F: @ 8484390
-	.4byte VictoryRoad_B1F_Layout
-	.4byte VictoryRoad_B1F_MapEvents
-	.4byte VictoryRoad_B1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 285
-	.byte MAPSEC_VICTORY_ROAD
-	.byte 1
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json
new file mode 100644
index 000000000..2fde10090
--- /dev/null
+++ b/data/maps/VictoryRoad_B1F/map.json
@@ -0,0 +1,344 @@
+{
+  "id": "MAP_VICTORY_ROAD_B1F",
+  "name": "VictoryRoad_B1F",
+  "layout": "LAYOUT_VICTORY_ROAD_B1F",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_VICTORY_ROAD",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 20,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_13"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 21,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_14"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 9,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_12"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 20,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_17"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 21,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 35,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_1E"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 19,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_19"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 20,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_1A"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 18,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_1B"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 20,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_1C"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 21,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_1D"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+      "x": 34,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "flag": "FLAG_TEMP_1F"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 37,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "VictoryRoad_B1F_EventScript_2364E5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 26,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "VictoryRoad_B1F_EventScript_2364FC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 5,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_B1F_EventScript_236513",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "x": 34,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 42,
+      "y": 8,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_29149D",
+      "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 32,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B1F_EventScript_2914AA",
+      "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 14,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "VictoryRoad_B1F_EventScript_23652A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 14,
+      "y": 20,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "VictoryRoad_B1F_EventScript_236541",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 30,
+      "y": 25,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B2F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 17,
+      "y": 16,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B2F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 42,
+      "y": 25,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 42,
+      "y": 2,
+      "elevation": 4,
+      "dest_map": "MAP_VICTORY_ROAD_B2F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 8,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_1F",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 20,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 5,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B2F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc
deleted file mode 100644
index 1ad4f3e50..000000000
--- a/data/maps/VictoryRoad_B2F/events.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-VictoryRoad_B2F_EventObjects: @ 8536188
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL
-	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0
-
-VictoryRoad_B2F_MapWarps: @ 8536230
-	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: @ 8536250
-	bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR
-	bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL
-
-VictoryRoad_B2F_MapEvents:: @ 8536268
-	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
deleted file mode 100644
index 462898c2b..000000000
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VictoryRoad_B2F: @ 84843AC
-	.4byte VictoryRoad_B2F_Layout
-	.4byte VictoryRoad_B2F_MapEvents
-	.4byte VictoryRoad_B2F_MapScripts
-	.4byte 0x0
-	.2byte MUS_C_ROAD
-	.2byte 286
-	.byte MAPSEC_VICTORY_ROAD
-	.byte 1
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json
new file mode 100644
index 000000000..fd9195ed4
--- /dev/null
+++ b/data/maps/VictoryRoad_B2F/map.json
@@ -0,0 +1,158 @@
+{
+  "id": "MAP_VICTORY_ROAD_B2F",
+  "name": "VictoryRoad_B2F",
+  "layout": "LAYOUT_VICTORY_ROAD_B2F",
+  "music": "MUS_C_ROAD",
+  "region_map_section": "MAPSEC_VICTORY_ROAD",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_B2F_EventScript_2368D5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 43,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "VictoryRoad_B2F_EventScript_2368EC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 2,
+      "y": 17,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_B2F_EventScript_236903",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 35,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_B2F_EventScript_23691A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 13,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "VictoryRoad_B2F_EventScript_2914B7",
+      "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "x": 25,
+      "y": 18,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_B2F_EventScript_236948",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "x": 25,
+      "y": 21,
+      "elevation": 4,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
+      "script": "VictoryRoad_B2F_EventScript_236931",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 30,
+      "y": 25,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 43,
+      "y": 2,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B1F",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 19,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 5,
+      "y": 26,
+      "elevation": 3,
+      "dest_map": "MAP_VICTORY_ROAD_B1F",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 28,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_ELIXIR",
+      "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR"
+    },
+    {
+      "type": "hidden_item",
+      "x": 37,
+      "y": 1,
+      "elevation": 3,
+      "item": "ITEM_MAX_REPEL",
+      "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/connections.inc b/data/maps/connections.inc
deleted file mode 100644
index a95024921..000000000
--- a/data/maps/connections.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "data/maps/LittlerootTown/connections.inc"
-	.include "data/maps/OldaleTown/connections.inc"
-	.include "data/maps/DewfordTown/connections.inc"
-	.include "data/maps/LavaridgeTown/connections.inc"
-	.include "data/maps/FallarborTown/connections.inc"
-	.include "data/maps/VerdanturfTown/connections.inc"
-	.include "data/maps/PacifidlogTown/connections.inc"
-	.include "data/maps/PetalburgCity/connections.inc"
-	.include "data/maps/SlateportCity/connections.inc"
-	.include "data/maps/MauvilleCity/connections.inc"
-	.include "data/maps/RustboroCity/connections.inc"
-	.include "data/maps/FortreeCity/connections.inc"
-	.include "data/maps/LilycoveCity/connections.inc"
-	.include "data/maps/MossdeepCity/connections.inc"
-	.include "data/maps/SootopolisCity/connections.inc"
-	.include "data/maps/EverGrandeCity/connections.inc"
-	.include "data/maps/Route101/connections.inc"
-	.include "data/maps/Route102/connections.inc"
-	.include "data/maps/Route103/connections.inc"
-	.include "data/maps/Route104/connections.inc"
-	.include "data/maps/Route105/connections.inc"
-	.include "data/maps/Route106/connections.inc"
-	.include "data/maps/Route107/connections.inc"
-	.include "data/maps/Route108/connections.inc"
-	.include "data/maps/Route109/connections.inc"
-	.include "data/maps/Route110/connections.inc"
-	.include "data/maps/Route111/connections.inc"
-	.include "data/maps/Route112/connections.inc"
-	.include "data/maps/Route113/connections.inc"
-	.include "data/maps/Route114/connections.inc"
-	.include "data/maps/Route115/connections.inc"
-	.include "data/maps/Route116/connections.inc"
-	.include "data/maps/Route117/connections.inc"
-	.include "data/maps/Route118/connections.inc"
-	.include "data/maps/Route119/connections.inc"
-	.include "data/maps/Route120/connections.inc"
-	.include "data/maps/Route121/connections.inc"
-	.include "data/maps/Route122/connections.inc"
-	.include "data/maps/Route123/connections.inc"
-	.include "data/maps/Route124/connections.inc"
-	.include "data/maps/Route125/connections.inc"
-	.include "data/maps/Route126/connections.inc"
-	.include "data/maps/Route127/connections.inc"
-	.include "data/maps/Route128/connections.inc"
-	.include "data/maps/Route129/connections.inc"
-	.include "data/maps/Route130/connections.inc"
-	.include "data/maps/Route131/connections.inc"
-	.include "data/maps/Route132/connections.inc"
-	.include "data/maps/Route133/connections.inc"
-	.include "data/maps/Route134/connections.inc"
-	.include "data/maps/Underwater6/connections.inc"
-	.include "data/maps/Underwater1/connections.inc"
-	.include "data/maps/Underwater7/connections.inc"
-	.include "data/maps/Underwater2/connections.inc"
-	.include "data/maps/Underwater3/connections.inc"
-	.include "data/maps/Underwater4/connections.inc"
-	.include "data/maps/Underwater5/connections.inc"
-	.include "data/maps/SafariZone_Northwest/connections.inc"
-	.include "data/maps/SafariZone_North/connections.inc"
-	.include "data/maps/SafariZone_Southwest/connections.inc"
-	.include "data/maps/SafariZone_South/connections.inc"
-	.include "data/maps/SafariZone_Northeast/connections.inc"
-	.include "data/maps/SafariZone_Southeast/connections.inc"
-	.include "data/maps/BattleFrontier_OutsideWest/connections.inc"
-	.include "data/maps/BattleFrontier_OutsideEast/connections.inc"
diff --git a/data/maps/groups.inc b/data/maps/groups.inc
deleted file mode 100644
index 77f9c4441..000000000
--- a/data/maps/groups.inc
+++ /dev/null
@@ -1,623 +0,0 @@
-gMapGroup0: @ 8485D60
-	.4byte PetalburgCity
-	.4byte SlateportCity
-	.4byte MauvilleCity
-	.4byte RustboroCity
-	.4byte FortreeCity
-	.4byte LilycoveCity
-	.4byte MossdeepCity
-	.4byte SootopolisCity
-	.4byte EverGrandeCity
-	.4byte LittlerootTown
-	.4byte OldaleTown
-	.4byte DewfordTown
-	.4byte LavaridgeTown
-	.4byte FallarborTown
-	.4byte VerdanturfTown
-	.4byte PacifidlogTown
-	.4byte Route101
-	.4byte Route102
-	.4byte Route103
-	.4byte Route104
-	.4byte Route105
-	.4byte Route106
-	.4byte Route107
-	.4byte Route108
-	.4byte Route109
-	.4byte Route110
-	.4byte Route111
-	.4byte Route112
-	.4byte Route113
-	.4byte Route114
-	.4byte Route115
-	.4byte Route116
-	.4byte Route117
-	.4byte Route118
-	.4byte Route119
-	.4byte Route120
-	.4byte Route121
-	.4byte Route122
-	.4byte Route123
-	.4byte Route124
-	.4byte Route125
-	.4byte Route126
-	.4byte Route127
-	.4byte Route128
-	.4byte Route129
-	.4byte Route130
-	.4byte Route131
-	.4byte Route132
-	.4byte Route133
-	.4byte Route134
-	.4byte Underwater1
-	.4byte Underwater2
-	.4byte Underwater3
-	.4byte Underwater4
-	.4byte Underwater5
-	.4byte Underwater6
-	.4byte Underwater7
-
-gMapGroup1: @ 8485E44
-	.4byte LittlerootTown_BrendansHouse_1F
-	.4byte LittlerootTown_BrendansHouse_2F
-	.4byte LittlerootTown_MaysHouse_1F
-	.4byte LittlerootTown_MaysHouse_2F
-	.4byte LittlerootTown_ProfessorBirchsLab
-
-gMapGroup2: @ 8485E58
-	.4byte OldaleTown_House1
-	.4byte OldaleTown_House2
-	.4byte OldaleTown_PokemonCenter_1F
-	.4byte OldaleTown_PokemonCenter_2F
-	.4byte OldaleTown_Mart
-
-gMapGroup3: @ 8485E6C
-	.4byte DewfordTown_House1
-	.4byte DewfordTown_PokemonCenter_1F
-	.4byte DewfordTown_PokemonCenter_2F
-	.4byte DewfordTown_Gym
-	.4byte DewfordTown_Hall
-	.4byte DewfordTown_House2
-
-gMapGroup4: @ 8485E84
-	.4byte LavaridgeTown_HerbShop
-	.4byte LavaridgeTown_Gym_1F
-	.4byte LavaridgeTown_Gym_B1F
-	.4byte LavaridgeTown_House
-	.4byte LavaridgeTown_Mart
-	.4byte LavaridgeTown_PokemonCenter_1F
-	.4byte LavaridgeTown_PokemonCenter_2F
-
-gMapGroup5: @ 8485EA0
-	.4byte FallarborTown_Mart
-	.4byte FallarborTown_BattleTentLobby
-	.4byte FallarborTown_BattleTentCorridor
-	.4byte FallarborTown_BattleTentBattleRoom
-	.4byte FallarborTown_PokemonCenter_1F
-	.4byte FallarborTown_PokemonCenter_2F
-	.4byte FallarborTown_House1
-	.4byte FallarborTown_House2
-
-gMapGroup6: @ 8485EC0
-	.4byte VerdanturfTown_BattleTentLobby
-	.4byte VerdanturfTown_BattleTentCorridor
-	.4byte VerdanturfTown_BattleTentBattleRoom
-	.4byte VerdanturfTown_Mart
-	.4byte VerdanturfTown_PokemonCenter_1F
-	.4byte VerdanturfTown_PokemonCenter_2F
-	.4byte VerdanturfTown_WandasHouse
-	.4byte VerdanturfTown_FriendshipRatersHouse
-	.4byte VerdanturfTown_House
-
-gMapGroup7: @ 8485EE4
-	.4byte PacifidlogTown_PokemonCenter_1F
-	.4byte PacifidlogTown_PokemonCenter_2F
-	.4byte PacifidlogTown_House1
-	.4byte PacifidlogTown_House2
-	.4byte PacifidlogTown_House3
-	.4byte PacifidlogTown_House4
-	.4byte PacifidlogTown_House5
-
-gMapGroup8: @ 8485F00
-	.4byte PetalburgCity_WallysHouse
-	.4byte PetalburgCity_Gym
-	.4byte PetalburgCity_House1
-	.4byte PetalburgCity_House2
-	.4byte PetalburgCity_PokemonCenter_1F
-	.4byte PetalburgCity_PokemonCenter_2F
-	.4byte PetalburgCity_Mart
-
-gMapGroup9: @ 8485F1C
-	.4byte SlateportCity_SternsShipyard_1F
-	.4byte SlateportCity_SternsShipyard_2F
-	.4byte SlateportCity_BattleTentLobby
-	.4byte SlateportCity_BattleTentCorridor
-	.4byte SlateportCity_BattleTentBattleRoom
-	.4byte SlateportCity_House1
-	.4byte SlateportCity_PokemonFanClub
-	.4byte SlateportCity_OceanicMuseum_1F
-	.4byte SlateportCity_OceanicMuseum_2F
-	.4byte SlateportCity_Harbor
-	.4byte SlateportCity_House2
-	.4byte SlateportCity_PokemonCenter_1F
-	.4byte SlateportCity_PokemonCenter_2F
-	.4byte SlateportCity_Mart
-
-gMapGroup10: @ 8485F54
-	.4byte MauvilleCity_Gym
-	.4byte MauvilleCity_BikeShop
-	.4byte MauvilleCity_House1
-	.4byte MauvilleCity_GameCorner
-	.4byte MauvilleCity_House2
-	.4byte MauvilleCity_PokemonCenter_1F
-	.4byte MauvilleCity_PokemonCenter_2F
-	.4byte MauvilleCity_Mart
-
-gMapGroup11: @ 8485F74
-	.4byte RustboroCity_DevonCorp_1F
-	.4byte RustboroCity_DevonCorp_2F
-	.4byte RustboroCity_DevonCorp_3F
-	.4byte RustboroCity_Gym
-	.4byte RustboroCity_PokemonSchool
-	.4byte RustboroCity_PokemonCenter_1F
-	.4byte RustboroCity_PokemonCenter_2F
-	.4byte RustboroCity_Mart
-	.4byte RustboroCity_Flat1_1F
-	.4byte RustboroCity_Flat1_2F
-	.4byte RustboroCity_House1
-	.4byte RustboroCity_CuttersHouse
-	.4byte RustboroCity_House2
-	.4byte RustboroCity_Flat2_1F
-	.4byte RustboroCity_Flat2_2F
-	.4byte RustboroCity_Flat2_3F
-	.4byte RustboroCity_House3
-
-gMapGroup12: @ 8485FB8
-	.4byte FortreeCity_House1
-	.4byte FortreeCity_Gym
-	.4byte FortreeCity_PokemonCenter_1F
-	.4byte FortreeCity_PokemonCenter_2F
-	.4byte FortreeCity_Mart
-	.4byte FortreeCity_House2
-	.4byte FortreeCity_House3
-	.4byte FortreeCity_House4
-	.4byte FortreeCity_House5
-	.4byte FortreeCity_DecorationShop
-
-gMapGroup13: @ 8485FE0
-	.4byte LilycoveCity_CoveLilyMotel_1F
-	.4byte LilycoveCity_CoveLilyMotel_2F
-	.4byte LilycoveCity_LilycoveMuseum_1F
-	.4byte LilycoveCity_LilycoveMuseum_2F
-	.4byte LilycoveCity_ContestLobby
-	.4byte LilycoveCity_ContestHall
-	.4byte LilycoveCity_PokemonCenter_1F
-	.4byte LilycoveCity_PokemonCenter_2F
-	.4byte LilycoveCity_UnusedMart
-	.4byte LilycoveCity_PokemonTrainerFanClub
-	.4byte LilycoveCity_Harbor
-	.4byte LilycoveCity_MoveDeletersHouse
-	.4byte LilycoveCity_House1
-	.4byte LilycoveCity_House2
-	.4byte LilycoveCity_House3
-	.4byte LilycoveCity_House4
-	.4byte LilycoveCity_DepartmentStore_1F
-	.4byte LilycoveCity_DepartmentStore_2F
-	.4byte LilycoveCity_DepartmentStore_3F
-	.4byte LilycoveCity_DepartmentStore_4F
-	.4byte LilycoveCity_DepartmentStore_5F
-	.4byte LilycoveCity_DepartmentStoreRooftop
-	.4byte LilycoveCity_DepartmentStoreElevator
-
-gMapGroup14: @ 848603C
-	.4byte MossdeepCity_Gym
-	.4byte MossdeepCity_House1
-	.4byte MossdeepCity_House2
-	.4byte MossdeepCity_PokemonCenter_1F
-	.4byte MossdeepCity_PokemonCenter_2F
-	.4byte MossdeepCity_Mart
-	.4byte MossdeepCity_House3
-	.4byte MossdeepCity_StevensHouse
-	.4byte MossdeepCity_House4
-	.4byte MossdeepCity_SpaceCenter_1F
-	.4byte MossdeepCity_SpaceCenter_2F
-	.4byte MossdeepCity_GameCorner_1F
-	.4byte MossdeepCity_GameCorner_B1F
-
-gMapGroup15: @ 8486070
-	.4byte SootopolisCity_Gym_1F
-	.4byte SootopolisCity_Gym_B1F
-	.4byte SootopolisCity_PokemonCenter_1F
-	.4byte SootopolisCity_PokemonCenter_2F
-	.4byte SootopolisCity_Mart
-	.4byte SootopolisCity_House1
-	.4byte SootopolisCity_House2
-	.4byte SootopolisCity_House3
-	.4byte SootopolisCity_House4
-	.4byte SootopolisCity_House5
-	.4byte SootopolisCity_House6
-	.4byte SootopolisCity_House7
-	.4byte SootopolisCity_LotadAndSeedotHouse
-	.4byte SootopolisCity_MysteryEventsHouse_1F
-	.4byte SootopolisCity_MysteryEventsHouse_B1F
-
-gMapGroup16: @ 84860AC
-	.4byte EverGrandeCity_SidneysRoom
-	.4byte EverGrandeCity_PhoebesRoom
-	.4byte EverGrandeCity_GlaciasRoom
-	.4byte EverGrandeCity_DrakesRoom
-	.4byte EverGrandeCity_ChampionsRoom
-	.4byte EverGrandeCity_Hall1
-	.4byte EverGrandeCity_Hall2
-	.4byte EverGrandeCity_Hall3
-	.4byte EverGrandeCity_Hall4
-	.4byte EverGrandeCity_Hall5
-	.4byte EverGrandeCity_PokemonLeague_1F
-	.4byte EverGrandeCity_HallOfFame
-	.4byte EverGrandeCity_PokemonCenter_1F
-	.4byte EverGrandeCity_PokemonCenter_2F
-	.4byte EverGrandeCity_PokemonLeague_2F
-
-gMapGroup17: @ 84860E8
-	.4byte Route104_MrBrineysHouse
-	.4byte Route104_PrettyPetalFlowerShop
-
-gMapGroup18: @ 84860F0
-	.4byte Route111_WinstrateFamilysHouse
-	.4byte Route111_OldLadysRestStop
-
-gMapGroup19: @ 84860F8
-	.4byte Route112_CableCarStation
-	.4byte MtChimney_CableCarStation
-
-gMapGroup20: @ 8486100
-	.4byte Route114_FossilManiacsHouse
-	.4byte Route114_FossilManiacsTunnel
-	.4byte Route114_LanettesHouse
-
-gMapGroup21: @ 848610C
-	.4byte Route116_TunnelersRestHouse
-
-gMapGroup22: @ 8486110
-	.4byte Route117_PokemonDayCare
-
-gMapGroup23: @ 8486114
-	.4byte Route121_SafariZoneEntrance
-
-gMapGroup24: @ 8486118
-	.4byte MeteorFalls_1F_1R
-	.4byte MeteorFalls_1F_2R
-	.4byte MeteorFalls_B1F_1R
-	.4byte MeteorFalls_B1F_2R
-	.4byte RusturfTunnel
-	.4byte Underwater_SootopolisCity
-	.4byte DesertRuins
-	.4byte GraniteCave_1F
-	.4byte GraniteCave_B1F
-	.4byte GraniteCave_B2F
-	.4byte GraniteCave_StevensRoom
-	.4byte PetalburgWoods
-	.4byte MtChimney
-	.4byte JaggedPass
-	.4byte FieryPath
-	.4byte MtPyre_1F
-	.4byte MtPyre_2F
-	.4byte MtPyre_3F
-	.4byte MtPyre_4F
-	.4byte MtPyre_5F
-	.4byte MtPyre_6F
-	.4byte MtPyre_Exterior
-	.4byte MtPyre_Summit
-	.4byte AquaHideout_1F
-	.4byte AquaHideout_B1F
-	.4byte AquaHideout_B2F
-	.4byte Underwater_SeafloorCavern
-	.4byte SeafloorCavern_Entrance
-	.4byte SeafloorCavern_Room1
-	.4byte SeafloorCavern_Room2
-	.4byte SeafloorCavern_Room3
-	.4byte SeafloorCavern_Room4
-	.4byte SeafloorCavern_Room5
-	.4byte SeafloorCavern_Room6
-	.4byte SeafloorCavern_Room7
-	.4byte SeafloorCavern_Room8
-	.4byte SeafloorCavern_Room9
-	.4byte CaveOfOrigin_Entrance
-	.4byte CaveOfOrigin_1F
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3
-	.4byte CaveOfOrigin_B1F
-	.4byte VictoryRoad_1F
-	.4byte VictoryRoad_B1F
-	.4byte VictoryRoad_B2F
-	.4byte ShoalCave_LowTideEntranceRoom
-	.4byte ShoalCave_LowTideInnerRoom
-	.4byte ShoalCave_LowTideStairsRoom
-	.4byte ShoalCave_LowTideLowerRoom
-	.4byte ShoalCave_HighTideEntranceRoom
-	.4byte ShoalCave_HighTideInnerRoom
-	.4byte NewMauville_Entrance
-	.4byte NewMauville_Inside
-	.4byte AbandonedShip_Deck
-	.4byte AbandonedShip_Corridors_1F
-	.4byte AbandonedShip_Rooms_1F
-	.4byte AbandonedShip_Corridors_B1F
-	.4byte AbandonedShip_Rooms_B1F
-	.4byte AbandonedShip_Rooms2_B1F
-	.4byte AbandonedShip_Underwater1
-	.4byte AbandonedShip_Room_B1F
-	.4byte AbandonedShip_Rooms2_1F
-	.4byte AbandonedShip_CaptainsOffice
-	.4byte AbandonedShip_Underwater2
-	.4byte AbandonedShip_HiddenFloorCorridors
-	.4byte AbandonedShip_HiddenFloorRooms
-	.4byte IslandCave
-	.4byte AncientTomb
-	.4byte Underwater_Route134
-	.4byte Underwater_SealedChamber
-	.4byte SealedChamber_OuterRoom
-	.4byte SealedChamber_InnerRoom
-	.4byte ScorchedSlab
-	.4byte AquaHideout_UnusedRubyMap1
-	.4byte AquaHideout_UnusedRubyMap2
-	.4byte AquaHideout_UnusedRubyMap3
-	.4byte SkyPillar_Entrance
-	.4byte SkyPillar_Outside
-	.4byte SkyPillar_1F
-	.4byte SkyPillar_2F
-	.4byte SkyPillar_3F
-	.4byte SkyPillar_4F
-	.4byte ShoalCave_LowTideIceRoom
-	.4byte SkyPillar_5F
-	.4byte SkyPillar_Top
-	.4byte MagmaHideout_1F
-	.4byte MagmaHideout_2F_1R
-	.4byte MagmaHideout_2F_2R
-	.4byte MagmaHideout_3F_1R
-	.4byte MagmaHideout_3F_2R
-	.4byte MagmaHideout_4F
-	.4byte MagmaHideout_3F_3R
-	.4byte MagmaHideout_2F_3R
-	.4byte MirageTower_1F
-	.4byte MirageTower_2F
-	.4byte MirageTower_3F
-	.4byte MirageTower_4F
-	.4byte DesertUnderpass
-	.4byte ArtisanCave_B1F
-	.4byte ArtisanCave_1F
-	.4byte Underwater_MarineCave
-	.4byte MarineCave_Entrance
-	.4byte MarineCave_End
-	.4byte TerraCave_Entrance
-	.4byte TerraCave_End
-	.4byte AlteringCave
-	.4byte MeteorFalls_StevensCave
-
-gMapGroup25: @ 84862C8
-	.4byte SecretBase_RedCave1
-	.4byte SecretBase_BrownCave1
-	.4byte SecretBase_BlueCave1
-	.4byte SecretBase_YellowCave1
-	.4byte SecretBase_Tree1
-	.4byte SecretBase_Shrub1
-	.4byte SecretBase_RedCave2
-	.4byte SecretBase_BrownCave2
-	.4byte SecretBase_BlueCave2
-	.4byte SecretBase_YellowCave2
-	.4byte SecretBase_Tree2
-	.4byte SecretBase_Shrub2
-	.4byte SecretBase_RedCave3
-	.4byte SecretBase_BrownCave3
-	.4byte SecretBase_BlueCave3
-	.4byte SecretBase_YellowCave3
-	.4byte SecretBase_Tree3
-	.4byte SecretBase_Shrub3
-	.4byte SecretBase_RedCave4
-	.4byte SecretBase_BrownCave4
-	.4byte SecretBase_BlueCave4
-	.4byte SecretBase_YellowCave4
-	.4byte SecretBase_Tree4
-	.4byte SecretBase_Shrub4
-	.4byte SingleBattleColosseum
-	.4byte TradeCenter
-	.4byte RecordCorner
-	.4byte DoubleBattleColosseum
-	.4byte LinkContestRoom1
-	.4byte UnknownMap_25_29
-	.4byte UnknownMap_25_30
-	.4byte UnknownMap_25_31
-	.4byte UnknownMap_25_32
-	.4byte UnknownMap_25_33
-	.4byte UnknownMap_25_34
-	.4byte LinkContestRoom2
-	.4byte LinkContestRoom3
-	.4byte LinkContestRoom4
-	.4byte LinkContestRoom5
-	.4byte LinkContestRoom6
-	.4byte InsideOfTruck
-	.4byte SSTidalCorridor
-	.4byte SSTidalLowerDeck
-	.4byte SSTidalRooms
-	.4byte BattlePyramidSquare01
-	.4byte BattlePyramidSquare02
-	.4byte BattlePyramidSquare03
-	.4byte BattlePyramidSquare04
-	.4byte BattlePyramidSquare05
-	.4byte BattlePyramidSquare06
-	.4byte BattlePyramidSquare07
-	.4byte BattlePyramidSquare08
-	.4byte BattlePyramidSquare09
-	.4byte BattlePyramidSquare10
-	.4byte BattlePyramidSquare11
-	.4byte BattlePyramidSquare12
-	.4byte BattlePyramidSquare13
-	.4byte BattlePyramidSquare14
-	.4byte BattlePyramidSquare15
-	.4byte BattlePyramidSquare16
-	.4byte UnionRoom
-
-gMapGroup26: @ 84863BC
-	.4byte SafariZone_Northwest
-	.4byte SafariZone_North
-	.4byte SafariZone_Southwest
-	.4byte SafariZone_South
-	.4byte BattleFrontier_OutsideWest
-	.4byte BattleFrontier_BattleTowerLobby
-	.4byte BattleFrontier_BattleTowerElevator
-	.4byte BattleFrontier_BattleTowerCorridor
-	.4byte BattleFrontier_BattleTowerBattleRoom
-	.4byte SouthernIsland_Exterior
-	.4byte SouthernIsland_Interior
-	.4byte SafariZone_RestHouse
-	.4byte SafariZone_Northeast
-	.4byte SafariZone_Southeast
-	.4byte BattleFrontier_OutsideEast
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom
-	.4byte BattleFrontier_BattleTowerCorridor2
-	.4byte BattleFrontier_BattleTowerBattleRoom2
-	.4byte BattleFrontier_BattleDomeLobby
-	.4byte BattleFrontier_BattleDomeCorridor
-	.4byte BattleFrontier_BattleDomePreBattleRoom
-	.4byte BattleFrontier_BattleDomeBattleRoom
-	.4byte BattleFrontier_BattlePalaceLobby
-	.4byte BattleFrontier_BattlePalaceCorridor
-	.4byte BattleFrontier_BattlePalaceBattleRoom
-	.4byte BattleFrontier_BattlePyramidLobby
-	.4byte BattleFrontier_BattlePyramidEmptySquare
-	.4byte BattleFrontier_BattlePyramidTop
-	.4byte BattleFrontier_BattleArenaLobby
-	.4byte BattleFrontier_BattleArenaCorridor
-	.4byte BattleFrontier_BattleArenaBattleRoom
-	.4byte BattleFrontier_BattleFactoryLobby
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom
-	.4byte BattleFrontier_BattleFactoryBattleRoom
-	.4byte BattleFrontier_BattlePikeLobby
-	.4byte BattleFrontier_BattlePikeCorridor
-	.4byte BattleFrontier_BattlePikeThreePathRoom
-	.4byte BattleFrontier_BattlePikeRandomRoom1
-	.4byte BattleFrontier_BattlePikeRandomRoom2
-	.4byte BattleFrontier_BattlePikeRandomRoom3
-	.4byte BattleFrontier_RankingHall
-	.4byte BattleFrontier_Lounge1
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner
-	.4byte BattleFrontier_Lounge2
-	.4byte BattleFrontier_Lounge3
-	.4byte BattleFrontier_Lounge4
-	.4byte BattleFrontier_ScottsHouse
-	.4byte BattleFrontier_Lounge5
-	.4byte BattleFrontier_Lounge6
-	.4byte BattleFrontier_Lounge7
-	.4byte BattleFrontier_ReceptionGate
-	.4byte BattleFrontier_Lounge8
-	.4byte BattleFrontier_Lounge9
-	.4byte BattleFrontier_PokemonCenter_1F
-	.4byte BattleFrontier_PokemonCenter_2F
-	.4byte BattleFrontier_Mart
-	.4byte FarawayIsland_Entrance
-	.4byte FarawayIsland_Interior
-	.4byte BirthIsland_Exterior
-	.4byte BirthIsland_Harbor
-	.4byte TrainerHill_Entrance
-	.4byte TrainerHill_1F
-	.4byte TrainerHill_2F
-	.4byte TrainerHill_3F
-	.4byte TrainerHill_4F
-	.4byte TrainerHill_Roof
-	.4byte NavelRock_Exterior
-	.4byte NavelRock_Harbor
-	.4byte NavelRock_Entrance
-	.4byte NavelRock_B1F
-	.4byte NavelRock_Fork
-	.4byte NavelRock_Up1
-	.4byte NavelRock_Up2
-	.4byte NavelRock_Up3
-	.4byte NavelRock_Up4
-	.4byte NavelRock_Top
-	.4byte NavelRock_Down01
-	.4byte NavelRock_Down02
-	.4byte NavelRock_Down03
-	.4byte NavelRock_Down04
-	.4byte NavelRock_Down05
-	.4byte NavelRock_Down06
-	.4byte NavelRock_Down07
-	.4byte NavelRock_Down08
-	.4byte NavelRock_Down09
-	.4byte NavelRock_Down10
-	.4byte NavelRock_Down11
-	.4byte NavelRock_Bottom
-	.4byte TrainerHill_Elevator
-
-gMapGroup27: @ 8486520
-	.4byte Route104_Prototype
-	.4byte Route104_PrototypePrettyPetalFlowerShop
-
-gMapGroup28: @ 8486528
-	.4byte Route109_SeashoreHouse
-
-gMapGroup29: @ 848652C
-	.4byte Route110_TrickHouseEntrance
-	.4byte Route110_TrickHouseEnd
-	.4byte Route110_TrickHouseCorridor
-	.4byte Route110_TrickHousePuzzle1
-	.4byte Route110_TrickHousePuzzle2
-	.4byte Route110_TrickHousePuzzle3
-	.4byte Route110_TrickHousePuzzle4
-	.4byte Route110_TrickHousePuzzle5
-	.4byte Route110_TrickHousePuzzle6
-	.4byte Route110_TrickHousePuzzle7
-	.4byte Route110_TrickHousePuzzle8
-	.4byte Route110_SeasideCyclingRoadNorthEntrance
-	.4byte Route110_SeasideCyclingRoadSouthEntrance
-
-gMapGroup30: @ 8486560
-	.4byte Route113_GlassWorkshop
-
-gMapGroup31: @ 8486564
-	.4byte Route123_BerryMastersHouse
-
-gMapGroup32: @ 8486568
-	.4byte Route119_WeatherInstitute_1F
-	.4byte Route119_WeatherInstitute_2F
-	.4byte Route119_House
-
-gMapGroup33: @ 8486574
-	.4byte Route124_DivingTreasureHuntersHouse
-
-	.align 2
-gMapGroups:: @ 8486578
-	.4byte gMapGroup0
-	.4byte gMapGroup1
-	.4byte gMapGroup2
-	.4byte gMapGroup3
-	.4byte gMapGroup4
-	.4byte gMapGroup5
-	.4byte gMapGroup6
-	.4byte gMapGroup7
-	.4byte gMapGroup8
-	.4byte gMapGroup9
-	.4byte gMapGroup10
-	.4byte gMapGroup11
-	.4byte gMapGroup12
-	.4byte gMapGroup13
-	.4byte gMapGroup14
-	.4byte gMapGroup15
-	.4byte gMapGroup16
-	.4byte gMapGroup17
-	.4byte gMapGroup18
-	.4byte gMapGroup19
-	.4byte gMapGroup20
-	.4byte gMapGroup21
-	.4byte gMapGroup22
-	.4byte gMapGroup23
-	.4byte gMapGroup24
-	.4byte gMapGroup25
-	.4byte gMapGroup26
-	.4byte gMapGroup27
-	.4byte gMapGroup28
-	.4byte gMapGroup29
-	.4byte gMapGroup30
-	.4byte gMapGroup31
-	.4byte gMapGroup32
-	.4byte gMapGroup33
-
diff --git a/data/maps/headers.inc b/data/maps/headers.inc
deleted file mode 100644
index b4be3ab0c..000000000
--- a/data/maps/headers.inc
+++ /dev/null
@@ -1,518 +0,0 @@
-	.include "data/maps/PetalburgCity/header.inc"
-	.include "data/maps/SlateportCity/header.inc"
-	.include "data/maps/MauvilleCity/header.inc"
-	.include "data/maps/RustboroCity/header.inc"
-	.include "data/maps/FortreeCity/header.inc"
-	.include "data/maps/LilycoveCity/header.inc"
-	.include "data/maps/MossdeepCity/header.inc"
-	.include "data/maps/SootopolisCity/header.inc"
-	.include "data/maps/EverGrandeCity/header.inc"
-	.include "data/maps/LittlerootTown/header.inc"
-	.include "data/maps/OldaleTown/header.inc"
-	.include "data/maps/DewfordTown/header.inc"
-	.include "data/maps/LavaridgeTown/header.inc"
-	.include "data/maps/FallarborTown/header.inc"
-	.include "data/maps/VerdanturfTown/header.inc"
-	.include "data/maps/PacifidlogTown/header.inc"
-	.include "data/maps/Route101/header.inc"
-	.include "data/maps/Route102/header.inc"
-	.include "data/maps/Route103/header.inc"
-	.include "data/maps/Route104/header.inc"
-	.include "data/maps/Route105/header.inc"
-	.include "data/maps/Route106/header.inc"
-	.include "data/maps/Route107/header.inc"
-	.include "data/maps/Route108/header.inc"
-	.include "data/maps/Route109/header.inc"
-	.include "data/maps/Route110/header.inc"
-	.include "data/maps/Route111/header.inc"
-	.include "data/maps/Route112/header.inc"
-	.include "data/maps/Route113/header.inc"
-	.include "data/maps/Route114/header.inc"
-	.include "data/maps/Route115/header.inc"
-	.include "data/maps/Route116/header.inc"
-	.include "data/maps/Route117/header.inc"
-	.include "data/maps/Route118/header.inc"
-	.include "data/maps/Route119/header.inc"
-	.include "data/maps/Route120/header.inc"
-	.include "data/maps/Route121/header.inc"
-	.include "data/maps/Route122/header.inc"
-	.include "data/maps/Route123/header.inc"
-	.include "data/maps/Route124/header.inc"
-	.include "data/maps/Route125/header.inc"
-	.include "data/maps/Route126/header.inc"
-	.include "data/maps/Route127/header.inc"
-	.include "data/maps/Route128/header.inc"
-	.include "data/maps/Route129/header.inc"
-	.include "data/maps/Route130/header.inc"
-	.include "data/maps/Route131/header.inc"
-	.include "data/maps/Route132/header.inc"
-	.include "data/maps/Route133/header.inc"
-	.include "data/maps/Route134/header.inc"
-	.include "data/maps/Underwater1/header.inc"
-	.include "data/maps/Underwater2/header.inc"
-	.include "data/maps/Underwater3/header.inc"
-	.include "data/maps/Underwater4/header.inc"
-	.include "data/maps/Underwater5/header.inc"
-	.include "data/maps/Underwater6/header.inc"
-	.include "data/maps/Underwater7/header.inc"
-	.include "data/maps/LittlerootTown_BrendansHouse_1F/header.inc"
-	.include "data/maps/LittlerootTown_BrendansHouse_2F/header.inc"
-	.include "data/maps/LittlerootTown_MaysHouse_1F/header.inc"
-	.include "data/maps/LittlerootTown_MaysHouse_2F/header.inc"
-	.include "data/maps/LittlerootTown_ProfessorBirchsLab/header.inc"
-	.include "data/maps/OldaleTown_House1/header.inc"
-	.include "data/maps/OldaleTown_House2/header.inc"
-	.include "data/maps/OldaleTown_PokemonCenter_1F/header.inc"
-	.include "data/maps/OldaleTown_PokemonCenter_2F/header.inc"
-	.include "data/maps/OldaleTown_Mart/header.inc"
-	.include "data/maps/DewfordTown_House1/header.inc"
-	.include "data/maps/DewfordTown_PokemonCenter_1F/header.inc"
-	.include "data/maps/DewfordTown_PokemonCenter_2F/header.inc"
-	.include "data/maps/DewfordTown_Gym/header.inc"
-	.include "data/maps/DewfordTown_Hall/header.inc"
-	.include "data/maps/DewfordTown_House2/header.inc"
-	.include "data/maps/LavaridgeTown_HerbShop/header.inc"
-	.include "data/maps/LavaridgeTown_Gym_1F/header.inc"
-	.include "data/maps/LavaridgeTown_Gym_B1F/header.inc"
-	.include "data/maps/LavaridgeTown_House/header.inc"
-	.include "data/maps/LavaridgeTown_Mart/header.inc"
-	.include "data/maps/LavaridgeTown_PokemonCenter_1F/header.inc"
-	.include "data/maps/LavaridgeTown_PokemonCenter_2F/header.inc"
-	.include "data/maps/FallarborTown_Mart/header.inc"
-	.include "data/maps/FallarborTown_BattleTentLobby/header.inc"
-	.include "data/maps/FallarborTown_BattleTentCorridor/header.inc"
-	.include "data/maps/FallarborTown_BattleTentBattleRoom/header.inc"
-	.include "data/maps/FallarborTown_PokemonCenter_1F/header.inc"
-	.include "data/maps/FallarborTown_PokemonCenter_2F/header.inc"
-	.include "data/maps/FallarborTown_House1/header.inc"
-	.include "data/maps/FallarborTown_House2/header.inc"
-	.include "data/maps/VerdanturfTown_BattleTentLobby/header.inc"
-	.include "data/maps/VerdanturfTown_BattleTentCorridor/header.inc"
-	.include "data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc"
-	.include "data/maps/VerdanturfTown_Mart/header.inc"
-	.include "data/maps/VerdanturfTown_PokemonCenter_1F/header.inc"
-	.include "data/maps/VerdanturfTown_PokemonCenter_2F/header.inc"
-	.include "data/maps/VerdanturfTown_WandasHouse/header.inc"
-	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc"
-	.include "data/maps/VerdanturfTown_House/header.inc"
-	.include "data/maps/PacifidlogTown_PokemonCenter_1F/header.inc"
-	.include "data/maps/PacifidlogTown_PokemonCenter_2F/header.inc"
-	.include "data/maps/PacifidlogTown_House1/header.inc"
-	.include "data/maps/PacifidlogTown_House2/header.inc"
-	.include "data/maps/PacifidlogTown_House3/header.inc"
-	.include "data/maps/PacifidlogTown_House4/header.inc"
-	.include "data/maps/PacifidlogTown_House5/header.inc"
-	.include "data/maps/PetalburgCity_WallysHouse/header.inc"
-	.include "data/maps/PetalburgCity_Gym/header.inc"
-	.include "data/maps/PetalburgCity_House1/header.inc"
-	.include "data/maps/PetalburgCity_House2/header.inc"
-	.include "data/maps/PetalburgCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/PetalburgCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/PetalburgCity_Mart/header.inc"
-	.include "data/maps/SlateportCity_SternsShipyard_1F/header.inc"
-	.include "data/maps/SlateportCity_SternsShipyard_2F/header.inc"
-	.include "data/maps/SlateportCity_BattleTentLobby/header.inc"
-	.include "data/maps/SlateportCity_BattleTentCorridor/header.inc"
-	.include "data/maps/SlateportCity_BattleTentBattleRoom/header.inc"
-	.include "data/maps/SlateportCity_House1/header.inc"
-	.include "data/maps/SlateportCity_PokemonFanClub/header.inc"
-	.include "data/maps/SlateportCity_OceanicMuseum_1F/header.inc"
-	.include "data/maps/SlateportCity_OceanicMuseum_2F/header.inc"
-	.include "data/maps/SlateportCity_Harbor/header.inc"
-	.include "data/maps/SlateportCity_House2/header.inc"
-	.include "data/maps/SlateportCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/SlateportCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/SlateportCity_Mart/header.inc"
-	.include "data/maps/MauvilleCity_Gym/header.inc"
-	.include "data/maps/MauvilleCity_BikeShop/header.inc"
-	.include "data/maps/MauvilleCity_House1/header.inc"
-	.include "data/maps/MauvilleCity_GameCorner/header.inc"
-	.include "data/maps/MauvilleCity_House2/header.inc"
-	.include "data/maps/MauvilleCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/MauvilleCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/MauvilleCity_Mart/header.inc"
-	.include "data/maps/RustboroCity_DevonCorp_1F/header.inc"
-	.include "data/maps/RustboroCity_DevonCorp_2F/header.inc"
-	.include "data/maps/RustboroCity_DevonCorp_3F/header.inc"
-	.include "data/maps/RustboroCity_Gym/header.inc"
-	.include "data/maps/RustboroCity_PokemonSchool/header.inc"
-	.include "data/maps/RustboroCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/RustboroCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/RustboroCity_Mart/header.inc"
-	.include "data/maps/RustboroCity_Flat1_1F/header.inc"
-	.include "data/maps/RustboroCity_Flat1_2F/header.inc"
-	.include "data/maps/RustboroCity_House1/header.inc"
-	.include "data/maps/RustboroCity_CuttersHouse/header.inc"
-	.include "data/maps/RustboroCity_House2/header.inc"
-	.include "data/maps/RustboroCity_Flat2_1F/header.inc"
-	.include "data/maps/RustboroCity_Flat2_2F/header.inc"
-	.include "data/maps/RustboroCity_Flat2_3F/header.inc"
-	.include "data/maps/RustboroCity_House3/header.inc"
-	.include "data/maps/FortreeCity_House1/header.inc"
-	.include "data/maps/FortreeCity_Gym/header.inc"
-	.include "data/maps/FortreeCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/FortreeCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/FortreeCity_Mart/header.inc"
-	.include "data/maps/FortreeCity_House2/header.inc"
-	.include "data/maps/FortreeCity_House3/header.inc"
-	.include "data/maps/FortreeCity_House4/header.inc"
-	.include "data/maps/FortreeCity_House5/header.inc"
-	.include "data/maps/FortreeCity_DecorationShop/header.inc"
-	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc"
-	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc"
-	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc"
-	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc"
-	.include "data/maps/LilycoveCity_ContestLobby/header.inc"
-	.include "data/maps/LilycoveCity_ContestHall/header.inc"
-	.include "data/maps/LilycoveCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/LilycoveCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/LilycoveCity_UnusedMart/header.inc"
-	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc"
-	.include "data/maps/LilycoveCity_Harbor/header.inc"
-	.include "data/maps/LilycoveCity_MoveDeletersHouse/header.inc"
-	.include "data/maps/LilycoveCity_House1/header.inc"
-	.include "data/maps/LilycoveCity_House2/header.inc"
-	.include "data/maps/LilycoveCity_House3/header.inc"
-	.include "data/maps/LilycoveCity_House4/header.inc"
-	.include "data/maps/LilycoveCity_DepartmentStore_1F/header.inc"
-	.include "data/maps/LilycoveCity_DepartmentStore_2F/header.inc"
-	.include "data/maps/LilycoveCity_DepartmentStore_3F/header.inc"
-	.include "data/maps/LilycoveCity_DepartmentStore_4F/header.inc"
-	.include "data/maps/LilycoveCity_DepartmentStore_5F/header.inc"
-	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc"
-	.include "data/maps/LilycoveCity_DepartmentStoreElevator/header.inc"
-	.include "data/maps/MossdeepCity_Gym/header.inc"
-	.include "data/maps/MossdeepCity_House1/header.inc"
-	.include "data/maps/MossdeepCity_House2/header.inc"
-	.include "data/maps/MossdeepCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/MossdeepCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/MossdeepCity_Mart/header.inc"
-	.include "data/maps/MossdeepCity_House3/header.inc"
-	.include "data/maps/MossdeepCity_StevensHouse/header.inc"
-	.include "data/maps/MossdeepCity_House4/header.inc"
-	.include "data/maps/MossdeepCity_SpaceCenter_1F/header.inc"
-	.include "data/maps/MossdeepCity_SpaceCenter_2F/header.inc"
-	.include "data/maps/MossdeepCity_GameCorner_1F/header.inc"
-	.include "data/maps/MossdeepCity_GameCorner_B1F/header.inc"
-	.include "data/maps/SootopolisCity_Gym_1F/header.inc"
-	.include "data/maps/SootopolisCity_Gym_B1F/header.inc"
-	.include "data/maps/SootopolisCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/SootopolisCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/SootopolisCity_Mart/header.inc"
-	.include "data/maps/SootopolisCity_House1/header.inc"
-	.include "data/maps/SootopolisCity_House2/header.inc"
-	.include "data/maps/SootopolisCity_House3/header.inc"
-	.include "data/maps/SootopolisCity_House4/header.inc"
-	.include "data/maps/SootopolisCity_House5/header.inc"
-	.include "data/maps/SootopolisCity_House6/header.inc"
-	.include "data/maps/SootopolisCity_House7/header.inc"
-	.include "data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc"
-	.include "data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc"
-	.include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc"
-	.include "data/maps/EverGrandeCity_SidneysRoom/header.inc"
-	.include "data/maps/EverGrandeCity_PhoebesRoom/header.inc"
-	.include "data/maps/EverGrandeCity_GlaciasRoom/header.inc"
-	.include "data/maps/EverGrandeCity_DrakesRoom/header.inc"
-	.include "data/maps/EverGrandeCity_ChampionsRoom/header.inc"
-	.include "data/maps/EverGrandeCity_Hall1/header.inc"
-	.include "data/maps/EverGrandeCity_Hall2/header.inc"
-	.include "data/maps/EverGrandeCity_Hall3/header.inc"
-	.include "data/maps/EverGrandeCity_Hall4/header.inc"
-	.include "data/maps/EverGrandeCity_Hall5/header.inc"
-	.include "data/maps/EverGrandeCity_PokemonLeague_1F/header.inc"
-	.include "data/maps/EverGrandeCity_HallOfFame/header.inc"
-	.include "data/maps/EverGrandeCity_PokemonCenter_1F/header.inc"
-	.include "data/maps/EverGrandeCity_PokemonCenter_2F/header.inc"
-	.include "data/maps/EverGrandeCity_PokemonLeague_2F/header.inc"
-	.include "data/maps/Route104_MrBrineysHouse/header.inc"
-	.include "data/maps/Route104_PrettyPetalFlowerShop/header.inc"
-	.include "data/maps/Route111_WinstrateFamilysHouse/header.inc"
-	.include "data/maps/Route111_OldLadysRestStop/header.inc"
-	.include "data/maps/Route112_CableCarStation/header.inc"
-	.include "data/maps/MtChimney_CableCarStation/header.inc"
-	.include "data/maps/Route114_FossilManiacsHouse/header.inc"
-	.include "data/maps/Route114_FossilManiacsTunnel/header.inc"
-	.include "data/maps/Route114_LanettesHouse/header.inc"
-	.include "data/maps/Route116_TunnelersRestHouse/header.inc"
-	.include "data/maps/Route117_PokemonDayCare/header.inc"
-	.include "data/maps/Route121_SafariZoneEntrance/header.inc"
-	.include "data/maps/MeteorFalls_1F_1R/header.inc"
-	.include "data/maps/MeteorFalls_1F_2R/header.inc"
-	.include "data/maps/MeteorFalls_B1F_1R/header.inc"
-	.include "data/maps/MeteorFalls_B1F_2R/header.inc"
-	.include "data/maps/RusturfTunnel/header.inc"
-	.include "data/maps/Underwater_SootopolisCity/header.inc"
-	.include "data/maps/DesertRuins/header.inc"
-	.include "data/maps/GraniteCave_1F/header.inc"
-	.include "data/maps/GraniteCave_B1F/header.inc"
-	.include "data/maps/GraniteCave_B2F/header.inc"
-	.include "data/maps/GraniteCave_StevensRoom/header.inc"
-	.include "data/maps/PetalburgWoods/header.inc"
-	.include "data/maps/MtChimney/header.inc"
-	.include "data/maps/JaggedPass/header.inc"
-	.include "data/maps/FieryPath/header.inc"
-	.include "data/maps/MtPyre_1F/header.inc"
-	.include "data/maps/MtPyre_2F/header.inc"
-	.include "data/maps/MtPyre_3F/header.inc"
-	.include "data/maps/MtPyre_4F/header.inc"
-	.include "data/maps/MtPyre_5F/header.inc"
-	.include "data/maps/MtPyre_6F/header.inc"
-	.include "data/maps/MtPyre_Exterior/header.inc"
-	.include "data/maps/MtPyre_Summit/header.inc"
-	.include "data/maps/AquaHideout_1F/header.inc"
-	.include "data/maps/AquaHideout_B1F/header.inc"
-	.include "data/maps/AquaHideout_B2F/header.inc"
-	.include "data/maps/Underwater_SeafloorCavern/header.inc"
-	.include "data/maps/SeafloorCavern_Entrance/header.inc"
-	.include "data/maps/SeafloorCavern_Room1/header.inc"
-	.include "data/maps/SeafloorCavern_Room2/header.inc"
-	.include "data/maps/SeafloorCavern_Room3/header.inc"
-	.include "data/maps/SeafloorCavern_Room4/header.inc"
-	.include "data/maps/SeafloorCavern_Room5/header.inc"
-	.include "data/maps/SeafloorCavern_Room6/header.inc"
-	.include "data/maps/SeafloorCavern_Room7/header.inc"
-	.include "data/maps/SeafloorCavern_Room8/header.inc"
-	.include "data/maps/SeafloorCavern_Room9/header.inc"
-	.include "data/maps/CaveOfOrigin_Entrance/header.inc"
-	.include "data/maps/CaveOfOrigin_1F/header.inc"
-	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc"
-	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc"
-	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc"
-	.include "data/maps/CaveOfOrigin_B1F/header.inc"
-	.include "data/maps/VictoryRoad_1F/header.inc"
-	.include "data/maps/VictoryRoad_B1F/header.inc"
-	.include "data/maps/VictoryRoad_B2F/header.inc"
-	.include "data/maps/ShoalCave_LowTideEntranceRoom/header.inc"
-	.include "data/maps/ShoalCave_LowTideInnerRoom/header.inc"
-	.include "data/maps/ShoalCave_LowTideStairsRoom/header.inc"
-	.include "data/maps/ShoalCave_LowTideLowerRoom/header.inc"
-	.include "data/maps/ShoalCave_HighTideEntranceRoom/header.inc"
-	.include "data/maps/ShoalCave_HighTideInnerRoom/header.inc"
-	.include "data/maps/NewMauville_Entrance/header.inc"
-	.include "data/maps/NewMauville_Inside/header.inc"
-	.include "data/maps/AbandonedShip_Deck/header.inc"
-	.include "data/maps/AbandonedShip_Corridors_1F/header.inc"
-	.include "data/maps/AbandonedShip_Rooms_1F/header.inc"
-	.include "data/maps/AbandonedShip_Corridors_B1F/header.inc"
-	.include "data/maps/AbandonedShip_Rooms_B1F/header.inc"
-	.include "data/maps/AbandonedShip_Rooms2_B1F/header.inc"
-	.include "data/maps/AbandonedShip_Underwater1/header.inc"
-	.include "data/maps/AbandonedShip_Room_B1F/header.inc"
-	.include "data/maps/AbandonedShip_Rooms2_1F/header.inc"
-	.include "data/maps/AbandonedShip_CaptainsOffice/header.inc"
-	.include "data/maps/AbandonedShip_Underwater2/header.inc"
-	.include "data/maps/AbandonedShip_HiddenFloorCorridors/header.inc"
-	.include "data/maps/AbandonedShip_HiddenFloorRooms/header.inc"
-	.include "data/maps/IslandCave/header.inc"
-	.include "data/maps/AncientTomb/header.inc"
-	.include "data/maps/Underwater_Route134/header.inc"
-	.include "data/maps/Underwater_SealedChamber/header.inc"
-	.include "data/maps/SealedChamber_OuterRoom/header.inc"
-	.include "data/maps/SealedChamber_InnerRoom/header.inc"
-	.include "data/maps/ScorchedSlab/header.inc"
-	.include "data/maps/AquaHideout_UnusedRubyMap1/header.inc"
-	.include "data/maps/AquaHideout_UnusedRubyMap2/header.inc"
-	.include "data/maps/AquaHideout_UnusedRubyMap3/header.inc"
-	.include "data/maps/SkyPillar_Entrance/header.inc"
-	.include "data/maps/SkyPillar_Outside/header.inc"
-	.include "data/maps/SkyPillar_1F/header.inc"
-	.include "data/maps/SkyPillar_2F/header.inc"
-	.include "data/maps/SkyPillar_3F/header.inc"
-	.include "data/maps/SkyPillar_4F/header.inc"
-	.include "data/maps/ShoalCave_LowTideIceRoom/header.inc"
-	.include "data/maps/SkyPillar_5F/header.inc"
-	.include "data/maps/SkyPillar_Top/header.inc"
-	.include "data/maps/MagmaHideout_1F/header.inc"
-	.include "data/maps/MagmaHideout_2F_1R/header.inc"
-	.include "data/maps/MagmaHideout_2F_2R/header.inc"
-	.include "data/maps/MagmaHideout_3F_1R/header.inc"
-	.include "data/maps/MagmaHideout_3F_2R/header.inc"
-	.include "data/maps/MagmaHideout_4F/header.inc"
-	.include "data/maps/MagmaHideout_3F_3R/header.inc"
-	.include "data/maps/MagmaHideout_2F_3R/header.inc"
-	.include "data/maps/MirageTower_1F/header.inc"
-	.include "data/maps/MirageTower_2F/header.inc"
-	.include "data/maps/MirageTower_3F/header.inc"
-	.include "data/maps/MirageTower_4F/header.inc"
-	.include "data/maps/DesertUnderpass/header.inc"
-	.include "data/maps/ArtisanCave_B1F/header.inc"
-	.include "data/maps/ArtisanCave_1F/header.inc"
-	.include "data/maps/Underwater_MarineCave/header.inc"
-	.include "data/maps/MarineCave_Entrance/header.inc"
-	.include "data/maps/MarineCave_End/header.inc"
-	.include "data/maps/TerraCave_Entrance/header.inc"
-	.include "data/maps/TerraCave_End/header.inc"
-	.include "data/maps/AlteringCave/header.inc"
-	.include "data/maps/MeteorFalls_StevensCave/header.inc"
-	.include "data/maps/SecretBase_RedCave1/header.inc"
-	.include "data/maps/SecretBase_BrownCave1/header.inc"
-	.include "data/maps/SecretBase_BlueCave1/header.inc"
-	.include "data/maps/SecretBase_YellowCave1/header.inc"
-	.include "data/maps/SecretBase_Tree1/header.inc"
-	.include "data/maps/SecretBase_Shrub1/header.inc"
-	.include "data/maps/SecretBase_RedCave2/header.inc"
-	.include "data/maps/SecretBase_BrownCave2/header.inc"
-	.include "data/maps/SecretBase_BlueCave2/header.inc"
-	.include "data/maps/SecretBase_YellowCave2/header.inc"
-	.include "data/maps/SecretBase_Tree2/header.inc"
-	.include "data/maps/SecretBase_Shrub2/header.inc"
-	.include "data/maps/SecretBase_RedCave3/header.inc"
-	.include "data/maps/SecretBase_BrownCave3/header.inc"
-	.include "data/maps/SecretBase_BlueCave3/header.inc"
-	.include "data/maps/SecretBase_YellowCave3/header.inc"
-	.include "data/maps/SecretBase_Tree3/header.inc"
-	.include "data/maps/SecretBase_Shrub3/header.inc"
-	.include "data/maps/SecretBase_RedCave4/header.inc"
-	.include "data/maps/SecretBase_BrownCave4/header.inc"
-	.include "data/maps/SecretBase_BlueCave4/header.inc"
-	.include "data/maps/SecretBase_YellowCave4/header.inc"
-	.include "data/maps/SecretBase_Tree4/header.inc"
-	.include "data/maps/SecretBase_Shrub4/header.inc"
-	.include "data/maps/SingleBattleColosseum/header.inc"
-	.include "data/maps/TradeCenter/header.inc"
-	.include "data/maps/RecordCorner/header.inc"
-	.include "data/maps/DoubleBattleColosseum/header.inc"
-	.include "data/maps/LinkContestRoom1/header.inc"
-	.include "data/maps/UnknownMap_25_29/header.inc"
-	.include "data/maps/UnknownMap_25_30/header.inc"
-	.include "data/maps/UnknownMap_25_31/header.inc"
-	.include "data/maps/UnknownMap_25_32/header.inc"
-	.include "data/maps/UnknownMap_25_33/header.inc"
-	.include "data/maps/UnknownMap_25_34/header.inc"
-	.include "data/maps/LinkContestRoom2/header.inc"
-	.include "data/maps/LinkContestRoom3/header.inc"
-	.include "data/maps/LinkContestRoom4/header.inc"
-	.include "data/maps/LinkContestRoom5/header.inc"
-	.include "data/maps/LinkContestRoom6/header.inc"
-	.include "data/maps/InsideOfTruck/header.inc"
-	.include "data/maps/SSTidalCorridor/header.inc"
-	.include "data/maps/SSTidalLowerDeck/header.inc"
-	.include "data/maps/SSTidalRooms/header.inc"
-	.include "data/maps/BattlePyramidSquare01/header.inc"
-	.include "data/maps/BattlePyramidSquare02/header.inc"
-	.include "data/maps/BattlePyramidSquare03/header.inc"
-	.include "data/maps/BattlePyramidSquare04/header.inc"
-	.include "data/maps/BattlePyramidSquare05/header.inc"
-	.include "data/maps/BattlePyramidSquare06/header.inc"
-	.include "data/maps/BattlePyramidSquare07/header.inc"
-	.include "data/maps/BattlePyramidSquare08/header.inc"
-	.include "data/maps/BattlePyramidSquare09/header.inc"
-	.include "data/maps/BattlePyramidSquare10/header.inc"
-	.include "data/maps/BattlePyramidSquare11/header.inc"
-	.include "data/maps/BattlePyramidSquare12/header.inc"
-	.include "data/maps/BattlePyramidSquare13/header.inc"
-	.include "data/maps/BattlePyramidSquare14/header.inc"
-	.include "data/maps/BattlePyramidSquare15/header.inc"
-	.include "data/maps/BattlePyramidSquare16/header.inc"
-	.include "data/maps/UnionRoom/header.inc"
-	.include "data/maps/SafariZone_Northwest/header.inc"
-	.include "data/maps/SafariZone_North/header.inc"
-	.include "data/maps/SafariZone_Southwest/header.inc"
-	.include "data/maps/SafariZone_South/header.inc"
-	.include "data/maps/BattleFrontier_OutsideWest/header.inc"
-	.include "data/maps/BattleFrontier_BattleTowerLobby/header.inc"
-	.include "data/maps/BattleFrontier_BattleTowerElevator/header.inc"
-	.include "data/maps/BattleFrontier_BattleTowerCorridor/header.inc"
-	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc"
-	.include "data/maps/SouthernIsland_Exterior/header.inc"
-	.include "data/maps/SouthernIsland_Interior/header.inc"
-	.include "data/maps/SafariZone_RestHouse/header.inc"
-	.include "data/maps/SafariZone_Northeast/header.inc"
-	.include "data/maps/SafariZone_Southeast/header.inc"
-	.include "data/maps/BattleFrontier_OutsideEast/header.inc"
-	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattleTowerCorridor2/header.inc"
-	.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc"
-	.include "data/maps/BattleFrontier_BattleDomeLobby/header.inc"
-	.include "data/maps/BattleFrontier_BattleDomeCorridor/header.inc"
-	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattlePalaceLobby/header.inc"
-	.include "data/maps/BattleFrontier_BattlePalaceCorridor/header.inc"
-	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattlePyramidLobby/header.inc"
-	.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc"
-	.include "data/maps/BattleFrontier_BattlePyramidTop/header.inc"
-	.include "data/maps/BattleFrontier_BattleArenaLobby/header.inc"
-	.include "data/maps/BattleFrontier_BattleArenaCorridor/header.inc"
-	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattleFactoryLobby/header.inc"
-	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattlePikeLobby/header.inc"
-	.include "data/maps/BattleFrontier_BattlePikeCorridor/header.inc"
-	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc"
-	.include "data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc"
-	.include "data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc"
-	.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc"
-	.include "data/maps/BattleFrontier_RankingHall/header.inc"
-	.include "data/maps/BattleFrontier_Lounge1/header.inc"
-	.include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc"
-	.include "data/maps/BattleFrontier_Lounge2/header.inc"
-	.include "data/maps/BattleFrontier_Lounge3/header.inc"
-	.include "data/maps/BattleFrontier_Lounge4/header.inc"
-	.include "data/maps/BattleFrontier_ScottsHouse/header.inc"
-	.include "data/maps/BattleFrontier_Lounge5/header.inc"
-	.include "data/maps/BattleFrontier_Lounge6/header.inc"
-	.include "data/maps/BattleFrontier_Lounge7/header.inc"
-	.include "data/maps/BattleFrontier_ReceptionGate/header.inc"
-	.include "data/maps/BattleFrontier_Lounge8/header.inc"
-	.include "data/maps/BattleFrontier_Lounge9/header.inc"
-	.include "data/maps/BattleFrontier_PokemonCenter_1F/header.inc"
-	.include "data/maps/BattleFrontier_PokemonCenter_2F/header.inc"
-	.include "data/maps/BattleFrontier_Mart/header.inc"
-	.include "data/maps/FarawayIsland_Entrance/header.inc"
-	.include "data/maps/FarawayIsland_Interior/header.inc"
-	.include "data/maps/BirthIsland_Exterior/header.inc"
-	.include "data/maps/BirthIsland_Harbor/header.inc"
-	.include "data/maps/TrainerHill_Entrance/header.inc"
-	.include "data/maps/TrainerHill_1F/header.inc"
-	.include "data/maps/TrainerHill_2F/header.inc"
-	.include "data/maps/TrainerHill_3F/header.inc"
-	.include "data/maps/TrainerHill_4F/header.inc"
-	.include "data/maps/TrainerHill_Roof/header.inc"
-	.include "data/maps/NavelRock_Exterior/header.inc"
-	.include "data/maps/NavelRock_Harbor/header.inc"
-	.include "data/maps/NavelRock_Entrance/header.inc"
-	.include "data/maps/NavelRock_B1F/header.inc"
-	.include "data/maps/NavelRock_Fork/header.inc"
-	.include "data/maps/NavelRock_Up1/header.inc"
-	.include "data/maps/NavelRock_Up2/header.inc"
-	.include "data/maps/NavelRock_Up3/header.inc"
-	.include "data/maps/NavelRock_Up4/header.inc"
-	.include "data/maps/NavelRock_Top/header.inc"
-	.include "data/maps/NavelRock_Down01/header.inc"
-	.include "data/maps/NavelRock_Down02/header.inc"
-	.include "data/maps/NavelRock_Down03/header.inc"
-	.include "data/maps/NavelRock_Down04/header.inc"
-	.include "data/maps/NavelRock_Down05/header.inc"
-	.include "data/maps/NavelRock_Down06/header.inc"
-	.include "data/maps/NavelRock_Down07/header.inc"
-	.include "data/maps/NavelRock_Down08/header.inc"
-	.include "data/maps/NavelRock_Down09/header.inc"
-	.include "data/maps/NavelRock_Down10/header.inc"
-	.include "data/maps/NavelRock_Down11/header.inc"
-	.include "data/maps/NavelRock_Bottom/header.inc"
-	.include "data/maps/TrainerHill_Elevator/header.inc"
-	.include "data/maps/Route104_Prototype/header.inc"
-	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc"
-	.include "data/maps/Route109_SeashoreHouse/header.inc"
-	.include "data/maps/Route110_TrickHouseEntrance/header.inc"
-	.include "data/maps/Route110_TrickHouseEnd/header.inc"
-	.include "data/maps/Route110_TrickHouseCorridor/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle1/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle2/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle3/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle4/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle5/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle6/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle7/header.inc"
-	.include "data/maps/Route110_TrickHousePuzzle8/header.inc"
-	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc"
-	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc"
-	.include "data/maps/Route113_GlassWorkshop/header.inc"
-	.include "data/maps/Route123_BerryMastersHouse/header.inc"
-	.include "data/maps/Route119_WeatherInstitute_1F/header.inc"
-	.include "data/maps/Route119_WeatherInstitute_2F/header.inc"
-	.include "data/maps/Route119_House/header.inc"
-	.include "data/maps/Route124_DivingTreasureHuntersHouse/header.inc"
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
new file mode 100644
index 000000000..4088ddbb5
--- /dev/null
+++ b/data/maps/map_groups.json
@@ -0,0 +1,691 @@
+{
+  "group_order": [
+    "gMapGroup0",
+    "gMapGroup1",
+    "gMapGroup2",
+    "gMapGroup3",
+    "gMapGroup4",
+    "gMapGroup5",
+    "gMapGroup6",
+    "gMapGroup7",
+    "gMapGroup8",
+    "gMapGroup9",
+    "gMapGroup10",
+    "gMapGroup11",
+    "gMapGroup12",
+    "gMapGroup13",
+    "gMapGroup14",
+    "gMapGroup15",
+    "gMapGroup16",
+    "gMapGroup17",
+    "gMapGroup18",
+    "gMapGroup19",
+    "gMapGroup20",
+    "gMapGroup21",
+    "gMapGroup22",
+    "gMapGroup23",
+    "gMapGroup24",
+    "gMapGroup25",
+    "gMapGroup26",
+    "gMapGroup27",
+    "gMapGroup28",
+    "gMapGroup29",
+    "gMapGroup30",
+    "gMapGroup31",
+    "gMapGroup32",
+    "gMapGroup33"
+  ],
+  "gMapGroup0": [
+    "PetalburgCity",
+    "SlateportCity",
+    "MauvilleCity",
+    "RustboroCity",
+    "FortreeCity",
+    "LilycoveCity",
+    "MossdeepCity",
+    "SootopolisCity",
+    "EverGrandeCity",
+    "LittlerootTown",
+    "OldaleTown",
+    "DewfordTown",
+    "LavaridgeTown",
+    "FallarborTown",
+    "VerdanturfTown",
+    "PacifidlogTown",
+    "Route101",
+    "Route102",
+    "Route103",
+    "Route104",
+    "Route105",
+    "Route106",
+    "Route107",
+    "Route108",
+    "Route109",
+    "Route110",
+    "Route111",
+    "Route112",
+    "Route113",
+    "Route114",
+    "Route115",
+    "Route116",
+    "Route117",
+    "Route118",
+    "Route119",
+    "Route120",
+    "Route121",
+    "Route122",
+    "Route123",
+    "Route124",
+    "Route125",
+    "Route126",
+    "Route127",
+    "Route128",
+    "Route129",
+    "Route130",
+    "Route131",
+    "Route132",
+    "Route133",
+    "Route134",
+    "Underwater1",
+    "Underwater2",
+    "Underwater3",
+    "Underwater4",
+    "Underwater5",
+    "Underwater6",
+    "Underwater7"
+  ],
+  "gMapGroup1": [
+    "LittlerootTown_BrendansHouse_1F",
+    "LittlerootTown_BrendansHouse_2F",
+    "LittlerootTown_MaysHouse_1F",
+    "LittlerootTown_MaysHouse_2F",
+    "LittlerootTown_ProfessorBirchsLab"
+  ],
+  "gMapGroup2": [
+    "OldaleTown_House1",
+    "OldaleTown_House2",
+    "OldaleTown_PokemonCenter_1F",
+    "OldaleTown_PokemonCenter_2F",
+    "OldaleTown_Mart"
+  ],
+  "gMapGroup3": [
+    "DewfordTown_House1",
+    "DewfordTown_PokemonCenter_1F",
+    "DewfordTown_PokemonCenter_2F",
+    "DewfordTown_Gym",
+    "DewfordTown_Hall",
+    "DewfordTown_House2"
+  ],
+  "gMapGroup4": [
+    "LavaridgeTown_HerbShop",
+    "LavaridgeTown_Gym_1F",
+    "LavaridgeTown_Gym_B1F",
+    "LavaridgeTown_House",
+    "LavaridgeTown_Mart",
+    "LavaridgeTown_PokemonCenter_1F",
+    "LavaridgeTown_PokemonCenter_2F"
+  ],
+  "gMapGroup5": [
+    "FallarborTown_Mart",
+    "FallarborTown_BattleTentLobby",
+    "FallarborTown_BattleTentCorridor",
+    "FallarborTown_BattleTentBattleRoom",
+    "FallarborTown_PokemonCenter_1F",
+    "FallarborTown_PokemonCenter_2F",
+    "FallarborTown_House1",
+    "FallarborTown_House2"
+  ],
+  "gMapGroup6": [
+    "VerdanturfTown_BattleTentLobby",
+    "VerdanturfTown_BattleTentCorridor",
+    "VerdanturfTown_BattleTentBattleRoom",
+    "VerdanturfTown_Mart",
+    "VerdanturfTown_PokemonCenter_1F",
+    "VerdanturfTown_PokemonCenter_2F",
+    "VerdanturfTown_WandasHouse",
+    "VerdanturfTown_FriendshipRatersHouse",
+    "VerdanturfTown_House"
+  ],
+  "gMapGroup7": [
+    "PacifidlogTown_PokemonCenter_1F",
+    "PacifidlogTown_PokemonCenter_2F",
+    "PacifidlogTown_House1",
+    "PacifidlogTown_House2",
+    "PacifidlogTown_House3",
+    "PacifidlogTown_House4",
+    "PacifidlogTown_House5"
+  ],
+  "gMapGroup8": [
+    "PetalburgCity_WallysHouse",
+    "PetalburgCity_Gym",
+    "PetalburgCity_House1",
+    "PetalburgCity_House2",
+    "PetalburgCity_PokemonCenter_1F",
+    "PetalburgCity_PokemonCenter_2F",
+    "PetalburgCity_Mart"
+  ],
+  "gMapGroup9": [
+    "SlateportCity_SternsShipyard_1F",
+    "SlateportCity_SternsShipyard_2F",
+    "SlateportCity_BattleTentLobby",
+    "SlateportCity_BattleTentCorridor",
+    "SlateportCity_BattleTentBattleRoom",
+    "SlateportCity_House1",
+    "SlateportCity_PokemonFanClub",
+    "SlateportCity_OceanicMuseum_1F",
+    "SlateportCity_OceanicMuseum_2F",
+    "SlateportCity_Harbor",
+    "SlateportCity_House2",
+    "SlateportCity_PokemonCenter_1F",
+    "SlateportCity_PokemonCenter_2F",
+    "SlateportCity_Mart"
+  ],
+  "gMapGroup10": [
+    "MauvilleCity_Gym",
+    "MauvilleCity_BikeShop",
+    "MauvilleCity_House1",
+    "MauvilleCity_GameCorner",
+    "MauvilleCity_House2",
+    "MauvilleCity_PokemonCenter_1F",
+    "MauvilleCity_PokemonCenter_2F",
+    "MauvilleCity_Mart"
+  ],
+  "gMapGroup11": [
+    "RustboroCity_DevonCorp_1F",
+    "RustboroCity_DevonCorp_2F",
+    "RustboroCity_DevonCorp_3F",
+    "RustboroCity_Gym",
+    "RustboroCity_PokemonSchool",
+    "RustboroCity_PokemonCenter_1F",
+    "RustboroCity_PokemonCenter_2F",
+    "RustboroCity_Mart",
+    "RustboroCity_Flat1_1F",
+    "RustboroCity_Flat1_2F",
+    "RustboroCity_House1",
+    "RustboroCity_CuttersHouse",
+    "RustboroCity_House2",
+    "RustboroCity_Flat2_1F",
+    "RustboroCity_Flat2_2F",
+    "RustboroCity_Flat2_3F",
+    "RustboroCity_House3"
+  ],
+  "gMapGroup12": [
+    "FortreeCity_House1",
+    "FortreeCity_Gym",
+    "FortreeCity_PokemonCenter_1F",
+    "FortreeCity_PokemonCenter_2F",
+    "FortreeCity_Mart",
+    "FortreeCity_House2",
+    "FortreeCity_House3",
+    "FortreeCity_House4",
+    "FortreeCity_House5",
+    "FortreeCity_DecorationShop"
+  ],
+  "gMapGroup13": [
+    "LilycoveCity_CoveLilyMotel_1F",
+    "LilycoveCity_CoveLilyMotel_2F",
+    "LilycoveCity_LilycoveMuseum_1F",
+    "LilycoveCity_LilycoveMuseum_2F",
+    "LilycoveCity_ContestLobby",
+    "LilycoveCity_ContestHall",
+    "LilycoveCity_PokemonCenter_1F",
+    "LilycoveCity_PokemonCenter_2F",
+    "LilycoveCity_UnusedMart",
+    "LilycoveCity_PokemonTrainerFanClub",
+    "LilycoveCity_Harbor",
+    "LilycoveCity_MoveDeletersHouse",
+    "LilycoveCity_House1",
+    "LilycoveCity_House2",
+    "LilycoveCity_House3",
+    "LilycoveCity_House4",
+    "LilycoveCity_DepartmentStore_1F",
+    "LilycoveCity_DepartmentStore_2F",
+    "LilycoveCity_DepartmentStore_3F",
+    "LilycoveCity_DepartmentStore_4F",
+    "LilycoveCity_DepartmentStore_5F",
+    "LilycoveCity_DepartmentStoreRooftop",
+    "LilycoveCity_DepartmentStoreElevator"
+  ],
+  "gMapGroup14": [
+    "MossdeepCity_Gym",
+    "MossdeepCity_House1",
+    "MossdeepCity_House2",
+    "MossdeepCity_PokemonCenter_1F",
+    "MossdeepCity_PokemonCenter_2F",
+    "MossdeepCity_Mart",
+    "MossdeepCity_House3",
+    "MossdeepCity_StevensHouse",
+    "MossdeepCity_House4",
+    "MossdeepCity_SpaceCenter_1F",
+    "MossdeepCity_SpaceCenter_2F",
+    "MossdeepCity_GameCorner_1F",
+    "MossdeepCity_GameCorner_B1F"
+  ],
+  "gMapGroup15": [
+    "SootopolisCity_Gym_1F",
+    "SootopolisCity_Gym_B1F",
+    "SootopolisCity_PokemonCenter_1F",
+    "SootopolisCity_PokemonCenter_2F",
+    "SootopolisCity_Mart",
+    "SootopolisCity_House1",
+    "SootopolisCity_House2",
+    "SootopolisCity_House3",
+    "SootopolisCity_House4",
+    "SootopolisCity_House5",
+    "SootopolisCity_House6",
+    "SootopolisCity_House7",
+    "SootopolisCity_LotadAndSeedotHouse",
+    "SootopolisCity_MysteryEventsHouse_1F",
+    "SootopolisCity_MysteryEventsHouse_B1F"
+  ],
+  "gMapGroup16": [
+    "EverGrandeCity_SidneysRoom",
+    "EverGrandeCity_PhoebesRoom",
+    "EverGrandeCity_GlaciasRoom",
+    "EverGrandeCity_DrakesRoom",
+    "EverGrandeCity_ChampionsRoom",
+    "EverGrandeCity_Hall1",
+    "EverGrandeCity_Hall2",
+    "EverGrandeCity_Hall3",
+    "EverGrandeCity_Hall4",
+    "EverGrandeCity_Hall5",
+    "EverGrandeCity_PokemonLeague_1F",
+    "EverGrandeCity_HallOfFame",
+    "EverGrandeCity_PokemonCenter_1F",
+    "EverGrandeCity_PokemonCenter_2F",
+    "EverGrandeCity_PokemonLeague_2F"
+  ],
+  "gMapGroup17": [
+    "Route104_MrBrineysHouse",
+    "Route104_PrettyPetalFlowerShop"
+  ],
+  "gMapGroup18": [
+    "Route111_WinstrateFamilysHouse",
+    "Route111_OldLadysRestStop"
+  ],
+  "gMapGroup19": [
+    "Route112_CableCarStation",
+    "MtChimney_CableCarStation"
+  ],
+  "gMapGroup20": [
+    "Route114_FossilManiacsHouse",
+    "Route114_FossilManiacsTunnel",
+    "Route114_LanettesHouse"
+  ],
+  "gMapGroup21": [
+    "Route116_TunnelersRestHouse"
+  ],
+  "gMapGroup22": [
+    "Route117_PokemonDayCare"
+  ],
+  "gMapGroup23": [
+    "Route121_SafariZoneEntrance"
+  ],
+  "gMapGroup24": [
+    "MeteorFalls_1F_1R",
+    "MeteorFalls_1F_2R",
+    "MeteorFalls_B1F_1R",
+    "MeteorFalls_B1F_2R",
+    "RusturfTunnel",
+    "Underwater_SootopolisCity",
+    "DesertRuins",
+    "GraniteCave_1F",
+    "GraniteCave_B1F",
+    "GraniteCave_B2F",
+    "GraniteCave_StevensRoom",
+    "PetalburgWoods",
+    "MtChimney",
+    "JaggedPass",
+    "FieryPath",
+    "MtPyre_1F",
+    "MtPyre_2F",
+    "MtPyre_3F",
+    "MtPyre_4F",
+    "MtPyre_5F",
+    "MtPyre_6F",
+    "MtPyre_Exterior",
+    "MtPyre_Summit",
+    "AquaHideout_1F",
+    "AquaHideout_B1F",
+    "AquaHideout_B2F",
+    "Underwater_SeafloorCavern",
+    "SeafloorCavern_Entrance",
+    "SeafloorCavern_Room1",
+    "SeafloorCavern_Room2",
+    "SeafloorCavern_Room3",
+    "SeafloorCavern_Room4",
+    "SeafloorCavern_Room5",
+    "SeafloorCavern_Room6",
+    "SeafloorCavern_Room7",
+    "SeafloorCavern_Room8",
+    "SeafloorCavern_Room9",
+    "CaveOfOrigin_Entrance",
+    "CaveOfOrigin_1F",
+    "CaveOfOrigin_UnusedRubySapphireMap1",
+    "CaveOfOrigin_UnusedRubySapphireMap2",
+    "CaveOfOrigin_UnusedRubySapphireMap3",
+    "CaveOfOrigin_B1F",
+    "VictoryRoad_1F",
+    "VictoryRoad_B1F",
+    "VictoryRoad_B2F",
+    "ShoalCave_LowTideEntranceRoom",
+    "ShoalCave_LowTideInnerRoom",
+    "ShoalCave_LowTideStairsRoom",
+    "ShoalCave_LowTideLowerRoom",
+    "ShoalCave_HighTideEntranceRoom",
+    "ShoalCave_HighTideInnerRoom",
+    "NewMauville_Entrance",
+    "NewMauville_Inside",
+    "AbandonedShip_Deck",
+    "AbandonedShip_Corridors_1F",
+    "AbandonedShip_Rooms_1F",
+    "AbandonedShip_Corridors_B1F",
+    "AbandonedShip_Rooms_B1F",
+    "AbandonedShip_Rooms2_B1F",
+    "AbandonedShip_Underwater1",
+    "AbandonedShip_Room_B1F",
+    "AbandonedShip_Rooms2_1F",
+    "AbandonedShip_CaptainsOffice",
+    "AbandonedShip_Underwater2",
+    "AbandonedShip_HiddenFloorCorridors",
+    "AbandonedShip_HiddenFloorRooms",
+    "IslandCave",
+    "AncientTomb",
+    "Underwater_Route134",
+    "Underwater_SealedChamber",
+    "SealedChamber_OuterRoom",
+    "SealedChamber_InnerRoom",
+    "ScorchedSlab",
+    "AquaHideout_UnusedRubyMap1",
+    "AquaHideout_UnusedRubyMap2",
+    "AquaHideout_UnusedRubyMap3",
+    "SkyPillar_Entrance",
+    "SkyPillar_Outside",
+    "SkyPillar_1F",
+    "SkyPillar_2F",
+    "SkyPillar_3F",
+    "SkyPillar_4F",
+    "ShoalCave_LowTideIceRoom",
+    "SkyPillar_5F",
+    "SkyPillar_Top",
+    "MagmaHideout_1F",
+    "MagmaHideout_2F_1R",
+    "MagmaHideout_2F_2R",
+    "MagmaHideout_3F_1R",
+    "MagmaHideout_3F_2R",
+    "MagmaHideout_4F",
+    "MagmaHideout_3F_3R",
+    "MagmaHideout_2F_3R",
+    "MirageTower_1F",
+    "MirageTower_2F",
+    "MirageTower_3F",
+    "MirageTower_4F",
+    "DesertUnderpass",
+    "ArtisanCave_B1F",
+    "ArtisanCave_1F",
+    "Underwater_MarineCave",
+    "MarineCave_Entrance",
+    "MarineCave_End",
+    "TerraCave_Entrance",
+    "TerraCave_End",
+    "AlteringCave",
+    "MeteorFalls_StevensCave"
+  ],
+  "gMapGroup25": [
+    "SecretBase_RedCave1",
+    "SecretBase_BrownCave1",
+    "SecretBase_BlueCave1",
+    "SecretBase_YellowCave1",
+    "SecretBase_Tree1",
+    "SecretBase_Shrub1",
+    "SecretBase_RedCave2",
+    "SecretBase_BrownCave2",
+    "SecretBase_BlueCave2",
+    "SecretBase_YellowCave2",
+    "SecretBase_Tree2",
+    "SecretBase_Shrub2",
+    "SecretBase_RedCave3",
+    "SecretBase_BrownCave3",
+    "SecretBase_BlueCave3",
+    "SecretBase_YellowCave3",
+    "SecretBase_Tree3",
+    "SecretBase_Shrub3",
+    "SecretBase_RedCave4",
+    "SecretBase_BrownCave4",
+    "SecretBase_BlueCave4",
+    "SecretBase_YellowCave4",
+    "SecretBase_Tree4",
+    "SecretBase_Shrub4",
+    "SingleBattleColosseum",
+    "TradeCenter",
+    "RecordCorner",
+    "DoubleBattleColosseum",
+    "LinkContestRoom1",
+    "UnknownLinkContestRoom_25_29",
+    "UnknownLinkContestRoom_25_30",
+    "UnknownLinkContestRoom_25_31",
+    "UnknownLinkContestRoom_25_32",
+    "UnknownLinkContestRoom_25_33",
+    "UnknownLinkContestRoom_25_34",
+    "LinkContestRoom2",
+    "LinkContestRoom3",
+    "LinkContestRoom4",
+    "LinkContestRoom5",
+    "LinkContestRoom6",
+    "InsideOfTruck",
+    "SSTidalCorridor",
+    "SSTidalLowerDeck",
+    "SSTidalRooms",
+    "BattlePyramidSquare01",
+    "BattlePyramidSquare02",
+    "BattlePyramidSquare03",
+    "BattlePyramidSquare04",
+    "BattlePyramidSquare05",
+    "BattlePyramidSquare06",
+    "BattlePyramidSquare07",
+    "BattlePyramidSquare08",
+    "BattlePyramidSquare09",
+    "BattlePyramidSquare10",
+    "BattlePyramidSquare11",
+    "BattlePyramidSquare12",
+    "BattlePyramidSquare13",
+    "BattlePyramidSquare14",
+    "BattlePyramidSquare15",
+    "BattlePyramidSquare16",
+    "UnionRoom"
+  ],
+  "gMapGroup26": [
+    "SafariZone_Northwest",
+    "SafariZone_North",
+    "SafariZone_Southwest",
+    "SafariZone_South",
+    "BattleFrontier_OutsideWest",
+    "BattleFrontier_BattleTowerLobby",
+    "BattleFrontier_BattleTowerElevator",
+    "BattleFrontier_BattleTowerCorridor",
+    "BattleFrontier_BattleTowerBattleRoom",
+    "SouthernIsland_Exterior",
+    "SouthernIsland_Interior",
+    "SafariZone_RestHouse",
+    "SafariZone_Northeast",
+    "SafariZone_Southeast",
+    "BattleFrontier_OutsideEast",
+    "BattleFrontier_BattleTowerMultiBattleRoom",
+    "BattleFrontier_BattleTowerCorridor2",
+    "BattleFrontier_BattleTowerBattleRoom2",
+    "BattleFrontier_BattleDomeLobby",
+    "BattleFrontier_BattleDomeCorridor",
+    "BattleFrontier_BattleDomePreBattleRoom",
+    "BattleFrontier_BattleDomeBattleRoom",
+    "BattleFrontier_BattlePalaceLobby",
+    "BattleFrontier_BattlePalaceCorridor",
+    "BattleFrontier_BattlePalaceBattleRoom",
+    "BattleFrontier_BattlePyramidLobby",
+    "BattleFrontier_BattlePyramidEmptySquare",
+    "BattleFrontier_BattlePyramidTop",
+    "BattleFrontier_BattleArenaLobby",
+    "BattleFrontier_BattleArenaCorridor",
+    "BattleFrontier_BattleArenaBattleRoom",
+    "BattleFrontier_BattleFactoryLobby",
+    "BattleFrontier_BattleFactoryPreBattleRoom",
+    "BattleFrontier_BattleFactoryBattleRoom",
+    "BattleFrontier_BattlePikeLobby",
+    "BattleFrontier_BattlePikeCorridor",
+    "BattleFrontier_BattlePikeThreePathRoom",
+    "BattleFrontier_BattlePikeRandomRoom1",
+    "BattleFrontier_BattlePikeRandomRoom2",
+    "BattleFrontier_BattlePikeRandomRoom3",
+    "BattleFrontier_RankingHall",
+    "BattleFrontier_Lounge1",
+    "BattleFrontier_BattlePointExchangeServiceCorner",
+    "BattleFrontier_Lounge2",
+    "BattleFrontier_Lounge3",
+    "BattleFrontier_Lounge4",
+    "BattleFrontier_ScottsHouse",
+    "BattleFrontier_Lounge5",
+    "BattleFrontier_Lounge6",
+    "BattleFrontier_Lounge7",
+    "BattleFrontier_ReceptionGate",
+    "BattleFrontier_Lounge8",
+    "BattleFrontier_Lounge9",
+    "BattleFrontier_PokemonCenter_1F",
+    "BattleFrontier_PokemonCenter_2F",
+    "BattleFrontier_Mart",
+    "FarawayIsland_Entrance",
+    "FarawayIsland_Interior",
+    "BirthIsland_Exterior",
+    "BirthIsland_Harbor",
+    "TrainerHill_Entrance",
+    "TrainerHill_1F",
+    "TrainerHill_2F",
+    "TrainerHill_3F",
+    "TrainerHill_4F",
+    "TrainerHill_Roof",
+    "NavelRock_Exterior",
+    "NavelRock_Harbor",
+    "NavelRock_Entrance",
+    "NavelRock_B1F",
+    "NavelRock_Fork",
+    "NavelRock_Up1",
+    "NavelRock_Up2",
+    "NavelRock_Up3",
+    "NavelRock_Up4",
+    "NavelRock_Top",
+    "NavelRock_Down01",
+    "NavelRock_Down02",
+    "NavelRock_Down03",
+    "NavelRock_Down04",
+    "NavelRock_Down05",
+    "NavelRock_Down06",
+    "NavelRock_Down07",
+    "NavelRock_Down08",
+    "NavelRock_Down09",
+    "NavelRock_Down10",
+    "NavelRock_Down11",
+    "NavelRock_Bottom",
+    "TrainerHill_Elevator"
+  ],
+  "gMapGroup27": [
+    "Route104_Prototype",
+    "Route104_PrototypePrettyPetalFlowerShop"
+  ],
+  "gMapGroup28": [
+    "Route109_SeashoreHouse"
+  ],
+  "gMapGroup29": [
+    "Route110_TrickHouseEntrance",
+    "Route110_TrickHouseEnd",
+    "Route110_TrickHouseCorridor",
+    "Route110_TrickHousePuzzle1",
+    "Route110_TrickHousePuzzle2",
+    "Route110_TrickHousePuzzle3",
+    "Route110_TrickHousePuzzle4",
+    "Route110_TrickHousePuzzle5",
+    "Route110_TrickHousePuzzle6",
+    "Route110_TrickHousePuzzle7",
+    "Route110_TrickHousePuzzle8",
+    "Route110_SeasideCyclingRoadNorthEntrance",
+    "Route110_SeasideCyclingRoadSouthEntrance"
+  ],
+  "gMapGroup30": [
+    "Route113_GlassWorkshop"
+  ],
+  "gMapGroup31": [
+    "Route123_BerryMastersHouse"
+  ],
+  "gMapGroup32": [
+    "Route119_WeatherInstitute_1F",
+    "Route119_WeatherInstitute_2F",
+    "Route119_House"
+  ],
+  "gMapGroup33": [
+    "Route124_DivingTreasureHuntersHouse"
+  ],
+  "connections_include_order": [
+    "LittlerootTown",
+    "OldaleTown",
+    "DewfordTown",
+    "LavaridgeTown",
+    "FallarborTown",
+    "VerdanturfTown",
+    "PacifidlogTown",
+    "PetalburgCity",
+    "SlateportCity",
+    "MauvilleCity",
+    "RustboroCity",
+    "FortreeCity",
+    "LilycoveCity",
+    "MossdeepCity",
+    "SootopolisCity",
+    "EverGrandeCity",
+    "Route101",
+    "Route102",
+    "Route103",
+    "Route104",
+    "Route105",
+    "Route106",
+    "Route107",
+    "Route108",
+    "Route109",
+    "Route110",
+    "Route111",
+    "Route112",
+    "Route113",
+    "Route114",
+    "Route115",
+    "Route116",
+    "Route117",
+    "Route118",
+    "Route119",
+    "Route120",
+    "Route121",
+    "Route122",
+    "Route123",
+    "Route124",
+    "Route125",
+    "Route126",
+    "Route127",
+    "Route128",
+    "Route129",
+    "Route130",
+    "Route131",
+    "Route132",
+    "Route133",
+    "Route134",
+    "Underwater6",
+    "Underwater1",
+    "Underwater7",
+    "Underwater2",
+    "Underwater3",
+    "Underwater4",
+    "Underwater5",
+    "SafariZone_Northwest",
+    "SafariZone_North",
+    "SafariZone_Southwest",
+    "SafariZone_South",
+    "SafariZone_Northeast",
+    "SafariZone_Southeast",
+    "BattleFrontier_OutsideWest",
+    "BattleFrontier_OutsideEast"
+  ]
+}
\ No newline at end of file
diff --git a/data/menu_specialized.s b/data/menu_specialized.s
new file mode 100644
index 000000000..e88a68fcc
--- /dev/null
+++ b/data/menu_specialized.s
@@ -0,0 +1,148 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	
+gUnknown_08625560:: @ 8625560
+	.incbin "graphics/pokenav/pokeball.4bpp"
+
+gUnknown_08625660:: @ 8625660
+	.incbin "graphics/pokenav/pokeball_placeholder.4bpp"
+	
+gUnknown_08625680:: @ 8625680
+	.incbin "graphics/pokenav/sparkle.gbapal"
+	
+gUnknown_086256A0:: @ 86255A0
+	.incbin "graphics/pokenav/sparkle.4bpp"
+	
+gUnknown_08625A20:: @ 8625A20
+	.2byte 0
+	.2byte 0xC000
+	.2byte 0x400
+	.2byte 0
+	
+gUnknown_08625A28:: @ 8625A28
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0x800
+	.2byte 0
+	
+gUnknown_08625A30:: @ 8625A30
+	.2byte 0
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A38:: @ 8625A38
+	.2byte 4
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A40:: @ 8625A40
+	.4byte gUnknown_08625A30
+	.4byte gUnknown_08625A38
+
+gUnknown_08625A48:: @ 8625A48
+	.4byte NULL
+	.4byte 0x640800
+
+gUnknown_08625A50:: @ 8625A50
+	spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_08625A68:: @ 8625A68
+	.4byte NULL
+	.4byte 0x64
+
+gUnknown_08625A70:: @ 8625A70
+	.4byte gUnknown_08625560
+	.byte 0, 1, 0x65, 0
+	.4byte gUnknown_08625660
+	.2byte 0x20, 0x67
+	.4byte gPokenavConditionCancel_Gfx
+	.byte 0, 1, 0x66, 0
+	.4byte NULL, NULL
+
+gUnknown_08625A90:: @ 8625A90
+	.4byte gPokenavConditionCancel_Pal + 0x0
+	.byte 0x65, 0, 0, 0
+	.4byte gPokenavConditionCancel_Pal + 0x20
+	.byte 0x66, 0, 0, 0
+	.4byte NULL, NULL
+
+gUnknown_08625AA8:: @ 8625AA8
+	spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_08625AC0:: @ 8625AC0
+	.4byte gUnknown_086256A0
+	.byte 0x80, 3, 0x68, 0
+
+gUnknown_08625AC8:: @ 8625AC8
+	.4byte gUnknown_08625680
+	.byte 0x68, 0, 0, 0
+	
+gUnknown_08625AD0:: @ 8625AD0
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08625AD8:: @ 8625AD8
+	.2byte 0
+	.2byte 5
+	.2byte 4
+	.2byte 5
+	
+gUnknown_08625AE0:: @ 8625AE0
+	.2byte 8
+	.2byte 5
+	.2byte 12
+	.2byte 5
+	
+gUnknown_08625AE8:: @ 8625AE8
+	.2byte 16
+	.2byte 5
+	.2byte 20
+	.2byte 5
+	
+gUnknown_08625AF0:: @ 8625AF0
+	.2byte 24
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625AF8:: @ 8625AF8
+	.4byte gUnknown_08625AD8
+	.4byte gUnknown_08625AE0
+	
+gUnknown_08625B00:: @ 8625B00
+	.4byte gUnknown_08625AE8
+	.4byte gUnknown_08625AF0
+	
+gUnknown_08625B08:: @ 8625B08
+	.4byte gUnknown_08625AF8
+	.4byte gUnknown_08625B00
+	.4byte gUnknown_08625B08
+
+gUnknown_08625B14:: @ 8625B14
+	spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
+
+gUnknown_08625B2C:: @ 8625B2C
+	.2byte 0, 0xFFDD
+	.2byte 20, 0xFFE4
+	.2byte 33, 0xFFF6
+	.2byte 33, 10
+	.2byte 20, 28
+	.2byte 0, 35
+	.2byte 0xFFEC, 28
+	.2byte 0xFFDF, 10
+	.2byte 0xFFDF, 0xFFF6
+	.2byte 0xFFEC, 0xFFE4
+
+gUnknown_08625B54:: @ 8625B54
+	.4byte gUnknown_085EEA46
+	.4byte gUnknown_085EEA4E
+	.4byte gUnknown_085EEA55
+	.4byte gUnknown_085EEA63
+	.4byte gUnknown_085EEA6B
+	.4byte gUnknown_085EEA5D
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s
index aa904b0bf..24a075181 100644
--- a/data/mystery_event_msg.s
+++ b/data/mystery_event_msg.s
@@ -1,5 +1,6 @@
 #include "constants/flags.h"
 #include "constants/items.h"
+#include "constants/map_scripts.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/species.h"
diff --git a/data/pokenav.s b/data/pokenav.s
index 1a5e2bd99..cb5030b4b 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -3,162 +3,6 @@
 
 	.section .rodata
 
-gUnknown_0861F3EC:: @ 861F3EC
-	.4byte sub_81C9298
-	.4byte sub_81C941C
-	.4byte sub_81C9924
-	.4byte sub_81C9990
-	.4byte sub_81C99C0
-	.4byte sub_81C9430
-	.4byte sub_81C99D4
-	.4byte sub_81C9298
-	.4byte sub_81C941C
-	.4byte sub_81C9940
-	.4byte sub_81C9990
-	.4byte sub_81C99C0
-	.4byte sub_81C9430
-	.4byte sub_81C99D4
-	.4byte sub_81C9338
-	.4byte sub_81C941C
-	.4byte sub_81C9940
-	.4byte sub_81C9990
-	.4byte sub_81C99C0
-	.4byte sub_81C9430
-	.4byte sub_81C99D4
-	.4byte sub_81C9368
-	.4byte sub_81C941C
-	.4byte sub_81C9940
-	.4byte sub_81C9990
-	.4byte sub_81C99C0
-	.4byte sub_81C9430
-	.4byte sub_81C99D4
-	.4byte sub_81C92CC
-	.4byte sub_81C941C
-	.4byte sub_81C9940
-	.4byte sub_81C9990
-	.4byte sub_81C99C0
-	.4byte sub_81C9430
-	.4byte sub_81C99D4
-	.4byte sub_81C9304
-	.4byte sub_81C941C
-	.4byte sub_81C9940
-	.4byte sub_81C9990
-	.4byte sub_81C99C0
-	.4byte sub_81C9430
-	.4byte sub_81C99D4
-	.4byte sub_81CC4D4
-	.4byte sub_81CC554
-	.4byte sub_81CC5F4
-	.4byte sub_81CC62C
-	.4byte sub_81CC65C
-	.4byte sub_81CC524
-	.4byte sub_81CC670
-	.4byte sub_81CCFD8
-	.4byte sub_81CD070
-	.4byte sub_81CDDD4
-	.4byte sub_81CDE2C
-	.4byte sub_81CDE64
-	.4byte sub_81CD1C0
-	.4byte sub_81CECA0
-	.4byte sub_81CEF3C
-	.4byte sub_81CEFDC
-	.4byte sub_81CF330
-	.4byte sub_81CF3A0
-	.4byte sub_81CF3D0
-	.4byte sub_81CEFF0
-	.4byte sub_81CF3F8
-	.4byte sub_81CD024
-	.4byte sub_81CD070
-	.4byte sub_81CDDD4
-	.4byte sub_81CDE2C
-	.4byte sub_81CDE64
-	.4byte sub_81CD1C0
-	.4byte sub_81CECA0
-	.4byte sub_81CEF98
-	.4byte sub_81CEFDC
-	.4byte sub_81CF368
-	.4byte sub_81CF3A0
-	.4byte sub_81CF3D0
-	.4byte sub_81CEFF0
-	.4byte sub_81CF3F8
-	.4byte sub_81CAAE8
-	.4byte sub_81CAB24
-	.4byte sub_81CB260
-	.4byte sub_81CB29C
-	.4byte sub_81CB2CC
-	.4byte sub_81CAB38
-	.4byte sub_81CB2E0
-	.4byte sub_81CF9BC
-	.4byte sub_81CFA34
-	.4byte sub_81CFDD0
-	.4byte sub_81CFE40
-	.4byte sub_81CFE70
-	.4byte sub_81CFA48
-	.4byte sub_81CFE98
-	.4byte sub_81D0450
-	.4byte sub_81D04A0
-	.4byte sub_81D0978
-	.4byte sub_81D09B0
-	.4byte sub_81D09E0
-	.4byte sub_81D04B8
-	.4byte sub_81D09F4
-	.4byte sub_81CFA04
-	.4byte sub_81CFA34
-	.4byte sub_81CFE08
-	.4byte sub_81CFE40
-	.4byte sub_81CFE70
-	.4byte sub_81CFA48
-	.4byte sub_81CFE98
-
-gUnknown_0861F590:: @ 861F590
-	.incbin "graphics/pokenav/icon2.gbapal"
-
-gUnknown_0861F5B0:: @ 861F5B0
-	.incbin "graphics/pokenav/icon2.4bpp.lz"
-
-gUnknown_0861F994:: @ 861F994
-	.incbin "graphics/pokenav/icon2_unused.4bpp.lz"
-
-gUnknown_0861FA04:: @ 861FA04
-	.byte 0x50
-	.byte 0x0
-	.byte 0x0
-	.byte 0x0
-
-gUnknown_0861FA08:: @ 861FA08
-	window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36
-	null_window_template
-
-gUnknown_0861FA18:: @ 861FA18
-	.4byte gUnknown_085EBED5
-	.4byte gUnknown_085EBED9
-	.4byte gUnknown_085EBEE9
-	.4byte gUnknown_085EBEF9
-	.4byte gUnknown_085EBF0E
-	.4byte gUnknown_085EBF22
-	.4byte gUnknown_085EBF39
-	.4byte gUnknown_085EBF49
-	.4byte gUnknown_085EBF57
-	.4byte gUnknown_085EBF60
-	.4byte gUnknown_085EBF73
-	.4byte gUnknown_085EBF84
-
-gUnknown_0861FA48:: @ 861FA48
-	.byte 0x4
-	.byte 0x1
-	.byte 0x2
-	.byte 0x0
-
-gUnknown_0861FA4C:: @ 861FA4C
-	obj_tiles gUnknown_0861F5B0, 0x1000, 0
-
-gUnknown_0861FA54:: @ 861FA54
-	obj_pal gUnknown_0861F590, 0
-	null_obj_pal
-
-gUnknown_0861FA64:: @ 861FA64
-	obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0xC00, 2
-
 gUnknown_0861FA6C:: @ 861FA6C
 	obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3
 	obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1
diff --git a/data/rom_81D1C44.s b/data/rom_81D1C44.s
deleted file mode 100644
index 9a012a6a7..000000000
--- a/data/rom_81D1C44.s
+++ /dev/null
@@ -1,251 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_086253E8:: @ 86253E8
-	.4byte 0x8010100
-	.4byte 0x80F02
-	.4byte 0x8011500
-	.4byte 0x180F12
-	.4byte 0xB010100
-	.4byte 0x180F08
-
-gUnknown_08625400:: @ 8625400
-	.byte 1, 2, 3
-
-gUnknown_08625403:: @ 8625403
-	.byte 0xFF
-
-gUnknown_08625404:: @ 8625404
-	.byte 0x40, 0, 0, 4, 1, 0, 0x60, 0xA6, 1, 0, 0, 0
-
-gUnknown_08625410:: @ 8625410
-	.byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23
-
-gUnknown_08625510:: @ 8625510
-	.4byte 0x10010101
-	.4byte 0xA0F0C
-	.4byte 0x10010101
-	.4byte 0xCA0F0C
-	.4byte 0xA011301
-	.4byte 0x18A0F0C
-	.4byte 0x160F0401
-	.4byte 0x2020F04
-	.4byte 0x5081600
-	.4byte 0x25A0F04
-	.4byte 0xFF
-	.4byte NULL
-
-gUnknown_08625540:: @ 8625540
-	.4byte 0x5081600
-	.4byte 0x25A0F04
-
-gUnknown_08625548:: @ 8625548
-	.4byte NULL
-	.4byte sub_81D2BD0
-	.4byte NULL
-	.2byte 0
-	.2byte 0
-	.byte 2
-	.byte 0
-	.byte 8
-	.byte 0
-	.4byte 0x1003121
-	
-gUnknown_08625560:: @ 8625560
-	.incbin "graphics/pokenav/pokeball.4bpp"
-
-gUnknown_08625660:: @ 8625660
-	.incbin "graphics/pokenav/8625660.4bpp"
-	
-gUnknown_08625680:: @ 8625680
-	.incbin "graphics/pokenav/sparkle.gbapal"
-	
-gUnknown_086256A0:: @ 86255A0
-	.incbin "graphics/pokenav/sparkle.4bpp"
-	
-gUnknown_08625A20:: @ 8625A20
-	.2byte 0
-	.2byte 0xC000
-	.2byte 0x400
-	.2byte 0
-	
-gUnknown_08625A28:: @ 8625A28
-	.2byte 0
-	.2byte 0x4000
-	.2byte 0x800
-	.2byte 0
-	
-gUnknown_08625A30:: @ 8625A30
-	.2byte 0
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625A38:: @ 8625A38
-	.2byte 4
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625A40:: @ 8625A40
-	.4byte gUnknown_08625A30
-	.4byte gUnknown_08625A38
-
-gUnknown_08625A48:: @ 8625A48
-	.4byte NULL
-	.4byte 0x640800
-
-gUnknown_08625A50:: @ 8625A50
-	spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08625A68:: @ 8625A68
-	.4byte NULL
-	.4byte 0x64
-
-gUnknown_08625A70:: @ 8625A70
-	.4byte gUnknown_08625560
-	.byte 0, 1, 0x65, 0
-	.4byte gUnknown_08625660
-	.2byte 0x20, 0x67
-	.4byte gPokenavConditionCancel_Gfx
-	.byte 0, 1, 0x66, 0
-	.4byte NULL, NULL
-
-gUnknown_08625A90:: @ 8625A90
-	.4byte gPokenavConditionCancel_Pal + 0x0
-	.byte 0x65, 0, 0, 0
-	.4byte gPokenavConditionCancel_Pal + 0x20
-	.byte 0x66, 0, 0, 0
-	.4byte NULL, NULL
-
-gUnknown_08625AA8:: @ 8625AA8
-	spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08625AC0:: @ 8625AC0
-	.4byte gUnknown_086256A0
-	.byte 0x80, 3, 0x68, 0
-
-gUnknown_08625AC8:: @ 8625AC8
-	.4byte gUnknown_08625680
-	.byte 0x68, 0, 0, 0
-	
-gUnknown_08625AD0:: @ 8625AD0
-	.2byte 0
-	.2byte 0x4000
-	.2byte 0
-	.2byte 0
-	
-gUnknown_08625AD8:: @ 8625AD8
-	.2byte 0
-	.2byte 5
-	.2byte 4
-	.2byte 5
-	
-gUnknown_08625AE0:: @ 8625AE0
-	.2byte 8
-	.2byte 5
-	.2byte 12
-	.2byte 5
-	
-gUnknown_08625AE8:: @ 8625AE8
-	.2byte 16
-	.2byte 5
-	.2byte 20
-	.2byte 5
-	
-gUnknown_08625AF0:: @ 8625AF0
-	.2byte 24
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625AF8:: @ 8625AF8
-	.4byte gUnknown_08625AD8
-	.4byte gUnknown_08625AE0
-	
-gUnknown_08625B00:: @ 8625B00
-	.4byte gUnknown_08625AE8
-	.4byte gUnknown_08625AF0
-	
-gUnknown_08625B08:: @ 8625B08
-	.4byte gUnknown_08625AF8
-	.4byte gUnknown_08625B00
-	.4byte gUnknown_08625B08
-
-gUnknown_08625B14:: @ 8625B14
-	spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
-
-gUnknown_08625B2C:: @ 8625B2C
-	.2byte 0, 0xFFDD
-	.2byte 20, 0xFFE4
-	.2byte 33, 0xFFF6
-	.2byte 33, 10
-	.2byte 20, 28
-	.2byte 0, 35
-	.2byte 0xFFEC, 28
-	.2byte 0xFFDF, 10
-	.2byte 0xFFDF, 0xFFF6
-	.2byte 0xFFEC, 0xFFE4
-
-gUnknown_08625B54:: @ 8625B54
-	.4byte gUnknown_085EEA46
-	.4byte gUnknown_085EEA4E
-	.4byte gUnknown_085EEA55
-	.4byte gUnknown_085EEA63
-	.4byte gUnknown_085EEA6B
-	.4byte gUnknown_085EEA5D
-
-gUnknown_08625B6C:: @ 8625B6C
-@ apparently e-reader trainer data? idk
-.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
-.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
-.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
-.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
-.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
-.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a
-.byte 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e
-.byte 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64
-.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01
-.byte 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff
-.byte 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
-.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00
-.byte 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02, 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16
-.byte 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff
-.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00
-.byte 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-.byte 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00
-.byte 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00
-.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff
-.byte 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18, 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff
-.byte 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-.byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00
-.byte 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64
-.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10
-.byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01
-.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-gUnknown_0862608C:: @ 862608C
-	.2byte 21, 16
-	.2byte 25, 16
-	.2byte 16, 17
-	.2byte 20, 20
-	
-gUnknown_0862609C:: @ 862609C
-	.incbin "data/unknown_jp_62609C.bin"
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 07b22dda2..39864b2a8 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -45,7 +45,7 @@ gScriptCmdTable:: @ 81DB67C
 	.4byte ScrCmd_clearflag
 	.4byte ScrCmd_checkflag
 	.4byte ScrCmd_initclock
-	.4byte ScrCmd_dodailyevents
+	.4byte ScrCmd_dotimebasedevents
 	.4byte ScrCmd_gettime
 	.4byte ScrCmd_playse
 	.4byte ScrCmd_waitse
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index ac4bd1979..d6713cde4 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
 	apprentice_msg TRUE, 11
 	setvar VAR_0x8004, 25
 	special CallApprenticeFunction
-	setvar VAR_0x8004, 19
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	setvar VAR_0x8004, 21
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index b73d7e1fa..1914fee4f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -74,7 +74,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23
 	msgbox gUnknown_08273594, MSGBOX_DEFAULT
 	giveitem_std ITEM_EON_TICKET
 	setflag FLAG_SYS_HAS_EON_TICKET
-	setvar VAR_0x403F, 0
+	setvar VAR_ALWAYS_ZERO_0x403F, 0
 	msgbox gUnknown_082735F2, MSGBOX_DEFAULT
 	release
 	end
@@ -101,14 +101,14 @@ RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
 SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
 SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
 VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
-	map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE
-	map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE
-	map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE
-	map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE
-	map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE
-	map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE
-	map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE
-	map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+	map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE
 	.2byte 0
 
 MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE
@@ -138,21 +138,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
 SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
 SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
 VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
-	compare VAR_0x4087, 1
+	compare VAR_CABLE_CLUB_STATE, 1
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
-	compare VAR_0x4087, 2
+	compare VAR_CABLE_CLUB_STATE, 2
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
-	compare VAR_0x4087, 5
+	compare VAR_CABLE_CLUB_STATE, 5
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
-	compare VAR_0x4087, 3
+	compare VAR_CABLE_CLUB_STATE, 3
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D
-	compare VAR_0x4087, 4
+	compare VAR_CABLE_CLUB_STATE, 4
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23
-	compare VAR_0x4087, 6
+	compare VAR_CABLE_CLUB_STATE, 6
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29
-	compare VAR_0x4087, 7
+	compare VAR_CABLE_CLUB_STATE, 7
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F
-	compare VAR_0x4087, 8
+	compare VAR_CABLE_CLUB_STATE, 8
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35
 	end
 
@@ -197,15 +197,15 @@ RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
 SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
 SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
 VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
-	map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0
-	map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85
-	map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85
-	map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85
-	map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7
-	map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C
-	map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C
-	map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85
-	map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D
+	map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0
+	map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85
+	map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85
+	map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85
+	map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7
+	map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C
+	map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C
+	map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85
+	map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D
 	.2byte 0
 
 OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85
@@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D
 
 OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5
 	special CloseLink
-	setvar VAR_0x4087, 0
+	setvar VAR_CABLE_CLUB_STATE, 0
 	compare VAR_0x8007, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
 	applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D
@@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7
 
 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF
 	special CloseLink
-	setvar VAR_0x4087, 0
+	setvar VAR_CABLE_CLUB_STATE, 0
 	compare VAR_0x8007, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
 	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
@@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C
 
 OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44
 	special CloseLink
-	setvar VAR_0x4087, 0
+	setvar VAR_CABLE_CLUB_STATE, 0
 	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F
 	waitmovement 0
 	compare VAR_0x8007, 0
@@ -298,7 +298,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84
-	setvar VAR_0x4087, 0
+	setvar VAR_CABLE_CLUB_STATE, 0
 	compare VAR_0x8007, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
 	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
@@ -328,7 +328,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5
 
 OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT
 	closemessage
@@ -336,7 +336,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
 	waitmovement 0
 	delay 30
 	msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT
-	setvar VAR_0x40CD, 2
+	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2
 	releaseall
 	end
 
@@ -425,7 +425,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
-	call OldaleTown_PokemonCenter_2F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	message gText_PleaseWaitForLink
@@ -450,7 +450,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
 	special HealPlayerParty
 	special SavePlayerParty
 	special LoadPlayerBag
-	copyvar VAR_0x4087, VAR_0x8004
+	copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
 	messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
 	waitmessage
 	call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
 	call OldaleTown_PokemonCenter_2F_EventScript_277199
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	call OldaleTown_PokemonCenter_2F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	message gText_PleaseWaitForLink
@@ -554,7 +554,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
 
 OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
 	setvar VAR_0x8004, 3
-	copyvar VAR_0x4087, VAR_0x8004
+	copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
 	messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
 	waitmessage
 	call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -602,7 +602,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD
 
 OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
 	copyvar VAR_0x8007, VAR_LAST_TALKED
-	call OldaleTown_PokemonCenter_2F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	message gText_PleaseWaitForLink
@@ -629,7 +629,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
 
 OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
 	setvar VAR_0x8004, 4
-	copyvar VAR_0x4087, VAR_0x8004
+	copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
 	messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
 	waitmessage
 	call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -791,116 +791,118 @@ EventScript_CableBoxResults:: @ 8277365
 	releaseall
 	end
 
-gUnknown_08277374:: @ 8277374
+EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
 	setvar VAR_0x8005, 0
-	special sub_80B3968
+	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-gUnknown_0827737E:: @ 827737E
+EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
 	setvar VAR_0x8005, 1
-	special sub_80B3968
+	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-gUnknown_08277388:: @ 8277388
+EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
 	fadescreen 1
-	special sub_80F9438
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
 	setvar VAR_0x8005, 0
-	special sub_80B3968
+	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-gUnknown_082773A3:: @ 82773A3
+EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
 	fadescreen 1
-	special sub_80F9438
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
 	setvar VAR_0x8005, 1
-	special sub_80B3968
+	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-gUnknown_082773BE:: @ 82773BE
+EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
 	fadescreen 1
-	special sub_80F9438
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
 	setvar VAR_0x8005, 2
-	special sub_80B3968
+	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-gUnknown_082773D9:: @ 82773D9
+EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
 	fadescreen 1
-	special sub_80F9438
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
 	setvar VAR_0x8005, 3
-	special sub_80B3968
+	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-DoubleBattleColosseum_EventScript_2773F4:: @ 82773F4
+EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
 	end
 
-gUnknown_082773F5:: @ 82773F5
+EventScript_TradeCenter_Chair0:: @ 82773F5
 	setvar VAR_0x8005, 0
-	special sub_80B3924
+	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
-gUnknown_082773FF:: @ 82773FF
+EventScript_TradeCenter_Chair1:: @ 82773FF
 	setvar VAR_0x8005, 1
-	special sub_80B3924
+	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
-gUnknown_08277409:: @ 8277409
+/* Never used */
+EventScript_TradeCenter_Chair2:: @ 8277409
 	setvar VAR_0x8005, 2
-	special sub_80B3924
+	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
-gUnknown_08277413:: @ 8277413
+/* Never used */
+EventScript_TradeCenter_Chair3:: @ 8277413
 	setvar VAR_0x8005, 3
-	special sub_80B3924
+	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
-gUnknown_0827741D:: @ 827741D
+EventScript_RecordCenter_Spot0:: @ 827741D
 	setvar VAR_0x8005, 0
-	special sub_80E6BE8
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_277471
 	end
 
-gUnknown_08277432:: @ 8277432
+EventScript_RecordCenter_Spot1:: @ 8277432
 	setvar VAR_0x8005, 1
-	special sub_80E6BE8
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_277471
 	end
 
-gUnknown_08277447:: @ 8277447
+EventScript_RecordCenter_Spot2:: @ 8277447
 	setvar VAR_0x8005, 2
-	special sub_80E6BE8
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_277471
 	end
 
-gUnknown_0827745C:: @ 827745C
+EventScript_RecordCenter_Spot3:: @ 827745C
 	setvar VAR_0x8005, 3
-	special sub_80E6BE8
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_277471
@@ -914,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471
 	releaseall
 	end
 
-EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E
+gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E
 	msgbox Text_278452, MSGBOX_DEFAULT
 	fadescreen 1
 	special sp02A_crash_sound
 	waitstate
 	end
 
-EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D
+gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D
 	msgbox Text_27847B, MSGBOX_DEFAULT
 	fadescreen 1
 	special sp02A_crash_sound
 	waitstate
 	end
 
-EventScript_TradeRoom_TooBusyToNotice:: @ 827749C
+gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C
 	msgbox Text_27842E, MSGBOX_DEFAULT
 	closemessage
 	end
@@ -967,22 +969,22 @@ RecordCorner_EventScript_2774E0:: @ 82774E0
 	closemessage
 	end
 
-gUnknown_082774EF:: @ 82774EF
-	msgbox Text_2783A8, MSGBOX_YESNO
+EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
+	msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq gUnknown_08277509
+	goto_if_eq EventScript_TerminateLink
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
-gUnknown_08277509:: @ 8277509
-	messageautoscroll Text_2783E9
+EventScript_TerminateLink:: @ 8277509
+	messageautoscroll Text_TerminateLinkPleaseWait
 	waitmessage
-	special sub_80B371C
+	special ExitLinkRoom
 	end
 
-EventScript_277513:: @ 8277513
-	special sub_80B36EC
+EventScript_DoLinkRoomExit:: @ 8277513
+	special CleanupLinkRoomState
 	special sub_80AF9F8
 	waitstate
 	end
@@ -1023,14 +1025,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 	call OldaleTown_PokemonCenter_2F_EventScript_277626
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	call OldaleTown_PokemonCenter_2F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT
 	closemessage
 	special HealPlayerParty
 	setvar VAR_0x8004, 6
-	copyvar VAR_0x4087, VAR_0x8004
+	copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
 	call OldaleTown_PokemonCenter_2F_EventScript_277BBE
 	special DrawWholeMapView
 	playse SE_TK_KASYA
@@ -1234,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931
-	call OldaleTown_PokemonCenter_2F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	switch VAR_0x8004
@@ -1513,7 +1515,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
 	waitstate
 	compare VAR_0x8004, 6
 	goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
-	call MossdeepCity_GameCorner_1F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
 	setvar VAR_0x8004, 4
@@ -1532,7 +1534,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
 	waitstate
 	compare VAR_0x8004, 6
 	goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
-	call MossdeepCity_GameCorner_1F_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
 	setvar VAR_0x8004, 6
@@ -1736,11 +1738,11 @@ OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372
 	.string "Please confirm the number of\n"
 	.string "players and start again.$"
 
-Text_2783A8: @ 82783A8
+Text_TerminateLinkConfirmation: @ 82783A8
 	.string "The link will be terminated if you\n"
 	.string "leave the room. Is that okay?$"
 
-Text_2783E9: @ 82783E9
+Text_TerminateLinkPleaseWait: @ 82783E9
 	.string "Terminating link…\n"
 	.string "You will be escorted out of\l"
 	.string "the room. Please wait.$"
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index f85ebd3d2..6c19cdc0c 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1,7 +1,7 @@
 LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
 	lock
 	faceplayer
-	compare VAR_0x408A, 0
+	compare VAR_CONTEST_PRIZE_PICKUP, 0
 	goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13
 	call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA
 	call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3
@@ -21,7 +21,7 @@ LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3
 
 LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
 	msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT
-	switch VAR_0x408A
+	switch VAR_CONTEST_PRIZE_PICKUP
 	case 4, LilycoveCity_ContestLobby_EventScript_279D2C
 	end
 
@@ -29,13 +29,13 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
 	giveitem_std ITEM_LUXURY_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B
-	setvar VAR_0x408A, 0
+	setvar VAR_CONTEST_PRIZE_PICKUP, 0
 	closemessage
 	release
 	end
 
 LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
-	call LilycoveCity_ContestLobby_EventScript_27205E
+	call Common_EventScript_BagIsFull
 	msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT
 	release
 	end
@@ -181,7 +181,7 @@ LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87
 	msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	setvar VAR_0x4086, 1
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
 	return
 
 LinkContestRoom1_EventScript_279F97:: @ 8279F97
@@ -204,7 +204,7 @@ LinkContestRoom1_EventScript_279F97:: @ 8279F97
 	call LinkContestRoom1_EventScript_27A9D4
 	call LinkContestRoom1_EventScript_27AA1B
 	call LinkContestRoom1_EventScript_27AB36
-	setvar VAR_0x4086, 2
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 2
 	return
 
 LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
@@ -271,7 +271,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097
 	return
 
 LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A0C7
 	lockall
 	msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT
@@ -391,7 +391,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
 	return
 
 LinkContestRoom1_EventScript_27A217:: @ 827A217
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A229
 	message LinkContestRoom1_Text_27B815
 	waitmessage
@@ -419,7 +419,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230
 	return
 
 LinkContestRoom1_EventScript_27A26C:: @ 827A26C
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A280
 	msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT
 	return
@@ -445,7 +445,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297
 	return
 
 LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A2CA
 	message LinkContestRoom1_Text_27B8F2
 	return
@@ -483,15 +483,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5
 
 LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 	special sub_80F82FC
-	compare VAR_0x4088, 1
+	compare VAR_CONTEST_LOCATION, 1
 	call_if_eq LinkContestRoom1_EventScript_27A454
-	compare VAR_0x4088, 2
+	compare VAR_CONTEST_LOCATION, 2
 	call_if_eq LinkContestRoom1_EventScript_27A4B2
-	compare VAR_0x4088, 3
+	compare VAR_CONTEST_LOCATION, 3
 	call_if_eq LinkContestRoom1_EventScript_27A510
-	compare VAR_0x4088, 4
+	compare VAR_CONTEST_LOCATION, 4
 	call_if_eq LinkContestRoom1_EventScript_27A56E
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	call_if_eq LinkContestRoom1_EventScript_27A5CC
 	setvar VAR_TEMP_1, 9
 	setvar VAR_TEMP_2, 9
@@ -843,7 +843,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801
 	return
 
 LinkContestRoom1_EventScript_27A853:: @ 827A853
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A867
 	msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT
 	return
@@ -893,7 +893,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
 	return
 
 LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A90F
 	msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT
 	return
@@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F
 	return
 
 LinkContestRoom1_EventScript_27A91E:: @ 827A91E
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A932
 	msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT
 	return
@@ -919,7 +919,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932
 	return
 
 LinkContestRoom1_EventScript_27A941:: @ 827A941
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A955
 	msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT
 	return
@@ -932,7 +932,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955
 	return
 
 LinkContestRoom1_EventScript_27A964:: @ 827A964
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27A978
 	msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT
 	return
@@ -983,7 +983,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
 	return
 
 LinkContestRoom1_EventScript_27AA00:: @ 827AA00
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27AA14
 	msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT
 	return
@@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14
 LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
 	addvar VAR_TEMP_1, 1
 	lockall
-	compare VAR_0x4088, 1
+	compare VAR_CONTEST_LOCATION, 1
 	call_if_gt LinkContestRoom1_EventScript_27AA6F
 	applymovement 9, LinkContestRoom1_Movement_27AD3B
 	applymovement 12, LinkContestRoom1_Movement_27AD3F
@@ -1081,7 +1081,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
 	return
 
 LinkContestRoom1_EventScript_27AB36:: @ 827AB36
-	compare VAR_0x4088, 5
+	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_27ABD8
 	call LinkContestRoom1_EventScript_27AB9E
 	goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82
@@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE
 	return
 
 LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2
-	setvar VAR_0x4099, 1
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
 	return
 
 LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
@@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
 	return
 
 LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1
-	setvar VAR_0x4099, 2
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2
 	return
 
 LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7
@@ -1201,7 +1201,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
 	return
 
 LinkContestRoom1_EventScript_27AC77:: @ 827AC77
-	compare VAR_0x4088, 2
+	compare VAR_CONTEST_LOCATION, 2
 	call_if_eq LinkContestRoom1_EventScript_27ABCE
 	specialvar VAR_RESULT, sub_80F7F7C
 	compare VAR_RESULT, 0
@@ -1215,10 +1215,10 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77
 
 LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
 	lockall
-	call LinkContestRoom1_EventScript_27205E
+	call Common_EventScript_BagIsFull
 	msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT
 	releaseall
-	setvar VAR_0x408A, 4
+	setvar VAR_CONTEST_PRIZE_PICKUP, 4
 	return
 
 LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 39de44ba6..31000539c 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94
 
 Route111_EventScript_28CF9F:: @ 828CF9F
 	applymovement VAR_0x8004, Route111_Movement_28D04F
-	applymovement VAR_0x8005, Route111_Movement_2725A6
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 Route111_EventScript_28CFB1:: @ 828CFB1
 	applymovement VAR_0x8004, Route111_Movement_28D051
-	applymovement VAR_0x8005, Route111_Movement_2725A4
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7
 	compare VAR_RESULT, 0
 	goto_if_eq Route111_EventScript_28D0E1
 	msgbox Route111_Text_28B433, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 10
-	call Route111_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 2791e5d9f..0ab47ea80 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
-	setvar VAR_0x8004, 6
-	call MauvilleCity_PokemonCenter_1F_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index ea805edc4..cc189a96b 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
 PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
 	msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 0
-	call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
@@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
 PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
 	msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 0
-	call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index eb29ef6e0..c4a5ffe86 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -1,12 +1,12 @@
 LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE
 LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE
-	setvar VAR_0x4092, 5
+	setvar VAR_LITTLEROOT_INTRO_STATE, 5
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704
 LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E
+	applymovement VAR_0x8004, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x8005, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D
@@ -14,20 +14,20 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x4092, 4
+	setvar VAR_LITTLEROOT_INTRO_STATE, 4
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0
 	waitmovement 0
 	releaseall
@@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT
 	call LittlerootTown_BrendansHouse_2F_EventScript_292849
 	delay 30
-	setvar VAR_0x4092, 6
+	setvar VAR_LITTLEROOT_INTRO_STATE, 6
 	setflag FLAG_SET_WALL_CLOCK
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
@@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
 	addobject VAR_0x8008
 	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
 	closemessage
@@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
 	addobject VAR_0x8008
 	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
 	closemessage
@@ -149,12 +149,12 @@ LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862
 
 LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866
 LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866
-	setvar VAR_0x4092, 7
+	setvar VAR_LITTLEROOT_INTRO_STATE, 7
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	call LittlerootTown_BrendansHouse_1F_EventScript_29294B
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0
@@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6
 	waitmovement 0
 	call LittlerootTown_BrendansHouse_1F_EventScript_29296C
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
-	applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	call LittlerootTown_MaysHouse_1F_EventScript_29294B
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8
@@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE
 	waitmovement 0
 	call LittlerootTown_MaysHouse_1F_EventScript_29296C
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
 	msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
 LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B
 LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
 	playse SE_PIN
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_272598
+	applymovement VAR_0x8005, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	applymovement VAR_0x8005, Common_Movement_Delay48
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT
 	closemessage
@@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
 
 LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
 LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
 	fadedefaultbgm
@@ -313,15 +313,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5
 LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
 	lock
 	faceplayer
-	compare VAR_0x4082, 4
+	compare VAR_LITTLEROOT_HOUSES_STATE, 4
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
-	compare VAR_0x408C, 4
+	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
 	goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19
 	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86
 	compare VAR_TEMP_1, 1
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94
-	compare VAR_0x4092, 7
+	compare VAR_LITTLEROOT_INTRO_STATE, 7
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
 	release
@@ -355,7 +355,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT
 	giveitem_std ITEM_AMULET_COIN
 	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
 	setflag FLAG_MOM_SAYS_GOODBYE
 	release
@@ -373,7 +373,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94
 
 LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E
 	closemessage
-	call LittlerootTown_BrendansHouse_1F_EventScript_272083
+	call Common_EventScript_OutOfCenterPartyHeal
 	incrementgamestat 16
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT
 	release
@@ -446,12 +446,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08
 	compare VAR_0x8008, 1
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E
+	applymovement VAR_0x8009, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_272598
+	applymovement VAR_0x8009, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	applymovement VAR_0x8009, Common_Movement_Delay48
 	waitmovement 0
 	delay 20
 	compare VAR_0x8008, 0
@@ -510,14 +510,15 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	multichoice 22, 8, 108, 1
 	copyvar VAR_0x8004, VAR_RESULT
 	special InitRoamer
-	copyvar VAR_0x40D5, VAR_RESULT
+	copyvar VAR_ROAMER_POKEMON, VAR_RESULT
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x4082, 4
-	setvar VAR_0x408C, 4
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 4
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4
 	releaseall
 	end
 
+@ Never called.
 LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72
 	setflag FLAG_SYS_TV_LATIAS_LATIOS
 	return
@@ -585,28 +586,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13
 LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7
 	waitmovement 0
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE
 	waitmovement 0
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+	applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48
 	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D
 	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -623,14 +624,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D
 LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88
 	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
 	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 05b468e23..a26ecb4c9 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -264,7 +264,7 @@ EventScript_Pblock1_No: @ 8293C70
 
 EventScript_Pblock1_NoBerries: @ 8293C7A
 	msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92
 	goto LilycoveCity_ContestLobby_EventScript_293C9C
 	end
@@ -333,7 +333,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43
 LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
 	lockall
 	setvar VAR_0x8009, 2
-	applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2
+	applymovement 10, Common_Movement_FaceOriginalDirection
 	applymovement 3, LilycoveCity_ContestLobby_Movement_294053
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO
@@ -398,8 +398,8 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
 	lockall
 	setvar VAR_0x8008, 15
 	setvar VAR_0x8009, 3
-	applymovement 9, LilycoveCity_ContestLobby_Movement_2725A2
-	applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2
+	applymovement 9, Common_Movement_FaceOriginalDirection
+	applymovement 17, Common_Movement_FaceOriginalDirection
 	applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO
@@ -551,7 +551,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, 65535
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028
 	goto LilycoveCity_ContestLobby_EventScript_294032
 	end
@@ -602,7 +602,7 @@ EventScript_PblocLink_NoBerries: @ 82940B1
 	end
 
 EventScript_PblocLink_TryConnect: @ 82940BB
-	call LilycoveCity_ContestLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_PblocLink_End
 	specialvar VAR_RESULT, IsWirelessAdapterConnected
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 1fcf5d166..3539e0970 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,11 +1,11 @@
 EventScript_2A4B4C:: @ 82A4B4C
-	setvar VAR_0x40A4, 1
+	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	end
 
 EventScript_2A4B5D:: @ 82A4B5D
-	setvar VAR_0x40A4, 1
+	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index db8aece85..6302a33a8 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -430,21 +430,21 @@ EventScript_275B4D:: @ 8275B4D
 EventScript_275B5B:: @ 8275B5B
 	closemessage
 	playse SE_KAIDAN
-	setvar VAR_0x4097, 0
+	setvar VAR_INIT_SECRET_BASE, 0
 	setflag FLAG_DECORATION_0
 	special sub_80E8E18
 	special sub_80E9068
 	setvar VAR_0x8004, 0
 	setvar VAR_0x8005, 0
 	special sub_80E933C
-	setvar VAR_0x4089, 1
+	setvar VAR_SECRET_BASE_INITIALIZED, 1
 	waitstate
 	end
 
 SecretBase_RedCave1_EventScript_275B81:: @ 8275B81
 	applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4
 	waitmovement 0
-	setvar VAR_0x4097, 1
+	setvar VAR_INIT_SECRET_BASE, 1
 	msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_275BAB
@@ -467,21 +467,21 @@ SecretBase_RedCave1_Movement_275BB4: @ 8275BB4
 
 EventScript_275BB7:: @ 8275BB7
 	lockall
-	setvar VAR_0x4097, 1
+	setvar VAR_INIT_SECRET_BASE, 1
 	playse SE_KAIDAN
 	special sub_80E9744
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275BDB
 	clearflag FLAG_DECORATION_0
 	special sub_80E9068
-	setvar VAR_0x4089, 0
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	waitstate
 	end
 
 EventScript_275BDB:: @ 8275BDB
 	setflag FLAG_DECORATION_0
 	special sub_80E9068
-	setvar VAR_0x4089, 0
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	waitstate
 	end
 
@@ -570,7 +570,7 @@ EventScript_275D0C:: @ 8275D0C
 	setvar VAR_0x8004, 0
 	setvar VAR_0x8005, 0
 	special sub_80E933C
-	setvar VAR_0x4089, 1
+	setvar VAR_SECRET_BASE_INITIALIZED, 1
 	end
 
 EventScript_275D1F:: @ 8275D1F
@@ -660,7 +660,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6
 	goto_if_eq SecretBase_RedCave1_EventScript_275E2F
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_275E2F
 	msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT
@@ -696,7 +696,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E
 	goto_if_eq SecretBase_RedCave1_EventScript_275EA7
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_275EA7
 	msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT
@@ -732,7 +732,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6
 	goto_if_eq SecretBase_RedCave1_EventScript_275F1F
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_275F1F
 	msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT
@@ -768,7 +768,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E
 	goto_if_eq SecretBase_RedCave1_EventScript_275F97
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_275F97
 	msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT
@@ -804,7 +804,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6
 	goto_if_eq SecretBase_RedCave1_EventScript_27600F
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_27600F
 	msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT
@@ -840,7 +840,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E
 	goto_if_eq SecretBase_RedCave1_EventScript_276087
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_276087
 	msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT
@@ -876,7 +876,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6
 	goto_if_eq SecretBase_RedCave1_EventScript_2760FF
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_2760FF
 	msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT
@@ -912,7 +912,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E
 	goto_if_eq SecretBase_RedCave1_EventScript_276177
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_276177
 	msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT
@@ -948,7 +948,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196
 	goto_if_eq SecretBase_RedCave1_EventScript_2761EF
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_2761EF
 	msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT
@@ -984,7 +984,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E
 	goto_if_eq SecretBase_RedCave1_EventScript_276267
 	setvar VAR_RESULT, 1
 	special sub_80EA30C
-	call SecretBase_RedCave1_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_276267
 	msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index acc75f76a..4a276ffc0 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -42,6 +42,9 @@ EventScript_27EE9A:: @ 827EE9A
 
 EventScript_27EEA4:: @ 827EEA4
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
+	@ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and
+	@ It's called again when Mom actually asks for the color, overwriting
+	@ whatever it does here.
 	special InitRoamer
 	clearflag FLAG_SYS_TV_LATIAS_LATIOS
 	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
diff --git a/data/slot_machine.s b/data/slot_machine.s
index 4a354d71c..a3d502dcc 100644..100755
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -10,7 +10,7 @@ gUnknown_085A7A3C:: @ 85A7A3C
 	.2byte 0
 	.2byte 0
 	.2byte 0
-	
+
 gUnknown_085A7A44:: @ 85A7A44
 	.2byte 0x8000
 	.2byte 0
@@ -22,13 +22,13 @@ gUnknown_085A7A4C:: @ 85A7A4C
 	.2byte 0x4000
 	.2byte 0
 	.2byte 0
-	
+
 gUnknown_085A7A54:: @ 85A7A54
 	.2byte 0x8000
 	.2byte 0x8000
 	.2byte 0
 	.2byte 0
-	
+
 gUnknown_085A7A5C:: @ 85A7A5C
 	.2byte 0
 	.2byte 0x8000
@@ -40,7 +40,7 @@ gUnknown_085A7A64:: @ 85A7A64
 	.2byte 0xC000
 	.2byte 0
 	.2byte 0
-	
+
 gUnknown_085A7A6C:: @ 85A7A6C
 	.2byte 0x4000
 	.2byte 0xC000
@@ -95,7 +95,7 @@ gUnknown_085A7ACC:: @ 85A7ACC
 	.4byte gSlotMachineReelTimePikaAura
 	.2byte 0x400
 	.2byte 0
-	
+
 gUnknown_085A7AD4:: @ 85A7CD4
 	.4byte gSlotMachineReelTimeExplosion0
 	.2byte 0x200
@@ -111,7 +111,7 @@ gUnknown_085A7AE4:: @ 85A7AE4
 gUnknown_085A7AEC:: @ 85A7AEC
 	.4byte gSlotMachineReelTimeSmoke
 	.4byte 0x80
-	
+
 gUnknown_085A7AF4:: @ 85A7AF4
 	.4byte gSlotMachineReelTimeBolt
 	.4byte 32
@@ -123,7 +123,7 @@ gUnknown_085A7AFC:: @ 85A7AFC
 gUnknown_085A7B04:: @ 85A7B04
 	obj_image_anim_frame 0, 1
 	obj_image_anim_jump 0
-	
+
 gUnknown_085A7B0C:: @ 85A7B0C
 	obj_image_anim_frame 0, 16
 	obj_image_anim_end
@@ -258,18 +258,18 @@ gUnknown_085A7C30:: @ 85A7C30
 
 gUnknown_085A7C34:: @ 85A7C34
 	.4byte gUnknown_085A7B88
-	
+
 gUnknown_085A7C38:: @ 85A7C38
 	.4byte gUnknown_085A7B94
 	.4byte gUnknown_085A7BA0
-	
+
 gUnknown_085A7C40:: @ 85A7C40
 	.4byte gUnknown_085A7BA8
-	
+
 gUnknown_085A7C44:: @ 85A7C44
 	.4byte gUnknown_085A7BB4
 	.4byte gUnknown_085A7BC8
-	
+
 gUnknown_085A7C4C:: @ 85A7C4C
 	.4byte gUnknown_085A7BD0
 	.4byte gUnknown_085A7BD8
@@ -283,7 +283,7 @@ gUnknown_085A7C60:: @ 85A7C60
 	obj_rot_scal_anim_frame 1, 1, 0, 1
 	obj_rot_scal_anim_loop 0xFF
 	obj_rot_scal_anim_end
-	
+
 gUnknown_085A7C88:: @ 85A7C88
 	.4byte gUnknown_085A7C60
 
@@ -301,7 +301,7 @@ gUnknown_085A7C8C:: @ 85A7C8C
 
 gUnknown_085A7CDC:: @ 85A7CDC
 	.4byte gUnknown_085A7C8C
-	
+
 gSpriteTemplate_83ED414:: @ 85A7CE0
 	spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18
 
@@ -346,52 +346,52 @@ gSpriteTemplate_83ED54C:: @ 85A7E18
 
 gSpriteTemplate_83ED564:: @ 85A7E30
 	spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38
-	
+
 gUnknown_085A7E48:: @ 85A7E48
 	spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7E60:: @ 85A7E60
 	spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7E78:: @ 85A7E78
 	spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7E90:: @ 85A7E90
 	spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7EA8:: @ 85A7EA8
 	spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7EC0:: @ 85A7EC0
 	spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_085A7ED8:: @ 85A7ED8
 	spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7EF0:: @ 85A7EF0
 	spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7F08:: @ 85A7F08
 	spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7F20:: @ 85A7F20
 	spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7F38:: @ 85A7F38
 	spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7F50:: @ 85A7F50
 	spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7F68:: @ 85A7F68
 	spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gUnknown_085A7F80:: @ 85A7F80
 	spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	
+
 gSpriteTemplate_83ED6CC:: @ 85A7F98
 	spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70
-	
+
 gUnknown_085A7FB0:: @ 85A7FB0
 	subsprite -64, -64, 3, 0, 64x64
 	subsprite 0, -64, 3, 0, 64x64
@@ -400,7 +400,7 @@ gUnknown_085A7FB0:: @ 85A7FB0
 
 gSubspriteTables_83ED704:: @ 85A7FC0
 	.4byte 4, gUnknown_085A7FB0
-	
+
 gUnknown_085A7FC8:: @ 85A7FC8
 	subsprite -32, -12, 1, 0, 32x8
 	subsprite 0, -12, 1, 4, 32x8
@@ -416,7 +416,7 @@ gUnknown_085A7FE8:: @ 85A7FE8
 	subsprite -32, -20, 1, 0, 64x32
 	subsprite -32, 12, 1, 32, 32x8
 	subsprite 0, 12, 1, 36, 32x8
-	
+
 gSubspriteTables_83ED75C:: @ 85A7FF4
 	.4byte 3, gUnknown_085A7FE8
 
@@ -426,10 +426,10 @@ gUnknown_085A7FFC:: @ 85A7FFC
 	subsprite 0, 8, 1, 36, 32x8
 	subsprite -32, 16, 1, 40, 32x8
 	subsprite 0, 16, 1, 44, 32x8
-	
+
 gSubspriteTables_83ED78C:: @ 85A8010
 	.4byte 5, gUnknown_085A7FFC
-	
+
 gUnknown_085A8018:: @ 85A8018
 	subsprite -32, -8, 1, 0, 32x8
 	subsprite 0, -8, 1, 4, 32x8
@@ -438,7 +438,7 @@ gUnknown_085A8018:: @ 85A8018
 
 gSubspriteTables_83ED7B4:: @ 85A8028
 	.4byte 4, gUnknown_085A8018
-	
+
 gUnknown_085A8030:: @ 85A8030
 	subsprite -8, -12, 1, 0, 16x8
 	subsprite -8, -4, 1, 0, 16x8
@@ -474,7 +474,7 @@ gUnknown_085A8078:: @ 85A8078
 
 gUnknown_085A8088:: @ 85A8088
 	.4byte 4, gUnknown_085A8078
-	
+
 gUnknown_085A8090:: @ 85A8090
 	subsprite -32, -8, 3, 0, 32x8
 	subsprite 0, -8, 3, 4, 32x8
@@ -483,7 +483,7 @@ gUnknown_085A8090:: @ 85A8090
 
 gUnknown_085A80A0:: @ 85A80A0
 	.4byte 4, gUnknown_085A8090
-	
+
 gUnknown_085A80A8:: @ 85A80A8
 	subsprite -32, -12, 3, 0, 32x8
 	subsprite 0, -12, 3, 4, 32x8
@@ -494,19 +494,19 @@ gUnknown_085A80A8:: @ 85A80A8
 
 gUnknown_085A80C0:: @ 85A80C0
 	.4byte 6, gUnknown_085A80A8
-	
+
 gUnknown_085A80C8:: @ 85A80C8
 	subsprite -16, -16, 3, 0, 32x32
-	
+
 gUnknown_085A80CC:: @ 85A80CC
 	subsprite -8, -8, 3, 16, 16x16
 
 gUnknown_085A80D0:: @ 85A80D0
 	.4byte 1, gUnknown_085A80C8
-	
+
 gUnknown_085A80D8:: @ 85A80D8
 	.4byte 1, gUnknown_085A80CC
-	
+
 gUnknown_085A80E0:: @ 85A80E0
 	subsprite -24, -24, 3, 0, 32x8
 	subsprite 8, -24, 3, 4, 16x8
@@ -523,78 +523,78 @@ gUnknown_085A80E0:: @ 85A80E0
 
 gUnknown_085A8110:: @ 85A8110
 	.4byte 12, gUnknown_085A80E0
-	
+
 gUnknown_085A8118:: @ 85A8118
 	subsprite -16, -12, 3, 0, 32x16
 	subsprite -16, 4, 3, 8, 16x8
 	subsprite 0, 4, 3, 10, 16x8
-	
+
 gUnknown_085A8124:: @ 85A8124
 	.4byte 3, gUnknown_085A8118
-	
+
 gUnknown_085A812C:: @ 85A812C
 	subsprite -8, -8, 3, 0, 16x8
 	subsprite -8, 0, 3, 8, 16x8
-	
+
 gUnknown_085A8134:: @ 85A8134
 	.4byte 2, gUnknown_085A812C
-	
+
 gUnknown_085A813C:: @ 85A813C
 	subsprite -8, -8, 3, 2, 16x8
 	subsprite -8, 0, 3, 10, 16x8
-	
+
 gUnknown_085A8144:: @ 85A8144
 	.4byte 2, gUnknown_085A813C
-	
+
 gUnknown_085A814C:: @ 85A814C
 	subsprite -8, -8, 3, 4, 16x8
 	subsprite -8, 0, 3, 12, 16x8
-	
+
 gUnknown_085A8154:: @ 85A8154
 	.4byte 2, gUnknown_085A814C
-	
+
 gUnknown_085A815C:: @ 85A815C
 	subsprite -8, -8, 3, 6, 16x8
 	subsprite -8, 0, 3, 14, 16x8
-	
+
 gUnknown_085A8164:: @ 85A8164
 	.4byte 2, gUnknown_085A815C
-	
+
 gUnknown_085A816C:: @ 85A816C
 	subsprite -8, -8, 3, 0, 16x8
 	subsprite -8, 0, 3, 8, 16x8
-	
+
 gUnknown_085A8174:: @ 85A8174
 	.4byte 2, gUnknown_085A816C
-	
+
 gUnknown_085A817C:: @ 85A817C
 	subsprite -4, -8, 3, 2, 8x8
 	subsprite -4, 0, 3, 10, 8x8
-	
+
 gUnknown_085A8184:: @ 85A8184
 	.4byte 2, gUnknown_085A817C
-	
+
 gUnknown_085A818C:: @ 85A818C
 	subsprite -8, -8, 3, 3, 16x8
 	subsprite -8, 0, 3, 11, 16x8
-	
+
 gUnknown_085A8194:: @ 85A8194
 	.4byte 2, gUnknown_085A818C
-	
+
 gUnknown_085A819C:: @ 85A819C
 	subsprite -4, -8, 3, 5, 8x8
 	subsprite -4, 0, 3, 13, 8x8
-	
+
 gUnknown_085A81A4:: @ 85A81A4
 	.4byte 2, gUnknown_085A819C
-	
+
 gUnknown_085A81AC:: @ 85A81AC
 	subsprite -8, -8, 3, 6, 16x8
 	subsprite -8, 0, 3, 14, 16x8
-	
+
 gUnknown_085A81B4:: @ 85A81B4
 	.4byte 2, gUnknown_085A81AC
-	
+
 gUnknown_085A81BC:: @ 85A81BC
 	subsprite -12, -12, 3, 0, 16x8
 	subsprite 4, -12, 3, 2, 8x8
@@ -602,18 +602,18 @@ gUnknown_085A81BC:: @ 85A81BC
 	subsprite 4, -4, 3, 10, 8x8
 	subsprite -12, 4, 3, 16, 16x8
 	subsprite 4, 4, 3, 18, 8x8
-	
+
 gUnknown_085A81D4:: @ 85A81D4
 	.4byte 6, gUnknown_085A81BC
-	
+
 gUnknown_085A81DC:: @ 85A81DC
 	subsprite -8, -12, 3, 3, 16x8
 	subsprite -8, -4, 3, 11, 16x8
 	subsprite -8, 4, 3, 19, 16x8
-	
+
 gUnknown_085A81E8:: @ 85A81E8
 	.4byte 3, gUnknown_085A81DC
-	
+
 gUnknown_085A81F0:: @ 85A81F0
 	subsprite -12, -12, 3, 5, 16x8
 	subsprite 4, -12, 3, 7, 8x8
@@ -621,10 +621,10 @@ gUnknown_085A81F0:: @ 85A81F0
 	subsprite 4, -4, 3, 15, 8x8
 	subsprite -12, 4, 3, 21, 16x8
 	subsprite 4, 4, 3, 0x17, 8x8
-	
+
 gUnknown_085A8208:: @ 85A8208
 	.4byte 6, gUnknown_085A81F0
-	
+
 gUnknown_085A8210:: @ 85A8210
 	subsprite -12, -12, 3, 0, 16x8
 	subsprite 4, -12, 3, 2, 8x8
@@ -632,18 +632,18 @@ gUnknown_085A8210:: @ 85A8210
 	subsprite 4, -4, 3, 10, 8x8
 	subsprite -12, 4, 3, 16, 16x8
 	subsprite 4, 4, 3, 18, 8x8
-	
+
 gUnknown_085A8228:: @ 85A8228
 	.4byte 6, gUnknown_085A8210
-	
+
 gUnknown_085A822C:: @ 85A822C
 	subsprite -8, -12, 3, 3, 16x8
 	subsprite -8, -4, 3, 11, 16x8
 	subsprite -8, 4, 3, 19, 16x8
-	
+
 gUnknown_085A823C:: @ 85A823C
 	.4byte 3, gUnknown_085A822C
-	
+
 gUnknown_085A8244:: @ 85A8244
 	subsprite -12, -12, 3, 5, 16x8
 	subsprite 4, -12, 3, 7, 8x8
@@ -651,7 +651,7 @@ gUnknown_085A8244:: @ 85A8244
 	subsprite 4, -4, 3, 15, 8x8
 	subsprite -12, 4, 3, 21, 16x8
 	subsprite 4, 4, 3, 23, 8x8
-	
+
 gUnknown_085A825C:: @ 85A825C
 	.4byte 6, gUnknown_085A8244
 
@@ -712,7 +712,7 @@ gUnknown_083EDBC4:: @ 85A82CC
 	.4byte NULL
 
 	.align 2
-sSlotMachineSpriteSheets:: @ 85A8334
+gSlotMachineSpriteSheets:: @ 85A8334
 	obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000
 	obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001
 	obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002
@@ -738,19 +738,19 @@ gUnknown_083EDCDC:: @ 85A83E4
 	.4byte gUnknown_08DD19F8
 	@ might be a palette idk
 	.byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1
-	
-gUnknown_085A83FC:: @ 85A83FC	
+
+gUnknown_085A83FC:: @ 85A83FC
 	.byte 0x91, 0x7F
-	
-gUnknown_085A83FE:: @ 85A83FE	
+
+gUnknown_085A83FE:: @ 85A83FE
 	.byte 0xBF, 0x43
 
 gUnknown_085A8400:: @ 85A8400
 	.byte 0xBF, 0x43
-	
+
 gUnknown_085A8402:: @ 85A8402
 	.byte 0xBF, 0x4A
-	
+
 gUnknown_085A8404:: @ 85A8404
 	.byte 0xBF, 0x4A, 0, 0
 
@@ -771,20 +771,20 @@ gUnknown_083EDD1C:: @ 85A841C
 gUnknown_083EDD30:: @ 85A8430
 	.byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D
 
-gUnknown_083EDD35:: @ 85A8435
+gBettingTilesId:: @ 85A8435
 	.byte 0, 0
 	.byte 1, 2
 	.byte 3, 4
 
-gUnknown_083EDD3B:: @ 85A843B
+gNumberBettingTiles:: @ 85A843B
 	.byte 1, 2, 2
-	
+
 gUnknown_085A843E:: @ 85A843E
 	.incbin "graphics/slot_machine/85A843E.gbapal"
-	
+
 gUnknown_085A845E:: @ 85A845E
 	.incbin "graphics/slot_machine/85A845E.gbapal"
-	
+
 gUnknown_085A847E:: @ 85A847E
 	.incbin "graphics/slot_machine/85A847E.gbapal"
 
@@ -796,13 +796,13 @@ gUnknown_083EDDA0:: @ 85A84A0
 
 gUnknown_083EDDAC:: @ 85A84AC
 	.4byte gSlotMachineMenu_Pal + 0x20
-	
+
 gUnknown_085A84B0:: @ 85A84B0
 	.incbin "graphics/slot_machine/85A84B0.gbapal"
-	
+
 gUnknown_085A84D0:: @ 85A84D0
 	.incbin "graphics/slot_machine/85A84D0.gbapal"
-	
+
 gUnknown_085A84F0:: @ 85A84F0
 	.incbin "graphics/slot_machine/85A84F0.gbapal"
 
@@ -830,10 +830,10 @@ gSlotMachineSpritePalettes:: @ 85A8544
 	obj_pal gUnknown_08DCF1F0, 7
 	null_obj_pal
 
-sReelTimeGfx:: @ 85A858C
+gReelTimeGfx:: @ 85A858C
 	.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz"
 
-sReelTimeWindowTilemap:: @ 85A96E0
+gReelTimeWindowTilemap:: @ 85A96E0
 	@if anyone knows what this tilemap is please do share
 	.incbin "graphics/slot_machine/85A96E0.bin"
 
diff --git a/data/specials.inc b/data/specials.inc
index b3ca15ed1..9364dcc46 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -12,8 +12,8 @@ gSpecials:: @ 81DBA64
 	def_special SetCableClubWarp
 	def_special sub_80AF948
 	def_special sub_80AF9F8
-	def_special sub_80B36EC
-	def_special sub_80B371C
+	def_special CleanupLinkRoomState
+	def_special ExitLinkRoom
 	def_special sub_80E8E18
 	def_special sub_80E8BC8
 	def_special sub_80E9068
@@ -35,14 +35,14 @@ gSpecials:: @ 81DBA64
 	def_special sub_80E91F8
 	def_special sub_80EA30C
 	def_special DoSecretBasePCTurnOffEffect
-	def_special sub_80E6BE8
+	def_special RecordMixingPlayerSpotTriggered
 	def_special sub_80B2DA4
 	def_special sub_80B2E4C
 	def_special sub_80B2E74
 	def_special sub_80B2EA8
 	def_special CloseLink
-	def_special sub_80B3968
-	def_special sub_80B3924
+	def_special ColosseumPlayerSpotTriggered
+	def_special PlayerEnteredTradeSeat
 	def_special nullsub_37
 	def_special sub_80B3254
 	def_special sub_80B2FD8
@@ -50,7 +50,7 @@ gSpecials:: @ 81DBA64
 	def_special SpawnLinkPartnerEventObject
 	def_special SavePlayerParty
 	def_special LoadPlayerParty
-	def_special sub_80F9438
+	def_special ChooseHalfPartyForBattle
 	def_special sp02A_crash_sound
 	def_special EventObjectInteractionGetBerryTreeData
 	def_special EventObjectInteractionGetBerryName
@@ -106,7 +106,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80B3000
 	def_special SaveGame
 	def_special DoWateringBerryTreeAnim
-	def_special easy_chat_input_maybe
+	def_special ShowEasyChatScreen
 	def_special sub_811EECC
 	def_special ScrSpecial_GetCurrentMauvilleMan
 	def_special ScrSpecial_HasBardSongBeenChanged
@@ -235,7 +235,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_81B9770
 	def_special sub_81B9718
 	def_special sub_81B96D0
-	def_special TeachMoveTutorMove
+	def_special TeachMoveRelearnerMove
 	def_special GetRecordedCyclingRoadResults
 	def_special Special_BeginCyclingRoadChallenge
 	def_special GetPlayerAvatarBike
@@ -291,7 +291,7 @@ gSpecials:: @ 81DBA64
 	def_special GetPokeblockNameByMonNature
 	def_special GetSecretBaseNearbyMapName
 	def_special CheckRelicanthWailord
-	def_special ShouldDoBrailleStrengthEffectOld
+	def_special ShouldDoBrailleRegirockEffectOld
 	def_special sub_80B0534
 	def_special sub_80B058C
 	def_special WaitWeather
@@ -499,11 +499,11 @@ gSpecials:: @ 81DBA64
 	def_special sub_813B21C
 	def_special SetMatchCallRegisteredFlag
 	def_special sub_8175280
-	def_special sub_813B2E4
-	def_special sub_813B374
+	def_special CreateUnusualWeatherEvent
+	def_special GetUnusualWeatherMapNameAndType
 	def_special sub_813B490
 	def_special sub_80A08CC
-	def_special sub_813B484
+	def_special Unused_SetWeatherSunny
 	def_special sub_81AFDA0
 	def_special sub_813B4E0
 	def_special ShouldDoBrailleRegicePuzzle
diff --git a/data/text/easy_chat/easy_chat_group_actions.s b/data/text/easy_chat/easy_chat_group_actions.s
deleted file mode 100644
index 432323e95..000000000
--- a/data/text/easy_chat/easy_chat_group_actions.s
+++ /dev/null
@@ -1,547 +0,0 @@
-gEasyChatWord_Meets:: @ 859B058
-	.string "MEETS$"
-
-gEasyChatWord_Concede:: @ 859B05E
-	.string "CONCEDE$"
-
-gEasyChatWord_Give:: @ 859B066
-	.string "GIVE$"
-
-gEasyChatWord_Gives:: @ 859B06B
-	.string "GIVES$"
-
-gEasyChatWord_Played:: @ 859B071
-	.string "PLAYED$"
-
-gEasyChatWord_Plays:: @ 859B078
-	.string "PLAYS$"
-
-gEasyChatWord_Collect:: @ 859B07E
-	.string "COLLECT$"
-
-gEasyChatWord_Walking:: @ 859B086
-	.string "WALKING$"
-
-gEasyChatWord_Walks:: @ 859B08E
-	.string "WALKS$"
-
-gEasyChatWord_Says:: @ 859B094
-	.string "SAYS$"
-
-gEasyChatWord_Went:: @ 859B099
-	.string "WENT$"
-
-gEasyChatWord_Said:: @ 859B09E
-	.string "SAID$"
-
-gEasyChatWord_WakeUp:: @ 859B0A3
-	.string "WAKE UP$"
-
-gEasyChatWord_WakesUp:: @ 859B0AB
-	.string "WAKES UP$"
-
-gEasyChatWord_Angers:: @ 859B0B4
-	.string "ANGERS$"
-
-gEasyChatWord_Teach:: @ 859B0BB
-	.string "TEACH$"
-
-gEasyChatWord_Teaches:: @ 859B0C1
-	.string "TEACHES$"
-
-gEasyChatWord_Please:: @ 859B0C9
-	.string "PLEASE$"
-
-gEasyChatWord_Learn:: @ 859B0D0
-	.string "LEARN$"
-
-gEasyChatWord_Change:: @ 859B0D6
-	.string "CHANGE$"
-
-gEasyChatWord_Story:: @ 859B0DD
-	.string "STORY$"
-
-gEasyChatWord_Trust:: @ 859B0E3
-	.string "TRUST$"
-
-gEasyChatWord_Lavish:: @ 859B0E9
-	.string "LAVISH$"
-
-gEasyChatWord_Listens:: @ 859B0F0
-	.string "LISTENS$"
-
-gEasyChatWord_Hearing:: @ 859B0F8
-	.string "HEARING$"
-
-gEasyChatWord_Trains:: @ 859B100
-	.string "TRAINS$"
-
-gEasyChatWord_Choose:: @ 859B107
-	.string "CHOOSE$"
-
-gEasyChatWord_Come:: @ 859B10E
-	.string "COME$"
-
-gEasyChatWord_Came:: @ 859B113
-	.string "CAME$"
-
-gEasyChatWord_Search:: @ 859B118
-	.string "SEARCH$"
-
-gEasyChatWord_Make:: @ 859B11F
-	.string "MAKE$"
-
-gEasyChatWord_Cause:: @ 859B124
-	.string "CAUSE$"
-
-gEasyChatWord_Know:: @ 859B12A
-	.string "KNOW$"
-
-gEasyChatWord_Knows:: @ 859B12F
-	.string "KNOWS$"
-
-gEasyChatWord_Refuse:: @ 859B135
-	.string "REFUSE$"
-
-gEasyChatWord_Stores:: @ 859B13C
-	.string "STORES$"
-
-gEasyChatWord_Brag:: @ 859B143
-	.string "BRAG$"
-
-gEasyChatWord_Ignorant:: @ 859B148
-	.string "IGNORANT$"
-
-gEasyChatWord_Thinks:: @ 859B151
-	.string "THINKS$"
-
-gEasyChatWord_Believe:: @ 859B158
-	.string "BELIEVE$"
-
-gEasyChatWord_Slide:: @ 859B160
-	.string "SLIDE$"
-
-gEasyChatWord_Eats:: @ 859B166
-	.string "EATS$"
-
-gEasyChatWord_Use:: @ 859B16B
-	.string "USE$"
-
-gEasyChatWord_Uses:: @ 859B16F
-	.string "USES$"
-
-gEasyChatWord_Using:: @ 859B174
-	.string "USING$"
-
-gEasyChatWord_Couldnt:: @ 859B17A
-	.string "COULDN'T$"
-
-gEasyChatWord_Capable:: @ 859B183
-	.string "CAPABLE$"
-
-gEasyChatWord_Disappear:: @ 859B18B
-	.string "DISAPPEAR$"
-
-gEasyChatWord_Appear:: @ 859B195
-	.string "APPEAR$"
-
-gEasyChatWord_Throw:: @ 859B19C
-	.string "THROW$"
-
-gEasyChatWord_Worry:: @ 859B1A2
-	.string "WORRY$"
-
-gEasyChatWord_Slept:: @ 859B1A8
-	.string "SLEPT$"
-
-gEasyChatWord_Sleep:: @ 859B1AE
-	.string "SLEEP$"
-
-gEasyChatWord_Release:: @ 859B1B4
-	.string "RELEASE$"
-
-gEasyChatWord_Drinks:: @ 859B1BC
-	.string "DRINKS$"
-
-gEasyChatWord_Runs:: @ 859B1C3
-	.string "RUNS$"
-
-gEasyChatWord_Run:: @ 859B1C8
-	.string "RUN$"
-
-gEasyChatWord_Works:: @ 859B1CC
-	.string "WORKS$"
-
-gEasyChatWord_Working:: @ 859B1D2
-	.string "WORKING$"
-
-gEasyChatWord_Talking:: @ 859B1DA
-	.string "TALKING$"
-
-gEasyChatWord_Talk:: @ 859B1E2
-	.string "TALK$"
-
-gEasyChatWord_Sink:: @ 859B1E7
-	.string "SINK$"
-
-gEasyChatWord_Smack:: @ 859B1EC
-	.string "SMACK$"
-
-gEasyChatWord_Pretend:: @ 859B1F2
-	.string "PRETEND$"
-
-gEasyChatWord_Praise:: @ 859B1FA
-	.string "PRAISE$"
-
-gEasyChatWord_Overdo:: @ 859B201
-	.string "OVERDO$"
-
-gEasyChatWord_Show:: @ 859B208
-	.string "SHOW$"
-
-gEasyChatWord_Looks:: @ 859B20D
-	.string "LOOKS$"
-
-gEasyChatWord_Sees:: @ 859B213
-	.string "SEES$"
-
-gEasyChatWord_Seek:: @ 859B218
-	.string "SEEK$"
-
-gEasyChatWord_Own:: @ 859B21D
-	.string "OWN$"
-
-gEasyChatWord_Take:: @ 859B221
-	.string "TAKE$"
-
-gEasyChatWord_Allow:: @ 859B226
-	.string "ALLOW$"
-
-gEasyChatWord_Forget:: @ 859B22C
-	.string "FORGET$"
-
-gEasyChatWord_Forgets:: @ 859B233
-	.string "FORGETS$"
-
-gEasyChatWord_Appears:: @ 859B23B
-	.string "APPEARS$"
-
-gEasyChatWord_Faint:: @ 859B243
-	.string "FAINT$"
-
-gEasyChatWord_Fainted:: @ 859B249
-	.string "FAINTED$"
-
-	.align 2
-gEasyChatGroup_Actions:: @ 859B254
-	.4byte gEasyChatWord_Meets
-	.4byte 72 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Concede
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Give
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gives
-	.4byte 75 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Played
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Plays
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Collect
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Walking
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Walks
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Says
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Went
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Said
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WakeUp
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WakesUp
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Angers
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Teach
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Teaches
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Please
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Learn
-	.4byte 76 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Change
-	.4byte 77 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Story
-	.4byte 73 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Trust
-	.4byte 74 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lavish
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Listens
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hearing
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Trains
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Choose
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Come
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Came
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Search
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Make
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cause
-	.4byte 67 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Know
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Knows
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Refuse
-	.4byte 65 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Stores
-	.4byte 70 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Brag
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ignorant
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Thinks
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Believe
-	.4byte 64 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Slide
-	.4byte 63 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Eats
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Use
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Uses
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Using
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Couldnt
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Capable
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Disappear
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Appear
-	.4byte 69 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Throw
-	.4byte 68 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Worry
-	.4byte 66 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Slept
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sleep
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Release
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Drinks
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Runs
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Run
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Works
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Working
-	.4byte 71 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Talking
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Talk
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sink
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Smack
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pretend
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Praise
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Overdo
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Show
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Looks
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sees
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Seek
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Own
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Take
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Allow
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Forget
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Forgets
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Appears
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Faint
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fainted
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_adjectives.s b/data/text/easy_chat/easy_chat_group_adjectives.s
deleted file mode 100644
index 08142d41c..000000000
--- a/data/text/easy_chat/easy_chat_group_adjectives.s
+++ /dev/null
@@ -1,253 +0,0 @@
-gEasyChatWord_Wandering:: @ 859C3B8
-	.string "WANDERING$"
-
-gEasyChatWord_Rickety:: @ 859C3C2
-	.string "RICKETY$"
-
-gEasyChatWord_RockSolid:: @ 859C3CA
-	.string "ROCK-SOLID$"
-
-gEasyChatWord_Hungry:: @ 859C3D5
-	.string "HUNGRY$"
-
-gEasyChatWord_Tight:: @ 859C3DC
-	.string "TIGHT$"
-
-gEasyChatWord_Ticklish:: @ 859C3E2
-	.string "TICKLISH$"
-
-gEasyChatWord_Twirling:: @ 859C3EB
-	.string "TWIRLING$"
-
-gEasyChatWord_Spiraling:: @ 859C3F4
-	.string "SPIRALING$"
-
-gEasyChatWord_Thirsty:: @ 859C3FE
-	.string "THIRSTY$"
-
-gEasyChatWord_Lolling:: @ 859C406
-	.string "LOLLING$"
-
-gEasyChatWord_Silky:: @ 859C40E
-	.string "SILKY$"
-
-gEasyChatWord_Sadly:: @ 859C414
-	.string "SADLY$"
-
-gEasyChatWord_Hopeless:: @ 859C41A
-	.string "HOPELESS$"
-
-gEasyChatWord_Useless:: @ 859C423
-	.string "USELESS$"
-
-gEasyChatWord_Drooling:: @ 859C42B
-	.string "DROOLING$"
-
-gEasyChatWord_Exciting:: @ 859C434
-	.string "EXCITING$"
-
-gEasyChatWord_Thick:: @ 859C43D
-	.string "THICK$"
-
-gEasyChatWord_Smooth:: @ 859C443
-	.string "SMOOTH$"
-
-gEasyChatWord_Slimy:: @ 859C44A
-	.string "SLIMY$"
-
-gEasyChatWord_Thin:: @ 859C450
-	.string "THIN$"
-
-gEasyChatWord_Break:: @ 859C455
-	.string "BREAK$"
-
-gEasyChatWord_Voracious:: @ 859C45B
-	.string "VORACIOUS$"
-
-gEasyChatWord_Scatter:: @ 859C465
-	.string "SCATTER$"
-
-gEasyChatWord_Awesome:: @ 859C46D
-	.string "AWESOME$"
-
-gEasyChatWord_Wimpy:: @ 859C475
-	.string "WIMPY$"
-
-gEasyChatWord_Wobbly:: @ 859C47B
-	.string "WOBBLY$"
-
-gEasyChatWord_Shaky:: @ 859C482
-	.string "SHAKY$"
-
-gEasyChatWord_Ripped:: @ 859C488
-	.string "RIPPED$"
-
-gEasyChatWord_Shredded:: @ 859C48F
-	.string "SHREDDED$"
-
-gEasyChatWord_Increasing:: @ 859C498
-	.string "INCREASING$"
-
-gEasyChatWord_Yet:: @ 859C4A3
-	.string "YET$"
-
-gEasyChatWord_Destroyed:: @ 859C4A7
-	.string "DESTROYED$"
-
-gEasyChatWord_Fiery:: @ 859C4B1
-	.string "FIERY$"
-
-gEasyChatWord_LoveyDovey:: @ 859C4B7
-	.string "LOVEY-DOVEY$"
-
-gEasyChatWord_Happily:: @ 859C4C3
-	.string "HAPPILY$"
-
-gEasyChatWord_Anticipation:: @ 859C4CB
-	.string "ANTICIPATION$"
-
-	.align 2
-gEasyChatGroup_Adjectives:: @ 859C4D8
-	.4byte gEasyChatWord_Wandering
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rickety
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_RockSolid
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hungry
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tight
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ticklish
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Twirling
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Spiraling
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Thirsty
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lolling
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Silky
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sadly
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hopeless
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Useless
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Drooling
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Exciting
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Thick
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Smooth
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Slimy
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Thin
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Break
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Voracious
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Scatter
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Awesome
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wimpy
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wobbly
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shaky
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ripped
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shredded
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Increasing
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yet
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Destroyed
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fiery
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_LoveyDovey
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Happily
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Anticipation
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_battle.s b/data/text/easy_chat/easy_chat_group_battle.s
deleted file mode 100644
index 1f1175980..000000000
--- a/data/text/easy_chat/easy_chat_group_battle.s
+++ /dev/null
@@ -1,442 +0,0 @@
-gEasyChatWord_MatchUp:: @ 8598B3C
-	.string "MATCH UP$"
-
-gEasyChatWord_Go:: @ 8598B45
-	.string "GO$"
-
-gEasyChatWord_No1:: @ 8598B48
-	.string "NO. 1$"
-
-gEasyChatWord_Decide:: @ 8598B4E
-	.string "DECIDE$"
-
-gEasyChatWord_LetMeWin:: @ 8598B55
-	.string "LET ME WIN$"
-
-gEasyChatWord_Wins:: @ 8598B60
-	.string "WINS$"
-
-gEasyChatWord_Win:: @ 8598B65
-	.string "WIN$"
-
-gEasyChatWord_Won:: @ 8598B69
-	.string "WON$"
-
-gEasyChatWord_IfIWin:: @ 8598B6D
-	.string "IF I WIN$"
-
-gEasyChatWord_WhenIWin:: @ 8598B76
-	.string "WHEN I WIN$"
-
-gEasyChatWord_CantWin:: @ 8598B81
-	.string "CAN'T WIN$"
-
-gEasyChatWord_CanWin:: @ 8598B8B
-	.string "CAN WIN$"
-
-gEasyChatWord_NoMatch:: @ 8598B93
-	.string "NO MATCH$"
-
-gEasyChatWord_Spirit:: @ 8598B9C
-	.string "SPIRIT$"
-
-gEasyChatWord_Decided:: @ 8598BA3
-	.string "DECIDED$"
-
-gEasyChatWord_TrumpCard:: @ 8598BAB
-	.string "TRUMP CARD$"
-
-gEasyChatWord_TakeThat:: @ 8598BB6
-	.string "TAKE THAT$"
-
-gEasyChatWord_ComeOn:: @ 8598BC0
-	.string "COME ON$"
-
-gEasyChatWord_Attack:: @ 8598BC8
-	.string "ATTACK$"
-
-gEasyChatWord_Surrender:: @ 8598BCF
-	.string "SURRENDER$"
-
-gEasyChatWord_Gutsy:: @ 8598BD9
-	.string "GUTSY$"
-
-gEasyChatWord_Talent:: @ 8598BDF
-	.string "TALENT$"
-
-gEasyChatWord_Strategy:: @ 8598BE6
-	.string "STRATEGY$"
-
-gEasyChatWord_Smite:: @ 8598BEF
-	.string "SMITE$"
-
-gEasyChatWord_Match:: @ 8598BF5
-	.string "MATCH$"
-
-gEasyChatWord_Victory:: @ 8598BFB
-	.string "VICTORY$"
-
-gEasyChatWord_Offensive:: @ 8598C03
-	.string "OFFENSIVE$"
-
-gEasyChatWord_Sense:: @ 8598C0D
-	.string "SENSE$"
-
-gEasyChatWord_Versus:: @ 8598C13
-	.string "VERSUS$"
-
-gEasyChatWord_Fights:: @ 8598C1A
-	.string "FIGHTS$"
-
-gEasyChatWord_Power:: @ 8598C21
-	.string "POWER$"
-
-gEasyChatWord_Challenge:: @ 8598C27
-	.string "CHALLENGE$"
-
-gEasyChatWord_Strong:: @ 8598C31
-	.string "STRONG$"
-
-gEasyChatWord_TooStrong:: @ 8598C38
-	.string "TOO STRONG$"
-
-gEasyChatWord_GoEasy:: @ 8598C43
-	.string "GO EASY$"
-
-gEasyChatWord_Foe:: @ 8598C4B
-	.string "FOE$"
-
-gEasyChatWord_Genius:: @ 8598C4F
-	.string "GENIUS$"
-
-gEasyChatWord_Legend:: @ 8598C56
-	.string "LEGEND$"
-
-gEasyChatWord_Escape:: @ 8598C5D
-	.string "ESCAPE$"
-
-gEasyChatWord_Aim:: @ 8598C64
-	.string "AIM$"
-
-gEasyChatWord_Battle:: @ 8598C68
-	.string "BATTLE$"
-
-gEasyChatWord_Fight:: @ 8598C6F
-	.string "FIGHT$"
-
-gEasyChatWord_Resuscitate:: @ 8598C75
-	.string "RESUSCITATE$"
-
-gEasyChatWord_Points:: @ 8598C81
-	.string "POINTS$"
-
-gEasyChatWord_Serious:: @ 8598C88
-	.string "SERIOUS$"
-
-gEasyChatWord_GiveUp:: @ 8598C90
-	.string "GIVE UP$"
-
-gEasyChatWord_Loss:: @ 8598C98
-	.string "LOSS$"
-
-gEasyChatWord_IfILose:: @ 8598C9D
-	.string "IF I LOSE$"
-
-gEasyChatWord_Lost:: @ 8598CA7
-	.string "LOST$"
-
-gEasyChatWord_Lose:: @ 8598CAC
-	.string "LOSE$"
-
-gEasyChatWord_Guard:: @ 8598CB1
-	.string "GUARD$"
-
-gEasyChatWord_Partner:: @ 8598CB7
-	.string "PARTNER$"
-
-gEasyChatWord_Reject:: @ 8598CBF
-	.string "REJECT$"
-
-gEasyChatWord_Accept:: @ 8598CC6
-	.string "ACCEPT$"
-
-gEasyChatWord_Invincible:: @ 8598CCD
-	.string "INVINCIBLE$"
-
-gEasyChatWord_Received:: @ 8598CD8
-	.string "RECEIVED$"
-
-gEasyChatWord_Easy:: @ 8598CE1
-	.string "EASY$"
-
-gEasyChatWord_Weak:: @ 8598CE6
-	.string "WEAK$"
-
-gEasyChatWord_TooWeak:: @ 8598CEB
-	.string "TOO WEAK$"
-
-gEasyChatWord_Pushover:: @ 8598CF4
-	.string "PUSHOVER$"
-
-gEasyChatWord_Leader:: @ 8598CFD
-	.string "LEADER$"
-
-gEasyChatWord_Rule:: @ 8598D04
-	.string "RULE$"
-
-gEasyChatWord_Move:: @ 8598D09
-	.string "MOVE$"
-
-	.align 2
-gEasyChatGroup_Battle:: @ 8598D10
-	.4byte gEasyChatWord_MatchUp
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Go
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_No1
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Decide
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_LetMeWin
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wins
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Win
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Won
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_IfIWin
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WhenIWin
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_CantWin
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_CanWin
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_NoMatch
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Spirit
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Decided
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_TrumpCard
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_TakeThat
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ComeOn
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Attack
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Surrender
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gutsy
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Talent
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Strategy
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Smite
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Match
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Victory
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Offensive
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sense
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Versus
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fights
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Power
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Challenge
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Strong
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_TooStrong
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_GoEasy
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Foe
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Genius
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Legend
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Escape
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Aim
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Battle
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fight
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Resuscitate
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Points
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Serious
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_GiveUp
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Loss
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_IfILose
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lost
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lose
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Guard
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Partner
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Reject
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Accept
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Invincible
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Received
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Easy
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Weak
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_TooWeak
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pushover
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Leader
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rule
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Move
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_conditions.s b/data/text/easy_chat/easy_chat_group_conditions.s
deleted file mode 100644
index 2afbca020..000000000
--- a/data/text/easy_chat/easy_chat_group_conditions.s
+++ /dev/null
@@ -1,484 +0,0 @@
-gEasyChatWord_Hot:: @ 859AB2C
-	.string "HOT$"
-
-gEasyChatWord_Exists:: @ 859AB30
-	.string "EXISTS$"
-
-gEasyChatWord_Excess:: @ 859AB37
-	.string "EXCESS$"
-
-gEasyChatWord_Approved:: @ 859AB3E
-	.string "APPROVED$"
-
-gEasyChatWord_Has:: @ 859AB47
-	.string "HAS$"
-
-gEasyChatWord_Good:: @ 859AB4B
-	.string "GOOD$"
-
-gEasyChatWord_Less:: @ 859AB50
-	.string "LESS$"
-
-gEasyChatWord_Momentum:: @ 859AB55
-	.string "MOMENTUM$"
-
-gEasyChatWord_Going:: @ 859AB5E
-	.string "GOING$"
-
-gEasyChatWord_Weird:: @ 859AB64
-	.string "WEIRD$"
-
-gEasyChatWord_Busy:: @ 859AB6A
-	.string "BUSY$"
-
-gEasyChatWord_Together:: @ 859AB6F
-	.string "TOGETHER$"
-
-gEasyChatWord_Full:: @ 859AB78
-	.string "FULL$"
-
-gEasyChatWord_Absent:: @ 859AB7D
-	.string "ABSENT$"
-
-gEasyChatWord_Being:: @ 859AB84
-	.string "BEING$"
-
-gEasyChatWord_Need:: @ 859AB8A
-	.string "NEED$"
-
-gEasyChatWord_Tasty:: @ 859AB8F
-	.string "TASTY$"
-
-gEasyChatWord_Skilled:: @ 859AB95
-	.string "SKILLED$"
-
-gEasyChatWord_Noisy:: @ 859AB9D
-	.string "NOISY$"
-
-gEasyChatWord_Big:: @ 859ABA3
-	.string "BIG$"
-
-gEasyChatWord_Late:: @ 859ABA7
-	.string "LATE$"
-
-gEasyChatWord_Close:: @ 859ABAC
-	.string "CLOSE$"
-
-gEasyChatWord_Docile:: @ 859ABB2
-	.string "DOCILE$"
-
-gEasyChatWord_Amusing:: @ 859ABB9
-	.string "AMUSING$"
-
-gEasyChatWord_Entertaining:: @ 859ABC1
-	.string "ENTERTAINING$"
-
-gEasyChatWord_Perfection:: @ 859ABCE
-	.string "PERFECTION$"
-
-gEasyChatWord_Pretty:: @ 859ABD9
-	.string "PRETTY$"
-
-gEasyChatWord_Healthy:: @ 859ABE0
-	.string "HEALTHY$"
-
-gEasyChatWord_Excellent:: @ 859ABE8
-	.string "EXCELLENT$"
-
-gEasyChatWord_UpsideDown:: @ 859ABF2
-	.string "UPSIDE DOWN$"
-
-gEasyChatWord_Cold:: @ 859ABFE
-	.string "COLD$"
-
-gEasyChatWord_Refreshing:: @ 859AC03
-	.string "REFRESHING$"
-
-gEasyChatWord_Unavoidable:: @ 859AC0E
-	.string "UNAVOIDABLE$"
-
-gEasyChatWord_Much:: @ 859AC1A
-	.string "MUCH$"
-
-gEasyChatWord_Overwhelming:: @ 859AC1F
-	.string "OVERWHELMING$"
-
-gEasyChatWord_Fabulous:: @ 859AC2C
-	.string "FABULOUS$"
-
-gEasyChatWord_Else:: @ 859AC35
-	.string "ELSE$"
-
-gEasyChatWord_Expensive:: @ 859AC3A
-	.string "EXPENSIVE$"
-
-gEasyChatWord_Correct:: @ 859AC44
-	.string "CORRECT$"
-
-gEasyChatWord_Impossible:: @ 859AC4C
-	.string "IMPOSSIBLE$"
-
-gEasyChatWord_Small:: @ 859AC57
-	.string "SMALL$"
-
-gEasyChatWord_Different:: @ 859AC5D
-	.string "DIFFERENT$"
-
-gEasyChatWord_Tired:: @ 859AC67
-	.string "TIRED$"
-
-gEasyChatWord_Skill:: @ 859AC6D
-	.string "SKILL$"
-
-gEasyChatWord_Top:: @ 859AC73
-	.string "TOP$"
-
-gEasyChatWord_NonStop:: @ 859AC77
-	.string "NON-STOP$"
-
-gEasyChatWord_Preposterous:: @ 859AC80
-	.string "PREPOSTEROUS$"
-
-gEasyChatWord_None:: @ 859AC8D
-	.string "NONE$"
-
-gEasyChatWord_Nothing:: @ 859AC92
-	.string "NOTHING$"
-
-gEasyChatWord_Natural:: @ 859AC9A
-	.string "NATURAL$"
-
-gEasyChatWord_Becomes:: @ 859ACA2
-	.string "BECOMES$"
-
-gEasyChatWord_Lukewarm:: @ 859ACAA
-	.string "LUKEWARM$"
-
-gEasyChatWord_Fast:: @ 859ACB3
-	.string "FAST$"
-
-gEasyChatWord_Low:: @ 859ACB8
-	.string "LOW$"
-
-gEasyChatWord_Awful:: @ 859ACBC
-	.string "AWFUL$"
-
-gEasyChatWord_Alone:: @ 859ACC2
-	.string "ALONE$"
-
-gEasyChatWord_Bored:: @ 859ACC8
-	.string "BORED$"
-
-gEasyChatWord_Secret:: @ 859ACCE
-	.string "SECRET$"
-
-gEasyChatWord_Mystery:: @ 859ACD5
-	.string "MYSTERY$"
-
-gEasyChatWord_Lacks:: @ 859ACDD
-	.string "LACKS$"
-
-gEasyChatWord_Best:: @ 859ACE3
-	.string "BEST$"
-
-gEasyChatWord_Lousy:: @ 859ACE8
-	.string "LOUSY$"
-
-gEasyChatWord_Mistake:: @ 859ACEE
-	.string "MISTAKE$"
-
-gEasyChatWord_Kind:: @ 859ACF6
-	.string "KIND$"
-
-gEasyChatWord_Well:: @ 859ACFB
-	.string "WELL$"
-
-gEasyChatWord_Weakened:: @ 859AD00
-	.string "WEAKENED$"
-
-gEasyChatWord_Simple:: @ 859AD09
-	.string "SIMPLE$"
-
-gEasyChatWord_Seems:: @ 859AD10
-	.string "SEEMS$"
-
-gEasyChatWord_Badly:: @ 859AD16
-	.string "BADLY$"
-
-	.align 2
-gEasyChatGroup_Conditions:: @ 859AD1C
-	.4byte gEasyChatWord_Hot
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Exists
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Excess
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Approved
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Has
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Good
-	.4byte 68 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Less
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Momentum
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Going
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Weird
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Busy
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Together
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Full
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Absent
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Being
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Need
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tasty
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Skilled
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Noisy
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Big
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Late
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Close
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Docile
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Amusing
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Entertaining
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Perfection
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pretty
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Healthy
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Excellent
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_UpsideDown
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cold
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Refreshing
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Unavoidable
-	.4byte 63 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Much
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Overwhelming
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fabulous
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Else
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Expensive
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Correct
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Impossible
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Small
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Different
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tired
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Skill
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Top
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_NonStop
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Preposterous
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_None
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nothing
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Natural
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Becomes
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lukewarm
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fast
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Low
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Awful
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Alone
-	.4byte 67 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Bored
-	.4byte 66 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Secret
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mystery
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lacks
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Best
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lousy
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mistake
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Kind
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Well
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Weakened
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Simple
-	.4byte 65 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Seems
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Badly
-	.4byte 64 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_endings.s b/data/text/easy_chat/easy_chat_group_endings.s
deleted file mode 100644
index 4d79c9a69..000000000
--- a/data/text/easy_chat/easy_chat_group_endings.s
+++ /dev/null
@@ -1,484 +0,0 @@
-gEasyChatWord_Will:: @ 859A158
-	.string "WILL$"
-
-gEasyChatWord_WillBeHere:: @ 859A15D
-	.string "WILL BE HERE$"
-
-gEasyChatWord_Or:: @ 859A16A
-	.string "OR$"
-
-gEasyChatWord_Times:: @ 859A16D
-	.string "TIMES$"
-
-gEasyChatWord_Wonder:: @ 859A173
-	.string "WONDER$"
-
-gEasyChatWord_IsItQues:: @ 859A17A
-	.string "IS IT?$"
-
-gEasyChatWord_Be:: @ 859A181
-	.string "BE$"
-
-gEasyChatWord_Gimme:: @ 859A184
-	.string "GIMME$"
-
-gEasyChatWord_Could:: @ 859A18A
-	.string "COULD$"
-
-gEasyChatWord_LikelyTo:: @ 859A190
-	.string "LIKELY TO$"
-
-gEasyChatWord_Would:: @ 859A19A
-	.string "WOULD$"
-
-gEasyChatWord_Is:: @ 859A1A0
-	.string "IS$"
-
-gEasyChatWord_IsntItQues:: @ 859A1A3
-	.string "ISN'T IT?$"
-
-gEasyChatWord_Lets:: @ 859A1AD
-	.string "LET'S$"
-
-gEasyChatWord_Other:: @ 859A1B3
-	.string "OTHER$"
-
-gEasyChatWord_Are:: @ 859A1B9
-	.string "ARE$"
-
-gEasyChatWord_Was:: @ 859A1BD
-	.string "WAS$"
-
-gEasyChatWord_Were:: @ 859A1C1
-	.string "WERE$"
-
-gEasyChatWord_Those:: @ 859A1C6
-	.string "THOSE$"
-
-gEasyChatWord_Isnt:: @ 859A1CC
-	.string "ISN'T$"
-
-gEasyChatWord_Wont:: @ 859A1D2
-	.string "WON'T$"
-
-gEasyChatWord_Cant:: @ 859A1D8
-	.string "CAN'T$"
-
-gEasyChatWord_Can:: @ 859A1DE
-	.string "CAN$"
-
-gEasyChatWord_Dont:: @ 859A1E2
-	.string "DON'T$"
-
-gEasyChatWord_Do:: @ 859A1E8
-	.string "DO$"
-
-gEasyChatWord_Does:: @ 859A1EB
-	.string "DOES$"
-
-gEasyChatWord_Whom:: @ 859A1F0
-	.string "WHOM$"
-
-gEasyChatWord_Which:: @ 859A1F5
-	.string "WHICH$"
-
-gEasyChatWord_Wasnt:: @ 859A1FB
-	.string "WASN'T$"
-
-gEasyChatWord_Werent:: @ 859A202
-	.string "WEREN'T$"
-
-gEasyChatWord_Have:: @ 859A20A
-	.string "HAVE$"
-
-gEasyChatWord_Havent:: @ 859A20F
-	.string "HAVEN'T$"
-
-gEasyChatWord_A:: @ 859A217
-	.string "A$"
-
-gEasyChatWord_An:: @ 859A219
-	.string "AN$"
-
-gEasyChatWord_Not:: @ 859A21C
-	.string "NOT$"
-
-gEasyChatWord_There:: @ 859A220
-	.string "THERE$"
-
-gEasyChatWord_OkQues:: @ 859A226
-	.string "OK?$"
-
-gEasyChatWord_So:: @ 859A22A
-	.string "SO$"
-
-gEasyChatWord_Maybe:: @ 859A22D
-	.string "MAYBE$"
-
-gEasyChatWord_About:: @ 859A233
-	.string "ABOUT$"
-
-gEasyChatWord_Over:: @ 859A239
-	.string "OVER$"
-
-gEasyChatWord_It:: @ 859A23E
-	.string "IT$"
-
-gEasyChatWord_All:: @ 859A241
-	.string "ALL$"
-
-gEasyChatWord_For:: @ 859A245
-	.string "FOR$"
-
-gEasyChatWord_On:: @ 859A249
-	.string "ON$"
-
-gEasyChatWord_Off:: @ 859A24C
-	.string "OFF$"
-
-gEasyChatWord_As:: @ 859A250
-	.string "AS$"
-
-gEasyChatWord_To:: @ 859A253
-	.string "TO$"
-
-gEasyChatWord_With:: @ 859A256
-	.string "WITH$"
-
-gEasyChatWord_Better:: @ 859A25B
-	.string "BETTER$"
-
-gEasyChatWord_Ever:: @ 859A262
-	.string "EVER$"
-
-gEasyChatWord_Since:: @ 859A267
-	.string "SINCE$"
-
-gEasyChatWord_Of:: @ 859A26D
-	.string "OF$"
-
-gEasyChatWord_BelongsTo:: @ 859A270
-	.string "BELONGS TO$"
-
-gEasyChatWord_At:: @ 859A27B
-	.string "AT$"
-
-gEasyChatWord_In:: @ 859A27E
-	.string "IN$"
-
-gEasyChatWord_Out:: @ 859A281
-	.string "OUT$"
-
-gEasyChatWord_Too:: @ 859A285
-	.string "TOO$"
-
-gEasyChatWord_Like:: @ 859A289
-	.string "LIKE$"
-
-gEasyChatWord_Did:: @ 859A28E
-	.string "DID$"
-
-gEasyChatWord_Didnt:: @ 859A292
-	.string "DIDN'T$"
-
-gEasyChatWord_Doesnt:: @ 859A299
-	.string "DOESN'T$"
-
-gEasyChatWord_Without:: @ 859A2A1
-	.string "WITHOUT$"
-
-gEasyChatWord_After:: @ 859A2A9
-	.string "AFTER$"
-
-gEasyChatWord_Before:: @ 859A2AF
-	.string "BEFORE$"
-
-gEasyChatWord_While:: @ 859A2B6
-	.string "WHILE$"
-
-gEasyChatWord_Than:: @ 859A2BC
-	.string "THAN$"
-
-gEasyChatWord_Once:: @ 859A2C1
-	.string "ONCE$"
-
-gEasyChatWord_Anywhere:: @ 859A2C6
-	.string "ANYWHERE$"
-
-	.align 2
-gEasyChatGroup_Endings:: @ 859A2D0
-	.4byte gEasyChatWord_Will
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WillBeHere
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Or
-	.4byte 63 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Times
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wonder
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_IsItQues
-	.4byte 68 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Be
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gimme
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Could
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_LikelyTo
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Would
-	.4byte 64 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Is
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_IsntItQues
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lets
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Other
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Are
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Was
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Were
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Those
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Isnt
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wont
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cant
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Can
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dont
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Do
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Does
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Whom
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Which
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wasnt
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Werent
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Have
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Havent
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_A
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_An
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Not
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_There
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_OkQues
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_So
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Maybe
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_About
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Over
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_It
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_All
-	.4byte 67 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_For
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_On
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Off
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_As
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_To
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_With
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Better
-	.4byte 66 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ever
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Since
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Of
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_BelongsTo
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_At
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_In
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Out
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Too
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Like
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Did
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Didnt
-	.4byte 65 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Doesnt
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Without
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_After
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Before
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_While
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Than
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Once
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Anywhere
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_events.s b/data/text/easy_chat/easy_chat_group_events.s
deleted file mode 100644
index f603908b7..000000000
--- a/data/text/easy_chat/easy_chat_group_events.s
+++ /dev/null
@@ -1,204 +0,0 @@
-gEasyChatWord_Appeal:: @ 859C688
-	.string "APPEAL$"
-
-gEasyChatWord_Events:: @ 859C68F
-	.string "EVENTS$"
-
-gEasyChatWord_StayAtHome:: @ 859C696
-	.string "STAY-AT-HOME$"
-
-gEasyChatWord_Berry:: @ 859C6A3
-	.string "BERRY$"
-
-gEasyChatWord_Contest:: @ 859C6A9
-	.string "CONTEST$"
-
-gEasyChatWord_Mc:: @ 859C6B1
-	.string "MC$"
-
-gEasyChatWord_Judge:: @ 859C6B4
-	.string "JUDGE$"
-
-gEasyChatWord_Super:: @ 859C6BA
-	.string "SUPER$"
-
-gEasyChatWord_Stage:: @ 859C6C0
-	.string "STAGE$"
-
-gEasyChatWord_HallOfFame:: @ 859C6C6
-	.string "HALL OF FAME$"
-
-gEasyChatWord_Evolution:: @ 859C6D3
-	.string "EVOLUTION$"
-
-gEasyChatWord_Hyper:: @ 859C6DD
-	.string "HYPER$"
-
-gEasyChatWord_BattleTower:: @ 859C6E3
-	.string "BATTLE TOWER$"
-
-gEasyChatWord_Leaders:: @ 859C6F0
-	.string "LEADERS$"
-
-gEasyChatWord_BattleRoom:: @ 859C6F8
-	.string "BATTLE ROOM$"
-
-gEasyChatWord_Hidden:: @ 859C704
-	.string "HIDDEN$"
-
-gEasyChatWord_SecretBase:: @ 859C70B
-	.string "SECRET BASE$"
-
-gEasyChatWord_Blend:: @ 859C717
-	.string "BLEND$"
-
-gEasyChatWord_POKEBLOCK:: @ 859C71D
-	.string "{POKEBLOCK}$"
-
-gEasyChatWord_Master:: @ 859C723
-	.string "MASTER$"
-
-gEasyChatWord_Rank:: @ 859C72A
-	.string "RANK$"
-
-gEasyChatWord_Ribbon:: @ 859C72F
-	.string "RIBBON$"
-
-gEasyChatWord_Crush:: @ 859C736
-	.string "CRUSH$"
-
-gEasyChatWord_Direct:: @ 859C73C
-	.string "DIRECT$"
-
-gEasyChatWord_Tower:: @ 859C743
-	.string "TOWER$"
-
-gEasyChatWord_Union:: @ 859C749
-	.string "UNION$"
-
-gEasyChatWord_Room:: @ 859C74F
-	.string "ROOM$"
-
-gEasyChatWord_Wireless:: @ 859C754
-	.string "WIRELESS$"
-
-gEasyChatWord_Frontier:: @ 859C75D
-	.string "FRONTIER$"
-
-	.align 2
-gEasyChatGroup_Events:: @ 859C768
-	.4byte gEasyChatWord_Appeal
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Events
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_StayAtHome
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Berry
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Contest
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mc
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Judge
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Super
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Stage
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HallOfFame
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Evolution
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hyper
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_BattleTower
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Leaders
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_BattleRoom
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hidden
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SecretBase
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Blend
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_POKEBLOCK
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Master
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rank
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ribbon
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Crush
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Direct
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tower
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Union
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Room
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wireless
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Frontier
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_feelings.s b/data/text/easy_chat/easy_chat_group_feelings.s
deleted file mode 100644
index 4cda319cc..000000000
--- a/data/text/easy_chat/easy_chat_group_feelings.s
+++ /dev/null
@@ -1,484 +0,0 @@
-gEasyChatWord_Meet:: @ 859A60C
-	.string "MEET$"
-
-gEasyChatWord_Play:: @ 859A611
-	.string "PLAY$"
-
-gEasyChatWord_Hurried:: @ 859A616
-	.string "HURRIED$"
-
-gEasyChatWord_Goes:: @ 859A61E
-	.string "GOES$"
-
-gEasyChatWord_Giddy:: @ 859A623
-	.string "GIDDY$"
-
-gEasyChatWord_Happy:: @ 859A629
-	.string "HAPPY$"
-
-gEasyChatWord_Happiness:: @ 859A62F
-	.string "HAPPINESS$"
-
-gEasyChatWord_Excite:: @ 859A639
-	.string "EXCITE$"
-
-gEasyChatWord_Important:: @ 859A640
-	.string "IMPORTANT$"
-
-gEasyChatWord_Funny:: @ 859A64A
-	.string "FUNNY$"
-
-gEasyChatWord_Got:: @ 859A650
-	.string "GOT$"
-
-gEasyChatWord_GoHome:: @ 859A654
-	.string "GO HOME$"
-
-gEasyChatWord_Disappointed:: @ 859A65C
-	.string "DISAPPOINTED$"
-
-gEasyChatWord_Disappoints:: @ 859A669
-	.string "DISAPPOINTS$"
-
-gEasyChatWord_Sad:: @ 859A675
-	.string "SAD$"
-
-gEasyChatWord_Try:: @ 859A679
-	.string "TRY$"
-
-gEasyChatWord_Tries:: @ 859A67D
-	.string "TRIES$"
-
-gEasyChatWord_Hears:: @ 859A683
-	.string "HEARS$"
-
-gEasyChatWord_Think:: @ 859A689
-	.string "THINK$"
-
-gEasyChatWord_Hear:: @ 859A68F
-	.string "HEAR$"
-
-gEasyChatWord_Wants:: @ 859A694
-	.string "WANTS$"
-
-gEasyChatWord_Misheard:: @ 859A69A
-	.string "MISHEARD$"
-
-gEasyChatWord_Dislike:: @ 859A6A3
-	.string "DISLIKE$"
-
-gEasyChatWord_Angry:: @ 859A6AB
-	.string "ANGRY$"
-
-gEasyChatWord_Anger:: @ 859A6B1
-	.string "ANGER$"
-
-gEasyChatWord_Scary:: @ 859A6B7
-	.string "SCARY$"
-
-gEasyChatWord_Lonesome:: @ 859A6BD
-	.string "LONESOME$"
-
-gEasyChatWord_Disappoint:: @ 859A6C6
-	.string "DISAPPOINT$"
-
-gEasyChatWord_Joy:: @ 859A6D1
-	.string "JOY$"
-
-gEasyChatWord_Gets:: @ 859A6D5
-	.string "GETS$"
-
-gEasyChatWord_Never:: @ 859A6DA
-	.string "NEVER$"
-
-gEasyChatWord_Darn:: @ 859A6E0
-	.string "DARN$"
-
-gEasyChatWord_Downcast:: @ 859A6E5
-	.string "DOWNCAST$"
-
-gEasyChatWord_Incredible:: @ 859A6EE
-	.string "INCREDIBLE$"
-
-gEasyChatWord_Likes:: @ 859A6F9
-	.string "LIKES$"
-
-gEasyChatWord_Dislikes:: @ 859A6FF
-	.string "DISLIKES$"
-
-gEasyChatWord_Boring:: @ 859A708
-	.string "BORING$"
-
-gEasyChatWord_Care:: @ 859A70F
-	.string "CARE$"
-
-gEasyChatWord_Cares:: @ 859A714
-	.string "CARES$"
-
-gEasyChatWord_AllRight:: @ 859A71A
-	.string "ALL RIGHT$"
-
-gEasyChatWord_Adore:: @ 859A724
-	.string "ADORE$"
-
-gEasyChatWord_Disaster:: @ 859A72A
-	.string "DISASTER$"
-
-gEasyChatWord_Enjoy:: @ 859A733
-	.string "ENJOY$"
-
-gEasyChatWord_Enjoys:: @ 859A739
-	.string "ENJOYS$"
-
-gEasyChatWord_Eat:: @ 859A740
-	.string "EAT$"
-
-gEasyChatWord_Lacking:: @ 859A744
-	.string "LACKING$"
-
-gEasyChatWord_Bad:: @ 859A74C
-	.string "BAD$"
-
-gEasyChatWord_Hard:: @ 859A750
-	.string "HARD$"
-
-gEasyChatWord_Terrible:: @ 859A755
-	.string "TERRIBLE$"
-
-gEasyChatWord_Should:: @ 859A75E
-	.string "SHOULD$"
-
-gEasyChatWord_Nice:: @ 859A765
-	.string "NICE$"
-
-gEasyChatWord_Drink:: @ 859A76A
-	.string "DRINK$"
-
-gEasyChatWord_Surprise:: @ 859A770
-	.string "SURPRISE$"
-
-gEasyChatWord_Fear:: @ 859A779
-	.string "FEAR$"
-
-gEasyChatWord_Want:: @ 859A77E
-	.string "WANT$"
-
-gEasyChatWord_Wait:: @ 859A783
-	.string "WAIT$"
-
-gEasyChatWord_Satisfied:: @ 859A788
-	.string "SATISFIED$"
-
-gEasyChatWord_See:: @ 859A792
-	.string "SEE$"
-
-gEasyChatWord_Rare:: @ 859A796
-	.string "RARE$"
-
-gEasyChatWord_Negative:: @ 859A79B
-	.string "NEGATIVE$"
-
-gEasyChatWord_Done:: @ 859A7A4
-	.string "DONE$"
-
-gEasyChatWord_Danger:: @ 859A7A9
-	.string "DANGER$"
-
-gEasyChatWord_Defeated:: @ 859A7B0
-	.string "DEFEATED$"
-
-gEasyChatWord_Beat:: @ 859A7B9
-	.string "BEAT$"
-
-gEasyChatWord_Great:: @ 859A7BE
-	.string "GREAT$"
-
-gEasyChatWord_Romantic:: @ 859A7C4
-	.string "ROMANTIC$"
-
-gEasyChatWord_Question:: @ 859A7CD
-	.string "QUESTION$"
-
-gEasyChatWord_Understand:: @ 859A7D6
-	.string "UNDERSTAND$"
-
-gEasyChatWord_Understands:: @ 859A7E1
-	.string "UNDERSTANDS$"
-
-	.align 2
-gEasyChatGroup_Feelings:: @ 859A7F0
-	.4byte gEasyChatWord_Meet
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Play
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hurried
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Goes
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Giddy
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Happy
-	.4byte 63 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Happiness
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Excite
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Important
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Funny
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Got
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_GoHome
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Disappointed
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Disappoints
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sad
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Try
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tries
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hears
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Think
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hear
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wants
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Misheard
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dislike
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Angry
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Anger
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Scary
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lonesome
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Disappoint
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Joy
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gets
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Never
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Darn
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Downcast
-	.4byte 64 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Incredible
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Likes
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dislikes
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Boring
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Care
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cares
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_AllRight
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Adore
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Disaster
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Enjoy
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Enjoys
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Eat
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lacking
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Bad
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hard
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Terrible
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Should
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nice
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Drink
-	.4byte 66 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Surprise
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fear
-	.4byte 65 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Want
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wait
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Satisfied
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_See
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rare
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Negative
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Done
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Danger
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Defeated
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Beat
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Great
-	.4byte 67 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Romantic
-	.4byte 68 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Question
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Understand
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Understands
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_greetings.s b/data/text/easy_chat/easy_chat_group_greetings.s
deleted file mode 100644
index 98db7acea..000000000
--- a/data/text/easy_chat/easy_chat_group_greetings.s
+++ /dev/null
@@ -1,295 +0,0 @@
-gEasyChatWord_Thanks:: @ 8599004
-	.string "THANKS$"
-
-gEasyChatWord_Yes:: @ 859900B
-	.string "YES$"
-
-gEasyChatWord_HereGoes:: @ 859900F
-	.string "HERE GOES$"
-
-gEasyChatWord_HereICome:: @ 8599019
-	.string "HERE I COME$"
-
-gEasyChatWord_HereItIs:: @ 8599025
-	.string "HERE IT IS$"
-
-gEasyChatWord_Yeah:: @ 8599030
-	.string "YEAH$"
-
-gEasyChatWord_Welcome:: @ 8599035
-	.string "WELCOME$"
-
-gEasyChatWord_Oi:: @ 859903D
-	.string "OI$"
-
-gEasyChatWord_HowDo:: @ 8599040
-	.string "HOW DO$"
-
-gEasyChatWord_Congrats:: @ 8599047
-	.string "CONGRATS$"
-
-gEasyChatWord_GiveMe:: @ 8599050
-	.string "GIVE ME$"
-
-gEasyChatWord_Sorry:: @ 8599058
-	.string "SORRY$"
-
-gEasyChatWord_Apologize:: @ 859905E
-	.string "APOLOGIZE$"
-
-gEasyChatWord_Forgive:: @ 8599068
-	.string "FORGIVE$"
-
-gEasyChatWord_HeyThere:: @ 8599070
-	.string "HEY, THERE$"
-
-gEasyChatWord_Hello:: @ 859907B
-	.string "HELLO$"
-
-gEasyChatWord_GoodBye:: @ 8599081
-	.string "GOOD-BYE$"
-
-gEasyChatWord_ThankYou:: @ 859908A
-	.string "THANK YOU$"
-
-gEasyChatWord_IveArrived:: @ 8599094
-	.string "I'VE ARRIVED$"
-
-gEasyChatWord_Pardon:: @ 85990A1
-	.string "PARDON$"
-
-gEasyChatWord_Excuse:: @ 85990A8
-	.string "EXCUSE$"
-
-gEasyChatWord_SeeYa:: @ 85990AF
-	.string "SEE YA$"
-
-gEasyChatWord_ExcuseMe:: @ 85990B6
-	.string "EXCUSE ME$"
-
-gEasyChatWord_WellThen:: @ 85990C0
-	.string "WELL, THEN$"
-
-gEasyChatWord_GoAhead:: @ 85990CB
-	.string "GO AHEAD$"
-
-gEasyChatWord_Appreciate:: @ 85990D4
-	.string "APPRECIATE$"
-
-gEasyChatWord_HeyQues:: @ 85990DF
-	.string "HEY?$"
-
-gEasyChatWord_WhatsUpQues:: @ 85990E4
-	.string "WHAT'S UP?$"
-
-gEasyChatWord_HuhQues:: @ 85990EF
-	.string "HUH?$"
-
-gEasyChatWord_No:: @ 85990F4
-	.string "NO$"
-
-gEasyChatWord_Hi:: @ 85990F7
-	.string "HI$"
-
-gEasyChatWord_YeahYeah:: @ 85990FA
-	.string "YEAH, YEAH$"
-
-gEasyChatWord_ByeBye:: @ 8599105
-	.string "BYE-BYE$"
-
-gEasyChatWord_MeetYou:: @ 859910D
-	.string "MEET YOU$"
-
-gEasyChatWord_Hey:: @ 8599116
-	.string "HEY$"
-
-gEasyChatWord_Smell:: @ 859911A
-	.string "SMELL$"
-
-gEasyChatWord_Listening:: @ 8599120
-	.string "LISTENING$"
-
-gEasyChatWord_HooHah:: @ 859912A
-	.string "HOO-HAH$"
-
-gEasyChatWord_Yahoo:: @ 8599132
-	.string "YAHOO$"
-
-gEasyChatWord_Yo:: @ 8599138
-	.string "YO$"
-
-gEasyChatWord_ComeOver:: @ 859913B
-	.string "COME OVER$"
-
-gEasyChatWord_CountOn:: @ 8599145
-	.string "COUNT ON$"
-
-	.align 2
-gEasyChatGroup_Greetings:: @ 8599150
-	.4byte gEasyChatWord_Thanks
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yes
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HereGoes
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HereICome
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HereItIs
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yeah
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Welcome
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Oi
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HowDo
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Congrats
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_GiveMe
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sorry
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Apologize
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Forgive
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HeyThere
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hello
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_GoodBye
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ThankYou
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_IveArrived
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pardon
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Excuse
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SeeYa
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ExcuseMe
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WellThen
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_GoAhead
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Appreciate
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HeyQues
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WhatsUpQues
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HuhQues
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_No
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hi
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_YeahYeah
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ByeBye
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_MeetYou
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hey
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Smell
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Listening
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HooHah
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yahoo
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yo
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ComeOver
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_CountOn
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_hobbies.s b/data/text/easy_chat/easy_chat_group_hobbies.s
deleted file mode 100644
index f3fb02b0b..000000000
--- a/data/text/easy_chat/easy_chat_group_hobbies.s
+++ /dev/null
@@ -1,379 +0,0 @@
-gEasyChatWord_Idol:: @ 859B960
-	.string "IDOL$"
-
-gEasyChatWord_Anime:: @ 859B965
-	.string "ANIME$"
-
-gEasyChatWord_Song:: @ 859B96B
-	.string "SONG$"
-
-gEasyChatWord_Movie:: @ 859B970
-	.string "MOVIE$"
-
-gEasyChatWord_Sweets:: @ 859B976
-	.string "SWEETS$"
-
-gEasyChatWord_Chat:: @ 859B97D
-	.string "CHAT$"
-
-gEasyChatWord_ChildsPlay:: @ 859B982
-	.string "CHILD'S PLAY$"
-
-gEasyChatWord_Toys:: @ 859B98F
-	.string "TOYS$"
-
-gEasyChatWord_Music:: @ 859B994
-	.string "MUSIC$"
-
-gEasyChatWord_Cards:: @ 859B99A
-	.string "CARDS$"
-
-gEasyChatWord_Shopping:: @ 859B9A0
-	.string "SHOPPING$"
-
-gEasyChatWord_Camera:: @ 859B9A9
-	.string "CAMERA$"
-
-gEasyChatWord_Viewing:: @ 859B9B0
-	.string "VIEWING$"
-
-gEasyChatWord_Spectator:: @ 859B9B8
-	.string "SPECTATOR$"
-
-gEasyChatWord_Gourmet:: @ 859B9C2
-	.string "GOURMET$"
-
-gEasyChatWord_Game:: @ 859B9CA
-	.string "GAME$"
-
-gEasyChatWord_Rpg:: @ 859B9CF
-	.string "RPG$"
-
-gEasyChatWord_Collection:: @ 859B9D3
-	.string "COLLECTION$"
-
-gEasyChatWord_Complete:: @ 859B9DE
-	.string "COMPLETE$"
-
-gEasyChatWord_Magazine:: @ 859B9E7
-	.string "MAGAZINE$"
-
-gEasyChatWord_Walk:: @ 859B9F0
-	.string "WALK$"
-
-gEasyChatWord_Bike:: @ 859B9F5
-	.string "BIKE$"
-
-gEasyChatWord_Hobby:: @ 859B9FA
-	.string "HOBBY$"
-
-gEasyChatWord_Sports:: @ 859BA00
-	.string "SPORTS$"
-
-gEasyChatWord_Software:: @ 859BA07
-	.string "SOFTWARE$"
-
-gEasyChatWord_Songs:: @ 859BA10
-	.string "SONGS$"
-
-gEasyChatWord_Diet:: @ 859BA16
-	.string "DIET$"
-
-gEasyChatWord_Treasure:: @ 859BA1B
-	.string "TREASURE$"
-
-gEasyChatWord_Travel:: @ 859BA24
-	.string "TRAVEL$"
-
-gEasyChatWord_Dance:: @ 859BA2B
-	.string "DANCE$"
-
-gEasyChatWord_Channel:: @ 859BA31
-	.string "CHANNEL$"
-
-gEasyChatWord_Making:: @ 859BA39
-	.string "MAKING$"
-
-gEasyChatWord_Fishing:: @ 859BA40
-	.string "FISHING$"
-
-gEasyChatWord_Date:: @ 859BA48
-	.string "DATE$"
-
-gEasyChatWord_Design:: @ 859BA4D
-	.string "DESIGN$"
-
-gEasyChatWord_Locomotive:: @ 859BA54
-	.string "LOCOMOTIVE$"
-
-gEasyChatWord_PlushDoll:: @ 859BA5F
-	.string "PLUSH DOLL$"
-
-gEasyChatWord_Pc:: @ 859BA6A
-	.string "PC$"
-
-gEasyChatWord_Flowers:: @ 859BA6D
-	.string "FLOWERS$"
-
-gEasyChatWord_Hero:: @ 859BA75
-	.string "HERO$"
-
-gEasyChatWord_Nap:: @ 859BA7A
-	.string "NAP$"
-
-gEasyChatWord_Heroine:: @ 859BA7E
-	.string "HEROINE$"
-
-gEasyChatWord_Fashion:: @ 859BA86
-	.string "FASHION$"
-
-gEasyChatWord_Adventure:: @ 859BA8E
-	.string "ADVENTURE$"
-
-gEasyChatWord_Board:: @ 859BA98
-	.string "BOARD$"
-
-gEasyChatWord_Ball:: @ 859BA9E
-	.string "BALL$"
-
-gEasyChatWord_Book:: @ 859BAA3
-	.string "BOOK$"
-
-gEasyChatWord_Festival:: @ 859BAA8
-	.string "FESTIVAL$"
-
-gEasyChatWord_Comics:: @ 859BAB1
-	.string "COMICS$"
-
-gEasyChatWord_Holiday:: @ 859BAB8
-	.string "HOLIDAY$"
-
-gEasyChatWord_Plans:: @ 859BAC0
-	.string "PLANS$"
-
-gEasyChatWord_Trendy:: @ 859BAC6
-	.string "TRENDY$"
-
-gEasyChatWord_Vacation:: @ 859BACD
-	.string "VACATION$"
-
-gEasyChatWord_Look:: @ 859BAD6
-	.string "LOOK$"
-
-	.align 2
-gEasyChatGroup_Hobbies:: @ 859BADC
-	.4byte gEasyChatWord_Idol
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Anime
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Song
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Movie
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sweets
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Chat
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ChildsPlay
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Toys
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Music
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cards
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shopping
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Camera
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Viewing
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Spectator
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gourmet
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Game
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rpg
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Collection
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Complete
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Magazine
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Walk
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Bike
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hobby
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sports
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Software
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Songs
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Diet
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Treasure
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Travel
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dance
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Channel
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Making
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fishing
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Date
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Design
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Locomotive
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_PlushDoll
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pc
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Flowers
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hero
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nap
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Heroine
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fashion
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Adventure
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Board
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ball
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Book
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Festival
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Comics
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Holiday
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Plans
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Trendy
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Vacation
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Look
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_lifestyle.s b/data/text/easy_chat/easy_chat_group_lifestyle.s
deleted file mode 100644
index 356095cd5..000000000
--- a/data/text/easy_chat/easy_chat_group_lifestyle.s
+++ /dev/null
@@ -1,316 +0,0 @@
-gEasyChatWord_Chores:: @ 859B5FC
-	.string "CHORES$"
-
-gEasyChatWord_Home:: @ 859B603
-	.string "HOME$"
-
-gEasyChatWord_Money:: @ 859B608
-	.string "MONEY$"
-
-gEasyChatWord_Allowance:: @ 859B60E
-	.string "ALLOWANCE$"
-
-gEasyChatWord_Bath:: @ 859B618
-	.string "BATH$"
-
-gEasyChatWord_Conversation:: @ 859B61D
-	.string "CONVERSATION$"
-
-gEasyChatWord_School:: @ 859B62A
-	.string "SCHOOL$"
-
-gEasyChatWord_Commemorate:: @ 859B631
-	.string "COMMEMORATE$"
-
-gEasyChatWord_Habit:: @ 859B63D
-	.string "HABIT$"
-
-gEasyChatWord_Group:: @ 859B643
-	.string "GROUP$"
-
-gEasyChatWord_Word:: @ 859B649
-	.string "WORD$"
-
-gEasyChatWord_Store:: @ 859B64E
-	.string "STORE$"
-
-gEasyChatWord_Service:: @ 859B654
-	.string "SERVICE$"
-
-gEasyChatWord_Work:: @ 859B65C
-	.string "WORK$"
-
-gEasyChatWord_System:: @ 859B661
-	.string "SYSTEM$"
-
-gEasyChatWord_Train:: @ 859B668
-	.string "TRAIN$"
-
-gEasyChatWord_Class:: @ 859B66E
-	.string "CLASS$"
-
-gEasyChatWord_Lessons:: @ 859B674
-	.string "LESSONS$"
-
-gEasyChatWord_Information:: @ 859B67C
-	.string "INFORMATION$"
-
-gEasyChatWord_Living:: @ 859B688
-	.string "LIVING$"
-
-gEasyChatWord_Teacher:: @ 859B68F
-	.string "TEACHER$"
-
-gEasyChatWord_Tournament:: @ 859B697
-	.string "TOURNAMENT$"
-
-gEasyChatWord_Letter:: @ 859B6A2
-	.string "LETTER$"
-
-gEasyChatWord_Event:: @ 859B6A9
-	.string "EVENT$"
-
-gEasyChatWord_Digital:: @ 859B6AF
-	.string "DIGITAL$"
-
-gEasyChatWord_Test:: @ 859B6B7
-	.string "TEST$"
-
-gEasyChatWord_DeptStore:: @ 859B6BC
-	.string "DEPT. STORE$"
-
-gEasyChatWord_Television:: @ 859B6C8
-	.string "TELEVISION$"
-
-gEasyChatWord_Phone:: @ 859B6D3
-	.string "PHONE$"
-
-gEasyChatWord_Item:: @ 859B6D9
-	.string "ITEM$"
-
-gEasyChatWord_Name:: @ 859B6DE
-	.string "NAME$"
-
-gEasyChatWord_News:: @ 859B6E3
-	.string "NEWS$"
-
-gEasyChatWord_Popular:: @ 859B6E8
-	.string "POPULAR$"
-
-gEasyChatWord_Party:: @ 859B6F0
-	.string "PARTY$"
-
-gEasyChatWord_Study:: @ 859B6F6
-	.string "STUDY$"
-
-gEasyChatWord_Machine:: @ 859B6FC
-	.string "MACHINE$"
-
-gEasyChatWord_Mail:: @ 859B704
-	.string "MAIL$"
-
-gEasyChatWord_Message:: @ 859B709
-	.string "MESSAGE$"
-
-gEasyChatWord_Promise:: @ 859B711
-	.string "PROMISE$"
-
-gEasyChatWord_Dream:: @ 859B719
-	.string "DREAM$"
-
-gEasyChatWord_Kindergarten:: @ 859B71F
-	.string "KINDERGARTEN$"
-
-gEasyChatWord_Life:: @ 859B72C
-	.string "LIFE$"
-
-gEasyChatWord_Radio:: @ 859B731
-	.string "RADIO$"
-
-gEasyChatWord_Rental:: @ 859B737
-	.string "RENTAL$"
-
-gEasyChatWord_World:: @ 859B73E
-	.string "WORLD$"
-
-	.align 2
-gEasyChatGroup_Lifestyle:: @ 859B744
-	.4byte gEasyChatWord_Chores
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Home
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Money
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Allowance
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Bath
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Conversation
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_School
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Commemorate
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Habit
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Group
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Word
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Store
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Service
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Work
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_System
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Train
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Class
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lessons
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Information
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Living
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Teacher
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tournament
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Letter
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Event
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Digital
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Test
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_DeptStore
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Television
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Phone
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Item
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Name
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_News
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Popular
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Party
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Study
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Machine
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mail
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Message
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Promise
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dream
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Kindergarten
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Life
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Radio
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rental
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_World
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_misc.s b/data/text/easy_chat/easy_chat_group_misc.s
deleted file mode 100644
index 19ca730d5..000000000
--- a/data/text/easy_chat/easy_chat_group_misc.s
+++ /dev/null
@@ -1,295 +0,0 @@
-gEasyChatWord_Highs:: @ 859C0B4
-	.string "HIGHS$"
-
-gEasyChatWord_Lows:: @ 859C0BA
-	.string "LOWS$"
-
-gEasyChatWord_Um:: @ 859C0BF
-	.string "UM$"
-
-gEasyChatWord_Rear:: @ 859C0C2
-	.string "REAR$"
-
-gEasyChatWord_Things:: @ 859C0C7
-	.string "THINGS$"
-
-gEasyChatWord_Thing:: @ 859C0CE
-	.string "THING$"
-
-gEasyChatWord_Below:: @ 859C0D4
-	.string "BELOW$"
-
-gEasyChatWord_Above:: @ 859C0DA
-	.string "ABOVE$"
-
-gEasyChatWord_Back:: @ 859C0E0
-	.string "BACK$"
-
-gEasyChatWord_High:: @ 859C0E5
-	.string "HIGH$"
-
-gEasyChatWord_Here:: @ 859C0EA
-	.string "HERE$"
-
-gEasyChatWord_Inside:: @ 859C0EF
-	.string "INSIDE$"
-
-gEasyChatWord_Outside:: @ 859C0F6
-	.string "OUTSIDE$"
-
-gEasyChatWord_Beside:: @ 859C0FE
-	.string "BESIDE$"
-
-gEasyChatWord_ThisIsItExcl:: @ 859C105
-	.string "THIS IS IT!$"
-
-gEasyChatWord_This:: @ 859C111
-	.string "THIS$"
-
-gEasyChatWord_Every:: @ 859C116
-	.string "EVERY$"
-
-gEasyChatWord_These:: @ 859C11C
-	.string "THESE$"
-
-gEasyChatWord_TheseWere:: @ 859C122
-	.string "THESE WERE$"
-
-gEasyChatWord_Down:: @ 859C12D
-	.string "DOWN$"
-
-gEasyChatWord_That:: @ 859C132
-	.string "THAT$"
-
-gEasyChatWord_ThoseAre:: @ 859C137
-	.string "THOSE ARE$"
-
-gEasyChatWord_ThoseWere:: @ 859C141
-	.string "THOSE WERE$"
-
-gEasyChatWord_ThatsItExcl:: @ 859C14C
-	.string "THAT'S IT!$"
-
-gEasyChatWord_Am:: @ 859C157
-	.string "AM$"
-
-gEasyChatWord_ThatWas:: @ 859C15A
-	.string "THAT WAS$"
-
-gEasyChatWord_Front:: @ 859C163
-	.string "FRONT$"
-
-gEasyChatWord_Up:: @ 859C169
-	.string "UP$"
-
-gEasyChatWord_Choice:: @ 859C16C
-	.string "CHOICE$"
-
-gEasyChatWord_Far:: @ 859C173
-	.string "FAR$"
-
-gEasyChatWord_Away:: @ 859C177
-	.string "AWAY$"
-
-gEasyChatWord_Near:: @ 859C17C
-	.string "NEAR$"
-
-gEasyChatWord_Where:: @ 859C181
-	.string "WHERE$"
-
-gEasyChatWord_When:: @ 859C187
-	.string "WHEN$"
-
-gEasyChatWord_What:: @ 859C18C
-	.string "WHAT$"
-
-gEasyChatWord_Deep:: @ 859C191
-	.string "DEEP$"
-
-gEasyChatWord_Shallow:: @ 859C196
-	.string "SHALLOW$"
-
-gEasyChatWord_Why:: @ 859C19E
-	.string "WHY$"
-
-gEasyChatWord_Confused:: @ 859C1A2
-	.string "CONFUSED$"
-
-gEasyChatWord_Opposite:: @ 859C1AB
-	.string "OPPOSITE$"
-
-gEasyChatWord_Left:: @ 859C1B4
-	.string "LEFT$"
-
-gEasyChatWord_Right:: @ 859C1B9
-	.string "RIGHT$"
-
-	.align 2
-gEasyChatGroup_Misc:: @ 859C1C0
-	.4byte gEasyChatWord_Highs
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lows
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Um
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rear
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Things
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Thing
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Below
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Above
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Back
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_High
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Here
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Inside
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Outside
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Beside
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ThisIsItExcl
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_This
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Every
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_These
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_TheseWere
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Down
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_That
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ThoseAre
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ThoseWere
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ThatsItExcl
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Am
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ThatWas
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Front
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Up
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Choice
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Far
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Away
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Near
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Where
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_When
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_What
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Deep
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shallow
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Why
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Confused
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Opposite
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Left
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Right
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_move_1.s b/data/text/easy_chat/easy_chat_group_move_1.s
deleted file mode 100644
index 595dfd158..000000000
--- a/data/text/easy_chat/easy_chat_group_move_1.s
+++ /dev/null
@@ -1,156 +0,0 @@
-	.align 2
-gEasyChatGroup_Move1:: @ 859C8C4
-	.2byte MOVE_ABSORB
-	.2byte MOVE_AEROBLAST
-	.2byte MOVE_AGILITY
-	.2byte MOVE_AIR_CUTTER
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_AROMATHERAPY
-	.2byte MOVE_ASTONISH
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_BIDE
-	.2byte MOVE_BIND
-	.2byte MOVE_BITE
-	.2byte MOVE_BRICK_BREAK
-	.2byte MOVE_BUBBLE
-	.2byte MOVE_CHARGE
-	.2byte MOVE_CHARM
-	.2byte MOVE_CLAMP
-	.2byte MOVE_CONFUSE_RAY
-	.2byte MOVE_CONSTRICT
-	.2byte MOVE_COSMIC_POWER
-	.2byte MOVE_COUNTER
-	.2byte MOVE_CRABHAMMER
-	.2byte MOVE_CROSS_CHOP
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_CUT
-	.2byte MOVE_DIG
-	.2byte MOVE_DISABLE
-	.2byte MOVE_DOUBLE_TEAM
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_DOUBLE_SLAP
-	.2byte MOVE_EARTHQUAKE
-	.2byte MOVE_ENCORE
-	.2byte MOVE_ENDEAVOR
-	.2byte MOVE_ENDURE
-	.2byte MOVE_EXTRASENSORY
-	.2byte MOVE_EXTREME_SPEED
-	.2byte MOVE_FACADE
-	.2byte MOVE_FAKE_TEARS
-	.2byte MOVE_FISSURE
-	.2byte MOVE_FLAIL
-	.2byte MOVE_FLAME_WHEEL
-	.2byte MOVE_FLAMETHROWER
-	.2byte MOVE_FLATTER
-	.2byte MOVE_FLY
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_FOCUS_PUNCH
-	.2byte MOVE_FOLLOW_ME
-	.2byte MOVE_GIGA_DRAIN
-	.2byte MOVE_GRASS_WHISTLE
-	.2byte MOVE_GROWTH
-	.2byte MOVE_GRUDGE
-	.2byte MOVE_GUST
-	.2byte MOVE_HAIL
-	.2byte MOVE_HARDEN
-	.2byte MOVE_HAZE
-	.2byte MOVE_HEADBUTT
-	.2byte MOVE_HEAL_BELL
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_ICE_BALL
-	.2byte MOVE_ICY_WIND
-	.2byte MOVE_IRON_TAIL
-	.2byte MOVE_KARATE_CHOP
-	.2byte MOVE_KINESIS
-	.2byte MOVE_LEECH_LIFE
-	.2byte MOVE_LICK
-	.2byte MOVE_LOVELY_KISS
-	.2byte MOVE_LOW_KICK
-	.2byte MOVE_MEAN_LOOK
-	.2byte MOVE_MEMENTO
-	.2byte MOVE_METAL_SOUND
-	.2byte MOVE_METEOR_MASH
-	.2byte MOVE_MIND_READER
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_MIST
-	.2byte MOVE_MORNING_SUN
-	.2byte MOVE_NATURE_POWER
-	.2byte MOVE_NIGHTMARE
-	.2byte MOVE_OCTAZOOKA
-	.2byte MOVE_ODOR_SLEUTH
-	.2byte MOVE_OUTRAGE
-	.2byte MOVE_OVERHEAT
-	.2byte MOVE_PAIN_SPLIT
-	.2byte MOVE_POWDER_SNOW
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_PSYCHIC
-	.2byte MOVE_PSYCHO_BOOST
-	.2byte MOVE_PSYWAVE
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_RAGE
-	.2byte MOVE_RAIN_DANCE
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_RAZOR_WIND
-	.2byte MOVE_RECOVER
-	.2byte MOVE_RETURN
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_ROCK_SMASH
-	.2byte MOVE_ROCK_THROW
-	.2byte MOVE_ROCK_TOMB
-	.2byte MOVE_ROLLOUT
-	.2byte MOVE_SACRED_FIRE
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_SAND_TOMB
-	.2byte MOVE_SAND_ATTACK
-	.2byte MOVE_SANDSTORM
-	.2byte MOVE_SCARY_FACE
-	.2byte MOVE_SCREECH
-	.2byte MOVE_SELF_DESTRUCT
-	.2byte MOVE_SHADOW_BALL
-	.2byte MOVE_SHADOW_PUNCH
-	.2byte MOVE_SHARPEN
-	.2byte MOVE_SHEER_COLD
-	.2byte MOVE_SIGNAL_BEAM
-	.2byte MOVE_SILVER_WIND
-	.2byte MOVE_SING
-	.2byte MOVE_SKETCH
-	.2byte MOVE_SKILL_SWAP
-	.2byte MOVE_SKY_ATTACK
-	.2byte MOVE_SKY_UPPERCUT
-	.2byte MOVE_SLASH
-	.2byte MOVE_SMELLING_SALT
-	.2byte MOVE_SMOG
-	.2byte MOVE_SMOKESCREEN
-	.2byte MOVE_SNORE
-	.2byte MOVE_SOLAR_BEAM
-	.2byte MOVE_SONIC_BOOM
-	.2byte MOVE_SPARK
-	.2byte MOVE_SPIDER_WEB
-	.2byte MOVE_SPITE
-	.2byte MOVE_SPORE
-	.2byte MOVE_STRENGTH
-	.2byte MOVE_STRING_SHOT
-	.2byte MOVE_STUN_SPORE
-	.2byte MOVE_SUBMISSION
-	.2byte MOVE_SUPER_FANG
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_SWEET_SCENT
-	.2byte MOVE_SWIFT
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_TAIL_WHIP
-	.2byte MOVE_THRASH
-	.2byte MOVE_THUNDER
-	.2byte MOVE_THUNDERBOLT
-	.2byte MOVE_THUNDER_PUNCH
-	.2byte MOVE_TICKLE
-	.2byte MOVE_TORMENT
-	.2byte MOVE_UPROAR
-	.2byte MOVE_VITAL_THROW
-	.2byte MOVE_WATER_SPOUT
-	.2byte MOVE_WEATHER_BALL
-	.2byte MOVE_WHIRLPOOL
-	.2byte MOVE_WILL_O_WISP
-	.2byte MOVE_WITHDRAW
-	.2byte MOVE_YAWN
diff --git a/data/text/easy_chat/easy_chat_group_move_2.s b/data/text/easy_chat/easy_chat_group_move_2.s
deleted file mode 100644
index e08a07767..000000000
--- a/data/text/easy_chat/easy_chat_group_move_2.s
+++ /dev/null
@@ -1,202 +0,0 @@
-	.align 2
-gEasyChatGroup_Move2:: @ 859C9F8
-	.2byte MOVE_ACID
-	.2byte MOVE_ACID_ARMOR
-	.2byte MOVE_AERIAL_ACE
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_ARM_THRUST
-	.2byte MOVE_ASSIST
-	.2byte MOVE_ATTRACT
-	.2byte MOVE_BARRAGE
-	.2byte MOVE_BARRIER
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_BLAST_BURN
-	.2byte MOVE_BLAZE_KICK
-	.2byte MOVE_BLIZZARD
-	.2byte MOVE_BLOCK
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_BONE_CLUB
-	.2byte MOVE_BONE_RUSH
-	.2byte MOVE_BONEMERANG
-	.2byte MOVE_BOUNCE
-	.2byte MOVE_BUBBLE_BEAM
-	.2byte MOVE_BULK_UP
-	.2byte MOVE_BULLET_SEED
-	.2byte MOVE_CALM_MIND
-	.2byte MOVE_CAMOUFLAGE
-	.2byte MOVE_COMET_PUNCH
-	.2byte MOVE_CONFUSION
-	.2byte MOVE_CONVERSION
-	.2byte MOVE_CONVERSION_2
-	.2byte MOVE_COTTON_SPORE
-	.2byte MOVE_COVET
-	.2byte MOVE_CRUSH_CLAW
-	.2byte MOVE_CURSE
-	.2byte MOVE_DEFENSE_CURL
-	.2byte MOVE_DESTINY_BOND
-	.2byte MOVE_DETECT
-	.2byte MOVE_DIVE
-	.2byte MOVE_DIZZY_PUNCH
-	.2byte MOVE_DOOM_DESIRE
-	.2byte MOVE_DOUBLE_KICK
-	.2byte MOVE_DRAGON_CLAW
-	.2byte MOVE_DRAGON_DANCE
-	.2byte MOVE_DRAGON_RAGE
-	.2byte MOVE_DRAGON_BREATH
-	.2byte MOVE_DREAM_EATER
-	.2byte MOVE_DRILL_PECK
-	.2byte MOVE_DYNAMIC_PUNCH
-	.2byte MOVE_EGG_BOMB
-	.2byte MOVE_EMBER
-	.2byte MOVE_ERUPTION
-	.2byte MOVE_EXPLOSION
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_FAKE_OUT
-	.2byte MOVE_FALSE_SWIPE
-	.2byte MOVE_FEATHER_DANCE
-	.2byte MOVE_FIRE_BLAST
-	.2byte MOVE_FIRE_PUNCH
-	.2byte MOVE_FIRE_SPIN
-	.2byte MOVE_FLASH
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_FRENZY_PLANT
-	.2byte MOVE_FRUSTRATION
-	.2byte MOVE_FURY_ATTACK
-	.2byte MOVE_FURY_CUTTER
-	.2byte MOVE_FURY_SWIPES
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_GLARE
-	.2byte MOVE_GROWL
-	.2byte MOVE_GUILLOTINE
-	.2byte MOVE_HEAT_WAVE
-	.2byte MOVE_HELPING_HAND
-	.2byte MOVE_HI_JUMP_KICK
-	.2byte MOVE_HIDDEN_POWER
-	.2byte MOVE_HORN_ATTACK
-	.2byte MOVE_HORN_DRILL
-	.2byte MOVE_HOWL
-	.2byte MOVE_HYDRO_CANNON
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_HYPER_BEAM
-	.2byte MOVE_HYPER_FANG
-	.2byte MOVE_HYPER_VOICE
-	.2byte MOVE_ICE_BEAM
-	.2byte MOVE_ICE_PUNCH
-	.2byte MOVE_ICICLE_SPEAR
-	.2byte MOVE_IMPRISON
-	.2byte MOVE_INGRAIN
-	.2byte MOVE_IRON_DEFENSE
-	.2byte MOVE_JUMP_KICK
-	.2byte MOVE_KNOCK_OFF
-	.2byte MOVE_LEAF_BLADE
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_LEER
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_LOCK_ON
-	.2byte MOVE_LUSTER_PURGE
-	.2byte MOVE_MACH_PUNCH
-	.2byte MOVE_MAGIC_COAT
-	.2byte MOVE_MAGICAL_LEAF
-	.2byte MOVE_MAGNITUDE
-	.2byte MOVE_MEDITATE
-	.2byte MOVE_MEGA_DRAIN
-	.2byte MOVE_MEGA_KICK
-	.2byte MOVE_MEGA_PUNCH
-	.2byte MOVE_MEGAHORN
-	.2byte MOVE_METAL_CLAW
-	.2byte MOVE_METRONOME
-	.2byte MOVE_MILK_DRINK
-	.2byte MOVE_MIMIC
-	.2byte MOVE_MINIMIZE
-	.2byte MOVE_MIRROR_COAT
-	.2byte MOVE_MIST_BALL
-	.2byte MOVE_MOONLIGHT
-	.2byte MOVE_MUD_SHOT
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_MUD_SLAP
-	.2byte MOVE_MUDDY_WATER
-	.2byte MOVE_NEEDLE_ARM
-	.2byte MOVE_NIGHT_SHADE
-	.2byte MOVE_PAY_DAY
-	.2byte MOVE_PECK
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_PETAL_DANCE
-	.2byte MOVE_PIN_MISSILE
-	.2byte MOVE_POISON_FANG
-	.2byte MOVE_POISON_GAS
-	.2byte MOVE_POISON_STING
-	.2byte MOVE_POISON_TAIL
-	.2byte MOVE_POISON_POWDER
-	.2byte MOVE_POUND
-	.2byte MOVE_PRESENT
-	.2byte MOVE_PROTECT
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_RAZOR_LEAF
-	.2byte MOVE_RECYCLE
-	.2byte MOVE_REFLECT
-	.2byte MOVE_REFRESH
-	.2byte MOVE_REST
-	.2byte MOVE_REVENGE
-	.2byte MOVE_ROAR
-	.2byte MOVE_ROCK_BLAST
-	.2byte MOVE_ROLE_PLAY
-	.2byte MOVE_ROLLING_KICK
-	.2byte MOVE_SCRATCH
-	.2byte MOVE_SECRET_POWER
-	.2byte MOVE_SEISMIC_TOSS
-	.2byte MOVE_SHOCK_WAVE
-	.2byte MOVE_SKULL_BASH
-	.2byte MOVE_SLACK_OFF
-	.2byte MOVE_SLAM
-	.2byte MOVE_SLEEP_POWDER
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_SLUDGE
-	.2byte MOVE_SLUDGE_BOMB
-	.2byte MOVE_SNATCH
-	.2byte MOVE_SOFT_BOILED
-	.2byte MOVE_SPIKE_CANNON
-	.2byte MOVE_SPIKES
-	.2byte MOVE_SPIT_UP
-	.2byte MOVE_SPLASH
-	.2byte MOVE_STEEL_WING
-	.2byte MOVE_STOCKPILE
-	.2byte MOVE_STOMP
-	.2byte MOVE_STRUGGLE
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_SUNNY_DAY
-	.2byte MOVE_SUPERPOWER
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_SURF
-	.2byte MOVE_SWALLOW
-	.2byte MOVE_SWEET_KISS
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_TACKLE
-	.2byte MOVE_TAIL_GLOW
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_TAUNT
-	.2byte MOVE_TEETER_DANCE
-	.2byte MOVE_TELEPORT
-	.2byte MOVE_THIEF
-	.2byte MOVE_THUNDER_WAVE
-	.2byte MOVE_THUNDER_SHOCK
-	.2byte MOVE_TOXIC
-	.2byte MOVE_TRANSFORM
-	.2byte MOVE_TRI_ATTACK
-	.2byte MOVE_TRICK
-	.2byte MOVE_TRIPLE_KICK
-	.2byte MOVE_TWINEEDLE
-	.2byte MOVE_TWISTER
-	.2byte MOVE_VICE_GRIP
-	.2byte MOVE_VINE_WHIP
-	.2byte MOVE_VOLT_TACKLE
-	.2byte MOVE_WATER_GUN
-	.2byte MOVE_WATER_PULSE
-	.2byte MOVE_WATER_SPORT
-	.2byte MOVE_WATERFALL
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_WING_ATTACK
-	.2byte MOVE_WISH
-	.2byte MOVE_WRAP
-	.2byte MOVE_ZAP_CANNON
diff --git a/data/text/easy_chat/easy_chat_group_name_pointers.inc b/data/text/easy_chat/easy_chat_group_name_pointers.inc
deleted file mode 100644
index 375614b86..000000000
--- a/data/text/easy_chat/easy_chat_group_name_pointers.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-	.align 2
-gEasyChatGroupNamePointers:: @ 859E5D4
-	.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/easy_chat_group_people.s b/data/text/easy_chat/easy_chat_group_people.s
deleted file mode 100644
index fb74aba91..000000000
--- a/data/text/easy_chat/easy_chat_group_people.s
+++ /dev/null
@@ -1,526 +0,0 @@
-gEasyChatWord_Opponent:: @ 8599348
-	.string "OPPONENT$"
-
-gEasyChatWord_I:: @ 8599351
-	.string "I$"
-
-gEasyChatWord_You:: @ 8599353
-	.string "YOU$"
-
-gEasyChatWord_Yours:: @ 8599357
-	.string "YOURS$"
-
-gEasyChatWord_Son:: @ 859935D
-	.string "SON$"
-
-gEasyChatWord_Your:: @ 8599361
-	.string "YOUR$"
-
-gEasyChatWord_Youre:: @ 8599366
-	.string "YOU'RE$"
-
-gEasyChatWord_Youve:: @ 859936D
-	.string "YOU'VE$"
-
-gEasyChatWord_Mother:: @ 8599374
-	.string "MOTHER$"
-
-gEasyChatWord_Grandfather:: @ 859937B
-	.string "GRANDFATHER$"
-
-gEasyChatWord_Uncle:: @ 8599387
-	.string "UNCLE$"
-
-gEasyChatWord_Father:: @ 859938D
-	.string "FATHER$"
-
-gEasyChatWord_Boy:: @ 8599394
-	.string "BOY$"
-
-gEasyChatWord_Adult:: @ 8599398
-	.string "ADULT$"
-
-gEasyChatWord_Brother:: @ 859939E
-	.string "BROTHER$"
-
-gEasyChatWord_Sister:: @ 85993A6
-	.string "SISTER$"
-
-gEasyChatWord_Grandmother:: @ 85993AD
-	.string "GRANDMOTHER$"
-
-gEasyChatWord_Aunt:: @ 85993B9
-	.string "AUNT$"
-
-gEasyChatWord_Parent:: @ 85993BE
-	.string "PARENT$"
-
-gEasyChatWord_Man:: @ 85993C5
-	.string "MAN$"
-
-gEasyChatWord_Me:: @ 85993C9
-	.string "ME$"
-
-gEasyChatWord_Girl:: @ 85993CC
-	.string "GIRL$"
-
-gEasyChatWord_Babe:: @ 85993D1
-	.string "BABE$"
-
-gEasyChatWord_Family:: @ 85993D6
-	.string "FAMILY$"
-
-gEasyChatWord_Her:: @ 85993DD
-	.string "HER$"
-
-gEasyChatWord_Him:: @ 85993E1
-	.string "HIM$"
-
-gEasyChatWord_He:: @ 85993E5
-	.string "HE$"
-
-gEasyChatWord_Place:: @ 85993E8
-	.string "PLACE$"
-
-gEasyChatWord_Daughter:: @ 85993EE
-	.string "DAUGHTER$"
-
-gEasyChatWord_His:: @ 85993F7
-	.string "HIS$"
-
-gEasyChatWord_Hes:: @ 85993FB
-	.string "HE'S$"
-
-gEasyChatWord_Arent:: @ 8599400
-	.string "AREN'T$"
-
-gEasyChatWord_Siblings:: @ 8599407
-	.string "SIBLINGS$"
-
-gEasyChatWord_Kid:: @ 8599410
-	.string "KID$"
-
-gEasyChatWord_Children:: @ 8599414
-	.string "CHILDREN$"
-
-gEasyChatWord_Mr:: @ 859941D
-	.string "MR.$"
-
-gEasyChatWord_Mrs:: @ 8599421
-	.string "MRS.$"
-
-gEasyChatWord_Myself:: @ 8599426
-	.string "MYSELF$"
-
-gEasyChatWord_IWas:: @ 859942D
-	.string "I WAS$"
-
-gEasyChatWord_ToMe:: @ 8599433
-	.string "TO ME$"
-
-gEasyChatWord_My:: @ 8599439
-	.string "MY$"
-
-gEasyChatWord_IAm:: @ 859943C
-	.string "I AM$"
-
-gEasyChatWord_Ive:: @ 8599441
-	.string "I'VE$"
-
-gEasyChatWord_Who:: @ 8599446
-	.string "WHO$"
-
-gEasyChatWord_Someone:: @ 859944A
-	.string "SOMEONE$"
-
-gEasyChatWord_WhoWas:: @ 8599452
-	.string "WHO WAS$"
-
-gEasyChatWord_ToWhom:: @ 859945A
-	.string "TO WHOM$"
-
-gEasyChatWord_Whose:: @ 8599462
-	.string "WHOSE$"
-
-gEasyChatWord_WhoIs:: @ 8599468
-	.string "WHO IS$"
-
-gEasyChatWord_Its:: @ 859946F
-	.string "IT'S$"
-
-gEasyChatWord_Lady:: @ 8599474
-	.string "LADY$"
-
-gEasyChatWord_Friend:: @ 8599479
-	.string "FRIEND$"
-
-gEasyChatWord_Ally:: @ 8599480
-	.string "ALLY$"
-
-gEasyChatWord_Person:: @ 8599485
-	.string "PERSON$"
-
-gEasyChatWord_Dude:: @ 859948C
-	.string "DUDE$"
-
-gEasyChatWord_They:: @ 8599491
-	.string "THEY$"
-
-gEasyChatWord_TheyWere:: @ 8599496
-	.string "THEY WERE$"
-
-gEasyChatWord_ToThem:: @ 85994A0
-	.string "TO THEM$"
-
-gEasyChatWord_Their:: @ 85994A8
-	.string "THEIR$"
-
-gEasyChatWord_Theyre:: @ 85994AE
-	.string "THEY'RE$"
-
-gEasyChatWord_Theyve:: @ 85994B6
-	.string "THEY'VE$"
-
-gEasyChatWord_We:: @ 85994BE
-	.string "WE$"
-
-gEasyChatWord_Been:: @ 85994C1
-	.string "BEEN$"
-
-gEasyChatWord_ToUs:: @ 85994C6
-	.string "TO US$"
-
-gEasyChatWord_Our:: @ 85994CC
-	.string "OUR$"
-
-gEasyChatWord_WeAre:: @ 85994D0
-	.string "WE'RE$"
-
-gEasyChatWord_Rival:: @ 85994D6
-	.string "RIVAL$"
-
-gEasyChatWord_Weve:: @ 85994DC
-	.string "WE'VE$"
-
-gEasyChatWord_Woman:: @ 85994E2
-	.string "WOMAN$"
-
-gEasyChatWord_She:: @ 85994E8
-	.string "SHE$"
-
-gEasyChatWord_SheWas:: @ 85994EC
-	.string "SHE WAS$"
-
-gEasyChatWord_ToHer:: @ 85994F4
-	.string "TO HER$"
-
-gEasyChatWord_Hers:: @ 85994FB
-	.string "HERS$"
-
-gEasyChatWord_SheIs:: @ 8599500
-	.string "SHE IS$"
-
-gEasyChatWord_Some:: @ 8599507
-	.string "SOME$"
-
-	.align 2
-gEasyChatGroup_People:: @ 859950C
-	.4byte gEasyChatWord_Opponent
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_I
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_You
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yours
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Son
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Your
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Youre
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Youve
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mother
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Grandfather
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Uncle
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Father
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Boy
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Adult
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Brother
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sister
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Grandmother
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Aunt
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Parent
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Man
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Me
-	.4byte 72 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Girl
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Babe
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Family
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Her
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Him
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_He
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Place
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Daughter
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_His
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hes
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Arent
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Siblings
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Kid
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Children
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mr
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mrs
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Myself
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_IWas
-	.4byte 64 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ToMe
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_My
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_IAm
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ive
-	.4byte 66 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Who
-	.4byte 69 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Someone
-	.4byte 73 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WhoWas
-	.4byte 70 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ToWhom
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Whose
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WhoIs
-	.4byte 74 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Its
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lady
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Friend
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ally
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Person
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dude
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_They
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_TheyWere
-	.4byte 71 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ToThem
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Their
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Theyre
-	.4byte 63 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Theyve
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_We
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Been
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ToUs
-	.4byte 65 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Our
-	.4byte 67 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WeAre
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rival
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Weve
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Woman
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_She
-	.4byte 68 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SheWas
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ToHer
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hers
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SheIs
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Some
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_pokemon.s b/data/text/easy_chat/easy_chat_group_pokemon.s
deleted file mode 100644
index 571c68736..000000000
--- a/data/text/easy_chat/easy_chat_group_pokemon.s
+++ /dev/null
@@ -1,204 +0,0 @@
-	.align 2
-gEasyChatGroup_Pokemon:: @ 8597E9C
-	.2byte SPECIES_ABRA
-	.2byte SPECIES_ABSOL
-	.2byte SPECIES_AGGRON
-	.2byte SPECIES_ALAKAZAM
-	.2byte SPECIES_ALTARIA
-	.2byte SPECIES_ANORITH
-	.2byte SPECIES_ARMALDO
-	.2byte SPECIES_ARON
-	.2byte SPECIES_AZUMARILL
-	.2byte SPECIES_AZURILL
-	.2byte SPECIES_BAGON
-	.2byte SPECIES_BALTOY
-	.2byte SPECIES_BANETTE
-	.2byte SPECIES_BARBOACH
-	.2byte SPECIES_BEAUTIFLY
-	.2byte SPECIES_BELDUM
-	.2byte SPECIES_BELLOSSOM
-	.2byte SPECIES_BLAZIKEN
-	.2byte SPECIES_BRELOOM
-	.2byte SPECIES_CACNEA
-	.2byte SPECIES_CACTURNE
-	.2byte SPECIES_CAMERUPT
-	.2byte SPECIES_CARVANHA
-	.2byte SPECIES_CASCOON
-	.2byte SPECIES_CASTFORM
-	.2byte SPECIES_CHIMECHO
-	.2byte SPECIES_CHINCHOU
-	.2byte SPECIES_CLAMPERL
-	.2byte SPECIES_CLAYDOL
-	.2byte SPECIES_COMBUSKEN
-	.2byte SPECIES_CORPHISH
-	.2byte SPECIES_CORSOLA
-	.2byte SPECIES_CRADILY
-	.2byte SPECIES_CRAWDAUNT
-	.2byte SPECIES_CROBAT
-	.2byte SPECIES_DELCATTY
-	.2byte SPECIES_DEOXYS
-	.2byte SPECIES_DODRIO
-	.2byte SPECIES_DODUO
-	.2byte SPECIES_DONPHAN
-	.2byte SPECIES_DUSCLOPS
-	.2byte SPECIES_DUSKULL
-	.2byte SPECIES_DUSTOX
-	.2byte SPECIES_ELECTRIKE
-	.2byte SPECIES_ELECTRODE
-	.2byte SPECIES_EXPLOUD
-	.2byte SPECIES_FEEBAS
-	.2byte SPECIES_FLYGON
-	.2byte SPECIES_GARDEVOIR
-	.2byte SPECIES_GEODUDE
-	.2byte SPECIES_GIRAFARIG
-	.2byte SPECIES_GLALIE
-	.2byte SPECIES_GLOOM
-	.2byte SPECIES_GOLBAT
-	.2byte SPECIES_GOLDEEN
-	.2byte SPECIES_GOLDUCK
-	.2byte SPECIES_GOLEM
-	.2byte SPECIES_GOREBYSS
-	.2byte SPECIES_GRAVELER
-	.2byte SPECIES_GRIMER
-	.2byte SPECIES_GROUDON
-	.2byte SPECIES_GROVYLE
-	.2byte SPECIES_GRUMPIG
-	.2byte SPECIES_GULPIN
-	.2byte SPECIES_GYARADOS
-	.2byte SPECIES_HARIYAMA
-	.2byte SPECIES_HERACROSS
-	.2byte SPECIES_HORSEA
-	.2byte SPECIES_HUNTAIL
-	.2byte SPECIES_IGGLYBUFF
-	.2byte SPECIES_ILLUMISE
-	.2byte SPECIES_JIGGLYPUFF
-	.2byte SPECIES_JIRACHI
-	.2byte SPECIES_KADABRA
-	.2byte SPECIES_KECLEON
-	.2byte SPECIES_KINGDRA
-	.2byte SPECIES_KIRLIA
-	.2byte SPECIES_KOFFING
-	.2byte SPECIES_KYOGRE
-	.2byte SPECIES_LAIRON
-	.2byte SPECIES_LANTURN
-	.2byte SPECIES_LATIAS
-	.2byte SPECIES_LATIOS
-	.2byte SPECIES_LILEEP
-	.2byte SPECIES_LINOONE
-	.2byte SPECIES_LOMBRE
-	.2byte SPECIES_LOTAD
-	.2byte SPECIES_LOUDRED
-	.2byte SPECIES_LUDICOLO
-	.2byte SPECIES_LUNATONE
-	.2byte SPECIES_LUVDISC
-	.2byte SPECIES_MACHAMP
-	.2byte SPECIES_MACHOKE
-	.2byte SPECIES_MACHOP
-	.2byte SPECIES_MAGCARGO
-	.2byte SPECIES_MAGIKARP
-	.2byte SPECIES_MAGNEMITE
-	.2byte SPECIES_MAGNETON
-	.2byte SPECIES_MAKUHITA
-	.2byte SPECIES_MANECTRIC
-	.2byte SPECIES_MARILL
-	.2byte SPECIES_MARSHTOMP
-	.2byte SPECIES_MASQUERAIN
-	.2byte SPECIES_MAWILE
-	.2byte SPECIES_MEDICHAM
-	.2byte SPECIES_MEDITITE
-	.2byte SPECIES_METAGROSS
-	.2byte SPECIES_METANG
-	.2byte SPECIES_MIGHTYENA
-	.2byte SPECIES_MILOTIC
-	.2byte SPECIES_MINUN
-	.2byte SPECIES_MUDKIP
-	.2byte SPECIES_MUK
-	.2byte SPECIES_NATU
-	.2byte SPECIES_NINCADA
-	.2byte SPECIES_NINETALES
-	.2byte SPECIES_NINJASK
-	.2byte SPECIES_NOSEPASS
-	.2byte SPECIES_NUMEL
-	.2byte SPECIES_NUZLEAF
-	.2byte SPECIES_ODDISH
-	.2byte SPECIES_PELIPPER
-	.2byte SPECIES_PHANPY
-	.2byte SPECIES_PICHU
-	.2byte SPECIES_PIKACHU
-	.2byte SPECIES_PINSIR
-	.2byte SPECIES_PLUSLE
-	.2byte SPECIES_POOCHYENA
-	.2byte SPECIES_PSYDUCK
-	.2byte SPECIES_RAICHU
-	.2byte SPECIES_RALTS
-	.2byte SPECIES_RAYQUAZA
-	.2byte SPECIES_REGICE
-	.2byte SPECIES_REGIROCK
-	.2byte SPECIES_REGISTEEL
-	.2byte SPECIES_RELICANTH
-	.2byte SPECIES_RHYDON
-	.2byte SPECIES_RHYHORN
-	.2byte SPECIES_ROSELIA
-	.2byte SPECIES_SABLEYE
-	.2byte SPECIES_SALAMENCE
-	.2byte SPECIES_SANDSHREW
-	.2byte SPECIES_SANDSLASH
-	.2byte SPECIES_SCEPTILE
-	.2byte SPECIES_SEADRA
-	.2byte SPECIES_SEAKING
-	.2byte SPECIES_SEALEO
-	.2byte SPECIES_SEEDOT
-	.2byte SPECIES_SEVIPER
-	.2byte SPECIES_SHARPEDO
-	.2byte SPECIES_SHEDINJA
-	.2byte SPECIES_SHELGON
-	.2byte SPECIES_SHIFTRY
-	.2byte SPECIES_SHROOMISH
-	.2byte SPECIES_SHUPPET
-	.2byte SPECIES_SILCOON
-	.2byte SPECIES_SKARMORY
-	.2byte SPECIES_SKITTY
-	.2byte SPECIES_SLAKING
-	.2byte SPECIES_SLAKOTH
-	.2byte SPECIES_SLUGMA
-	.2byte SPECIES_SNORUNT
-	.2byte SPECIES_SOLROCK
-	.2byte SPECIES_SPHEAL
-	.2byte SPECIES_SPINDA
-	.2byte SPECIES_SPOINK
-	.2byte SPECIES_STARMIE
-	.2byte SPECIES_STARYU
-	.2byte SPECIES_SURSKIT
-	.2byte SPECIES_SWABLU
-	.2byte SPECIES_SWALOT
-	.2byte SPECIES_SWAMPERT
-	.2byte SPECIES_SWELLOW
-	.2byte SPECIES_TAILLOW
-	.2byte SPECIES_TENTACOOL
-	.2byte SPECIES_TENTACRUEL
-	.2byte SPECIES_TORCHIC
-	.2byte SPECIES_TORKOAL
-	.2byte SPECIES_TRAPINCH
-	.2byte SPECIES_TREECKO
-	.2byte SPECIES_TROPIUS
-	.2byte SPECIES_VIBRAVA
-	.2byte SPECIES_VIGOROTH
-	.2byte SPECIES_VILEPLUME
-	.2byte SPECIES_VOLBEAT
-	.2byte SPECIES_VOLTORB
-	.2byte SPECIES_VULPIX
-	.2byte SPECIES_WAILMER
-	.2byte SPECIES_WAILORD
-	.2byte SPECIES_WALREIN
-	.2byte SPECIES_WEEZING
-	.2byte SPECIES_WHISCASH
-	.2byte SPECIES_WHISMUR
-	.2byte SPECIES_WIGGLYTUFF
-	.2byte SPECIES_WINGULL
-	.2byte SPECIES_WOBBUFFET
-	.2byte SPECIES_WURMPLE
-	.2byte SPECIES_WYNAUT
-	.2byte SPECIES_XATU
-	.2byte SPECIES_ZANGOOSE
-	.2byte SPECIES_ZIGZAGOON
-	.2byte SPECIES_ZUBAT
diff --git a/data/text/easy_chat/easy_chat_group_pokemon2.s b/data/text/easy_chat/easy_chat_group_pokemon2.s
deleted file mode 100644
index e2f58e496..000000000
--- a/data/text/easy_chat/easy_chat_group_pokemon2.s
+++ /dev/null
@@ -1,253 +0,0 @@
-	.align 2
-gEasyChatGroup_Pokemon2:: @ 859CE0C
-	.2byte SPECIES_ABRA
-	.2byte SPECIES_AERODACTYL
-	.2byte SPECIES_AIPOM
-	.2byte SPECIES_ALAKAZAM
-	.2byte SPECIES_AMPHAROS
-	.2byte SPECIES_ARBOK
-	.2byte SPECIES_ARCANINE
-	.2byte SPECIES_ARIADOS
-	.2byte SPECIES_ARTICUNO
-	.2byte SPECIES_AZUMARILL
-	.2byte SPECIES_BAYLEEF
-	.2byte SPECIES_BEEDRILL
-	.2byte SPECIES_BELLOSSOM
-	.2byte SPECIES_BELLSPROUT
-	.2byte SPECIES_BLASTOISE
-	.2byte SPECIES_BLISSEY
-	.2byte SPECIES_BULBASAUR
-	.2byte SPECIES_BUTTERFREE
-	.2byte SPECIES_CATERPIE
-	.2byte SPECIES_CELEBI
-	.2byte SPECIES_CHANSEY
-	.2byte SPECIES_CHARIZARD
-	.2byte SPECIES_CHARMANDER
-	.2byte SPECIES_CHARMELEON
-	.2byte SPECIES_CHIKORITA
-	.2byte SPECIES_CHINCHOU
-	.2byte SPECIES_CLEFABLE
-	.2byte SPECIES_CLEFAIRY
-	.2byte SPECIES_CLEFFA
-	.2byte SPECIES_CLOYSTER
-	.2byte SPECIES_CORSOLA
-	.2byte SPECIES_CROBAT
-	.2byte SPECIES_CROCONAW
-	.2byte SPECIES_CUBONE
-	.2byte SPECIES_CYNDAQUIL
-	.2byte SPECIES_DELIBIRD
-	.2byte SPECIES_DEWGONG
-	.2byte SPECIES_DIGLETT
-	.2byte SPECIES_DITTO
-	.2byte SPECIES_DODRIO
-	.2byte SPECIES_DODUO
-	.2byte SPECIES_DONPHAN
-	.2byte SPECIES_DRAGONAIR
-	.2byte SPECIES_DRAGONITE
-	.2byte SPECIES_DRATINI
-	.2byte SPECIES_DROWZEE
-	.2byte SPECIES_DUGTRIO
-	.2byte SPECIES_DUNSPARCE
-	.2byte SPECIES_EEVEE
-	.2byte SPECIES_EKANS
-	.2byte SPECIES_ELECTABUZZ
-	.2byte SPECIES_ELECTRODE
-	.2byte SPECIES_ELEKID
-	.2byte SPECIES_ENTEI
-	.2byte SPECIES_ESPEON
-	.2byte SPECIES_EXEGGCUTE
-	.2byte SPECIES_EXEGGUTOR
-	.2byte SPECIES_FARFETCHD
-	.2byte SPECIES_FEAROW
-	.2byte SPECIES_FERALIGATR
-	.2byte SPECIES_FLAAFFY
-	.2byte SPECIES_FLAREON
-	.2byte SPECIES_FORRETRESS
-	.2byte SPECIES_FURRET
-	.2byte SPECIES_GASTLY
-	.2byte SPECIES_GENGAR
-	.2byte SPECIES_GEODUDE
-	.2byte SPECIES_GIRAFARIG
-	.2byte SPECIES_GLIGAR
-	.2byte SPECIES_GLOOM
-	.2byte SPECIES_GOLBAT
-	.2byte SPECIES_GOLDEEN
-	.2byte SPECIES_GOLDUCK
-	.2byte SPECIES_GOLEM
-	.2byte SPECIES_GRANBULL
-	.2byte SPECIES_GRAVELER
-	.2byte SPECIES_GRIMER
-	.2byte SPECIES_GROWLITHE
-	.2byte SPECIES_GYARADOS
-	.2byte SPECIES_HAUNTER
-	.2byte SPECIES_HERACROSS
-	.2byte SPECIES_HITMONCHAN
-	.2byte SPECIES_HITMONLEE
-	.2byte SPECIES_HITMONTOP
-	.2byte SPECIES_HO_OH
-	.2byte SPECIES_HOOTHOOT
-	.2byte SPECIES_HOPPIP
-	.2byte SPECIES_HORSEA
-	.2byte SPECIES_HOUNDOOM
-	.2byte SPECIES_HOUNDOUR
-	.2byte SPECIES_HYPNO
-	.2byte SPECIES_IGGLYBUFF
-	.2byte SPECIES_IVYSAUR
-	.2byte SPECIES_JIGGLYPUFF
-	.2byte SPECIES_JOLTEON
-	.2byte SPECIES_JUMPLUFF
-	.2byte SPECIES_JYNX
-	.2byte SPECIES_KABUTO
-	.2byte SPECIES_KABUTOPS
-	.2byte SPECIES_KADABRA
-	.2byte SPECIES_KAKUNA
-	.2byte SPECIES_KANGASKHAN
-	.2byte SPECIES_KINGDRA
-	.2byte SPECIES_KINGLER
-	.2byte SPECIES_KOFFING
-	.2byte SPECIES_KRABBY
-	.2byte SPECIES_LANTURN
-	.2byte SPECIES_LAPRAS
-	.2byte SPECIES_LARVITAR
-	.2byte SPECIES_LEDIAN
-	.2byte SPECIES_LEDYBA
-	.2byte SPECIES_LICKITUNG
-	.2byte SPECIES_LUGIA
-	.2byte SPECIES_MACHAMP
-	.2byte SPECIES_MACHOKE
-	.2byte SPECIES_MACHOP
-	.2byte SPECIES_MAGBY
-	.2byte SPECIES_MAGCARGO
-	.2byte SPECIES_MAGIKARP
-	.2byte SPECIES_MAGMAR
-	.2byte SPECIES_MAGNEMITE
-	.2byte SPECIES_MAGNETON
-	.2byte SPECIES_MANKEY
-	.2byte SPECIES_MANTINE
-	.2byte SPECIES_MAREEP
-	.2byte SPECIES_MARILL
-	.2byte SPECIES_MAROWAK
-	.2byte SPECIES_MEGANIUM
-	.2byte SPECIES_MEOWTH
-	.2byte SPECIES_METAPOD
-	.2byte SPECIES_MEW
-	.2byte SPECIES_MEWTWO
-	.2byte SPECIES_MILTANK
-	.2byte SPECIES_MISDREAVUS
-	.2byte SPECIES_MOLTRES
-	.2byte SPECIES_MR_MIME
-	.2byte SPECIES_MUK
-	.2byte SPECIES_MURKROW
-	.2byte SPECIES_NATU
-	.2byte SPECIES_NIDOKING
-	.2byte SPECIES_NIDOQUEEN
-	.2byte SPECIES_NIDORAN_F
-	.2byte SPECIES_NIDORAN_M
-	.2byte SPECIES_NIDORINA
-	.2byte SPECIES_NIDORINO
-	.2byte SPECIES_NINETALES
-	.2byte SPECIES_NOCTOWL
-	.2byte SPECIES_OCTILLERY
-	.2byte SPECIES_ODDISH
-	.2byte SPECIES_OMANYTE
-	.2byte SPECIES_OMASTAR
-	.2byte SPECIES_ONIX
-	.2byte SPECIES_PARAS
-	.2byte SPECIES_PARASECT
-	.2byte SPECIES_PERSIAN
-	.2byte SPECIES_PHANPY
-	.2byte SPECIES_PICHU
-	.2byte SPECIES_PIDGEOT
-	.2byte SPECIES_PIDGEOTTO
-	.2byte SPECIES_PIDGEY
-	.2byte SPECIES_PIKACHU
-	.2byte SPECIES_PILOSWINE
-	.2byte SPECIES_PINECO
-	.2byte SPECIES_PINSIR
-	.2byte SPECIES_POLITOED
-	.2byte SPECIES_POLIWAG
-	.2byte SPECIES_POLIWHIRL
-	.2byte SPECIES_POLIWRATH
-	.2byte SPECIES_PONYTA
-	.2byte SPECIES_PORYGON
-	.2byte SPECIES_PORYGON2
-	.2byte SPECIES_PRIMEAPE
-	.2byte SPECIES_PSYDUCK
-	.2byte SPECIES_PUPITAR
-	.2byte SPECIES_QUAGSIRE
-	.2byte SPECIES_QUILAVA
-	.2byte SPECIES_QWILFISH
-	.2byte SPECIES_RAICHU
-	.2byte SPECIES_RAIKOU
-	.2byte SPECIES_RAPIDASH
-	.2byte SPECIES_RATICATE
-	.2byte SPECIES_RATTATA
-	.2byte SPECIES_REMORAID
-	.2byte SPECIES_RHYDON
-	.2byte SPECIES_RHYHORN
-	.2byte SPECIES_SANDSHREW
-	.2byte SPECIES_SANDSLASH
-	.2byte SPECIES_SCIZOR
-	.2byte SPECIES_SCYTHER
-	.2byte SPECIES_SEADRA
-	.2byte SPECIES_SEAKING
-	.2byte SPECIES_SEEL
-	.2byte SPECIES_SENTRET
-	.2byte SPECIES_SHELLDER
-	.2byte SPECIES_SHUCKLE
-	.2byte SPECIES_SKARMORY
-	.2byte SPECIES_SKIPLOOM
-	.2byte SPECIES_SLOWBRO
-	.2byte SPECIES_SLOWKING
-	.2byte SPECIES_SLOWPOKE
-	.2byte SPECIES_SLUGMA
-	.2byte SPECIES_SMEARGLE
-	.2byte SPECIES_SMOOCHUM
-	.2byte SPECIES_SNEASEL
-	.2byte SPECIES_SNORLAX
-	.2byte SPECIES_SNUBBULL
-	.2byte SPECIES_SPEAROW
-	.2byte SPECIES_SPINARAK
-	.2byte SPECIES_SQUIRTLE
-	.2byte SPECIES_STANTLER
-	.2byte SPECIES_STARMIE
-	.2byte SPECIES_STARYU
-	.2byte SPECIES_STEELIX
-	.2byte SPECIES_SUDOWOODO
-	.2byte SPECIES_SUICUNE
-	.2byte SPECIES_SUNFLORA
-	.2byte SPECIES_SUNKERN
-	.2byte SPECIES_SWINUB
-	.2byte SPECIES_TANGELA
-	.2byte SPECIES_TAUROS
-	.2byte SPECIES_TEDDIURSA
-	.2byte SPECIES_TENTACOOL
-	.2byte SPECIES_TENTACRUEL
-	.2byte SPECIES_TOGEPI
-	.2byte SPECIES_TOGETIC
-	.2byte SPECIES_TOTODILE
-	.2byte SPECIES_TYPHLOSION
-	.2byte SPECIES_TYRANITAR
-	.2byte SPECIES_TYROGUE
-	.2byte SPECIES_UMBREON
-	.2byte SPECIES_UNOWN
-	.2byte SPECIES_URSARING
-	.2byte SPECIES_VAPOREON
-	.2byte SPECIES_VENOMOTH
-	.2byte SPECIES_VENONAT
-	.2byte SPECIES_VENUSAUR
-	.2byte SPECIES_VICTREEBEL
-	.2byte SPECIES_VILEPLUME
-	.2byte SPECIES_VOLTORB
-	.2byte SPECIES_VULPIX
-	.2byte SPECIES_WARTORTLE
-	.2byte SPECIES_WEEDLE
-	.2byte SPECIES_WEEPINBELL
-	.2byte SPECIES_WEEZING
-	.2byte SPECIES_WIGGLYTUFF
-	.2byte SPECIES_WOBBUFFET
-	.2byte SPECIES_WOOPER
-	.2byte SPECIES_XATU
-	.2byte SPECIES_YANMA
-	.2byte SPECIES_ZAPDOS
-	.2byte SPECIES_ZUBAT
diff --git a/data/text/easy_chat/easy_chat_group_speech.s b/data/text/easy_chat/easy_chat_group_speech.s
deleted file mode 100644
index 4cfea7eca..000000000
--- a/data/text/easy_chat/easy_chat_group_speech.s
+++ /dev/null
@@ -1,421 +0,0 @@
-gEasyChatWord_Listen:: @ 8599CE8
-	.string "LISTEN$"
-
-gEasyChatWord_NotVery:: @ 8599CEF
-	.string "NOT VERY$"
-
-gEasyChatWord_Mean:: @ 8599CF8
-	.string "MEAN$"
-
-gEasyChatWord_Lie:: @ 8599CFD
-	.string "LIE$"
-
-gEasyChatWord_Lay:: @ 8599D01
-	.string "LAY$"
-
-gEasyChatWord_Recommend:: @ 8599D05
-	.string "RECOMMEND$"
-
-gEasyChatWord_Nitwit:: @ 8599D0F
-	.string "NITWIT$"
-
-gEasyChatWord_Quite:: @ 8599D16
-	.string "QUITE$"
-
-gEasyChatWord_From:: @ 8599D1C
-	.string "FROM$"
-
-gEasyChatWord_Feeling:: @ 8599D21
-	.string "FEELING$"
-
-gEasyChatWord_But:: @ 8599D29
-	.string "BUT$"
-
-gEasyChatWord_However:: @ 8599D2D
-	.string "HOWEVER$"
-
-gEasyChatWord_Case:: @ 8599D35
-	.string "CASE$"
-
-gEasyChatWord_The:: @ 8599D3A
-	.string "THE$"
-
-gEasyChatWord_Miss:: @ 8599D3E
-	.string "MISS$"
-
-gEasyChatWord_How:: @ 8599D43
-	.string "HOW$"
-
-gEasyChatWord_Hit:: @ 8599D47
-	.string "HIT$"
-
-gEasyChatWord_Enough:: @ 8599D4B
-	.string "ENOUGH$"
-
-gEasyChatWord_ALot:: @ 8599D52
-	.string "A LOT$"
-
-gEasyChatWord_ALittle:: @ 8599D58
-	.string "A LITTLE$"
-
-gEasyChatWord_Absolutely:: @ 8599D61
-	.string "ABSOLUTELY$"
-
-gEasyChatWord_And:: @ 8599D6C
-	.string "AND$"
-
-gEasyChatWord_Only:: @ 8599D70
-	.string "ONLY$"
-
-gEasyChatWord_Around:: @ 8599D75
-	.string "AROUND$"
-
-gEasyChatWord_Probably:: @ 8599D7C
-	.string "PROBABLY$"
-
-gEasyChatWord_If:: @ 8599D85
-	.string "IF$"
-
-gEasyChatWord_Very:: @ 8599D88
-	.string "VERY$"
-
-gEasyChatWord_ATinyBit:: @ 8599D8D
-	.string "A TINY BIT$"
-
-gEasyChatWord_Wild:: @ 8599D98
-	.string "WILD$"
-
-gEasyChatWord_Thats:: @ 8599D9D
-	.string "THAT'S$"
-
-gEasyChatWord_Just:: @ 8599DA4
-	.string "JUST$"
-
-gEasyChatWord_EvenSo:: @ 8599DA9
-	.string "EVEN SO,$"
-
-gEasyChatWord_MustBe:: @ 8599DB2
-	.string "MUST BE$"
-
-gEasyChatWord_Naturally:: @ 8599DBA
-	.string "NATURALLY$"
-
-gEasyChatWord_ForNow:: @ 8599DC4
-	.string "FOR NOW,$"
-
-gEasyChatWord_Understood:: @ 8599DCD
-	.string "UNDERSTOOD$"
-
-gEasyChatWord_Joking:: @ 8599DD8
-	.string "JOKING$"
-
-gEasyChatWord_Ready:: @ 8599DDF
-	.string "READY$"
-
-gEasyChatWord_Something:: @ 8599DE5
-	.string "SOMETHING$"
-
-gEasyChatWord_Somehow:: @ 8599DEF
-	.string "SOMEHOW$"
-
-gEasyChatWord_Although:: @ 8599DF7
-	.string "ALTHOUGH$"
-
-gEasyChatWord_Also:: @ 8599E00
-	.string "ALSO$"
-
-gEasyChatWord_Perfect:: @ 8599E05
-	.string "PERFECT$"
-
-gEasyChatWord_AsMuchAs:: @ 8599E0D
-	.string "AS MUCH AS$"
-
-gEasyChatWord_Really:: @ 8599E18
-	.string "REALLY$"
-
-gEasyChatWord_Truly:: @ 8599E1F
-	.string "TRULY$"
-
-gEasyChatWord_Seriously:: @ 8599E25
-	.string "SERIOUSLY$"
-
-gEasyChatWord_Totally:: @ 8599E2F
-	.string "TOTALLY$"
-
-gEasyChatWord_Until:: @ 8599E37
-	.string "UNTIL$"
-
-gEasyChatWord_AsIf:: @ 8599E3D
-	.string "AS IF$"
-
-gEasyChatWord_Mood:: @ 8599E43
-	.string "MOOD$"
-
-gEasyChatWord_Rather:: @ 8599E48
-	.string "RATHER$"
-
-gEasyChatWord_Awfully:: @ 8599E4F
-	.string "AWFULLY$"
-
-gEasyChatWord_Mode:: @ 8599E57
-	.string "MODE$"
-
-gEasyChatWord_More:: @ 8599E5C
-	.string "MORE$"
-
-gEasyChatWord_TooLate:: @ 8599E61
-	.string "TOO LATE$"
-
-gEasyChatWord_Finally:: @ 8599E6A
-	.string "FINALLY$"
-
-gEasyChatWord_Any:: @ 8599E72
-	.string "ANY$"
-
-gEasyChatWord_Instead:: @ 8599E76
-	.string "INSTEAD$"
-
-gEasyChatWord_Fantastic:: @ 8599E7E
-	.string "FANTASTIC$"
-
-	.align 2
-gEasyChatGroup_Speech:: @ 8599E88
-	.4byte gEasyChatWord_Listen
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_NotVery
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mean
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lie
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lay
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Recommend
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nitwit
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Quite
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_From
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Feeling
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_But
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_However
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Case
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_The
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Miss
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_How
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hit
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Enough
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ALot
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ALittle
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Absolutely
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_And
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Only
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Around
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Probably
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_If
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Very
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ATinyBit
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wild
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Thats
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Just
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_EvenSo
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_MustBe
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Naturally
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ForNow
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Understood
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Joking
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ready
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Something
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Somehow
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Although
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Also
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Perfect
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_AsMuchAs
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Really
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Truly
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Seriously
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Totally
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Until
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_AsIf
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mood
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rather
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Awfully
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mode
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_More
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_TooLate
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Finally
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Any
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Instead
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fantastic
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_status.s b/data/text/easy_chat/easy_chat_group_status.s
deleted file mode 100644
index db945423f..000000000
--- a/data/text/easy_chat/easy_chat_group_status.s
+++ /dev/null
@@ -1,764 +0,0 @@
-gEasyChatWord_Dark:: @ 8598234
-	.string "DARK$"
-
-gEasyChatWord_Stench:: @ 8598239
-	.string "STENCH$"
-
-gEasyChatWord_ThickFat:: @ 8598240
-	.string "THICK FAT$"
-
-gEasyChatWord_RainDish:: @ 859824A
-	.string "RAIN DISH$"
-
-gEasyChatWord_Drizzle:: @ 8598254
-	.string "DRIZZLE$"
-
-gEasyChatWord_ArenaTrap:: @ 859825C
-	.string "ARENA TRAP$"
-
-gEasyChatWord_Intimidate:: @ 8598267
-	.string "INTIMIDATE$"
-
-gEasyChatWord_RockHead:: @ 8598272
-	.string "ROCK HEAD$"
-
-gEasyChatWord_Color:: @ 859827C
-	.string "COLOR$"
-
-gEasyChatWord_AltColor:: @ 8598282
-	.string "ALT. COLOR$"
-
-gEasyChatWord_Rock:: @ 859828D
-	.string "ROCK$"
-
-gEasyChatWord_Beautiful:: @ 8598292
-	.string "BEAUTIFUL$"
-
-gEasyChatWord_Beauty:: @ 859829C
-	.string "BEAUTY$"
-
-gEasyChatWord_AirLock:: @ 85982A3
-	.string "AIR LOCK$"
-
-gEasyChatWord_Psychic:: @ 85982AC
-	.string "PSYCHIC$"
-
-gEasyChatWord_HyperCutter:: @ 85982B4
-	.string "HYPER CUTTER$"
-
-gEasyChatWord_Fighting:: @ 85982C1
-	.string "FIGHTING$"
-
-gEasyChatWord_ShadowTag:: @ 85982CA
-	.string "SHADOW TAG$"
-
-gEasyChatWord_Smart:: @ 85982D5
-	.string "SMART$"
-
-gEasyChatWord_Smartness:: @ 85982DB
-	.string "SMARTNESS$"
-
-gEasyChatWord_SpeedBoost:: @ 85982E5
-	.string "SPEED BOOST$"
-
-gEasyChatWord_Cool:: @ 85982F1
-	.string "COOL$"
-
-gEasyChatWord_Coolness:: @ 85982F6
-	.string "COOLNESS$"
-
-gEasyChatWord_BattleArmor:: @ 85982FF
-	.string "BATTLE ARMOR$"
-
-gEasyChatWord_Cute:: @ 859830C
-	.string "CUTE$"
-
-gEasyChatWord_Cuteness:: @ 8598311
-	.string "CUTENESS$"
-
-gEasyChatWord_Sturdy:: @ 859831A
-	.string "STURDY$"
-
-gEasyChatWord_SuctionCups:: @ 8598321
-	.string "SUCTION CUPS$"
-
-gEasyChatWord_Grass:: @ 859832E
-	.string "GRASS$"
-
-gEasyChatWord_ClearBody:: @ 8598334
-	.string "CLEAR BODY$"
-
-gEasyChatWord_Torrent:: @ 859833F
-	.string "TORRENT$"
-
-gEasyChatWord_Ghost:: @ 8598347
-	.string "GHOST$"
-
-gEasyChatWord_Ice:: @ 859834D
-	.string "ICE$"
-
-gEasyChatWord_Guts:: @ 8598351
-	.string "GUTS$"
-
-gEasyChatWord_RoughSkin:: @ 8598356
-	.string "ROUGH SKIN$"
-
-gEasyChatWord_ShellArmor:: @ 8598361
-	.string "SHELL ARMOR$"
-
-gEasyChatWord_NaturalCure:: @ 859836D
-	.string "NATURAL CURE$"
-
-gEasyChatWord_Damp:: @ 859837A
-	.string "DAMP$"
-
-gEasyChatWord_Ground:: @ 859837F
-	.string "GROUND$"
-
-gEasyChatWord_Limber:: @ 8598386
-	.string "LIMBER$"
-
-gEasyChatWord_MagnetPull:: @ 859838D
-	.string "MAGNET PULL$"
-
-gEasyChatWord_WhiteSmoke:: @ 8598399
-	.string "WHITE SMOKE$"
-
-gEasyChatWord_Synchronize:: @ 85983A5
-	.string "SYNCHRONIZE$"
-
-gEasyChatWord_Overgrow:: @ 85983B1
-	.string "OVERGROW$"
-
-gEasyChatWord_SwiftSwim:: @ 85983BA
-	.string "SWIFT SWIM$"
-
-gEasyChatWord_SandStream:: @ 85983C5
-	.string "SAND STREAM$"
-
-gEasyChatWord_SandVeil:: @ 85983D1
-	.string "SAND VEIL$"
-
-gEasyChatWord_KeenEye:: @ 85983DB
-	.string "KEEN EYE$"
-
-gEasyChatWord_InnerFocus:: @ 85983E4
-	.string "INNER FOCUS$"
-
-gEasyChatWord_Static:: @ 85983F0
-	.string "STATIC$"
-
-gEasyChatWord_Type:: @ 85983F7
-	.string "TYPE$"
-
-gEasyChatWord_Tough:: @ 85983FC
-	.string "TOUGH$"
-
-gEasyChatWord_Toughness:: @ 8598402
-	.string "TOUGHNESS$"
-
-gEasyChatWord_ShedSkin:: @ 859840C
-	.string "SHED SKIN$"
-
-gEasyChatWord_HugePower:: @ 8598416
-	.string "HUGE POWER$"
-
-gEasyChatWord_VoltAbsorb:: @ 8598421
-	.string "VOLT ABSORB$"
-
-gEasyChatWord_WaterAbsorb:: @ 859842D
-	.string "WATER ABSORB$"
-
-gEasyChatWord_Electric:: @ 859843A
-	.string "ELECTRIC$"
-
-gEasyChatWord_Forecast:: @ 8598443
-	.string "FORECAST$"
-
-gEasyChatWord_SereneGrace:: @ 859844C
-	.string "SERENE GRACE$"
-
-gEasyChatWord_Poison:: @ 8598459
-	.string "POISON$"
-
-gEasyChatWord_PoisonPoint:: @ 8598460
-	.string "POISON POINT$"
-
-gEasyChatWord_Dragon:: @ 859846D
-	.string "DRAGON$"
-
-gEasyChatWord_Trace:: @ 8598474
-	.string "TRACE$"
-
-gEasyChatWord_Oblivious:: @ 859847A
-	.string "OBLIVIOUS$"
-
-gEasyChatWord_Truant:: @ 8598484
-	.string "TRUANT$"
-
-gEasyChatWord_RunAway:: @ 859848B
-	.string "RUN AWAY$"
-
-gEasyChatWord_StickyHold:: @ 8598494
-	.string "STICKY HOLD$"
-
-gEasyChatWord_CloudNine:: @ 85984A0
-	.string "CLOUD NINE$"
-
-gEasyChatWord_Normal:: @ 85984AB
-	.string "NORMAL$"
-
-gEasyChatWord_Steel:: @ 85984B2
-	.string "STEEL$"
-
-gEasyChatWord_Illuminate:: @ 85984B8
-	.string "ILLUMINATE$"
-
-gEasyChatWord_EarlyBird:: @ 85984C3
-	.string "EARLY BIRD$"
-
-gEasyChatWord_Hustle:: @ 85984CE
-	.string "HUSTLE$"
-
-gEasyChatWord_Shine:: @ 85984D5
-	.string "SHINE$"
-
-gEasyChatWord_Flying:: @ 85984DB
-	.string "FLYING$"
-
-gEasyChatWord_Drought:: @ 85984E2
-	.string "DROUGHT$"
-
-gEasyChatWord_Lightningrod:: @ 85984EA
-	.string "LIGHTNINGROD$"
-
-gEasyChatWord_Compoundeyes:: @ 85984F7
-	.string "COMPOUNDEYES$"
-
-gEasyChatWord_MarvelScale:: @ 8598504
-	.string "MARVEL SCALE$"
-
-gEasyChatWord_WonderGuard:: @ 8598511
-	.string "WONDER GUARD$"
-
-gEasyChatWord_Insomnia:: @ 859851E
-	.string "INSOMNIA$"
-
-gEasyChatWord_Levitate:: @ 8598527
-	.string "LEVITATE$"
-
-gEasyChatWord_Plus:: @ 8598530
-	.string "PLUS$"
-
-gEasyChatWord_Pressure:: @ 8598535
-	.string "PRESSURE$"
-
-gEasyChatWord_LiquidOoze:: @ 859853E
-	.string "LIQUID OOZE$"
-
-gEasyChatWord_ColorChange:: @ 859854A
-	.string "COLOR CHANGE$"
-
-gEasyChatWord_Soundproof:: @ 8598557
-	.string "SOUNDPROOF$"
-
-gEasyChatWord_EffectSpore:: @ 8598562
-	.string "EFFECT SPORE$"
-
-gEasyChatWord_Pkrs:: @ 859856F
-	.string "{PK}RS$"
-
-gEasyChatWord_Fire:: @ 8598573
-	.string "FIRE$"
-
-gEasyChatWord_FlameBody:: @ 8598578
-	.string "FLAME BODY$"
-
-gEasyChatWord_Minus:: @ 8598583
-	.string "MINUS$"
-
-gEasyChatWord_OwnTempo:: @ 8598589
-	.string "OWN TEMPO$"
-
-gEasyChatWord_MagmaArmor:: @ 8598593
-	.string "MAGMA ARMOR$"
-
-gEasyChatWord_Water:: @ 859859F
-	.string "WATER$"
-
-gEasyChatWord_WaterVeil:: @ 85985A5
-	.string "WATER VEIL$"
-
-gEasyChatWord_Bug:: @ 85985B0
-	.string "BUG$"
-
-gEasyChatWord_Swarm:: @ 85985B4
-	.string "SWARM$"
-
-gEasyChatWord_CuteCharm:: @ 85985BA
-	.string "CUTE CHARM$"
-
-gEasyChatWord_Immunity:: @ 85985C5
-	.string "IMMUNITY$"
-
-gEasyChatWord_Blaze:: @ 85985CE
-	.string "BLAZE$"
-
-gEasyChatWord_Pickup:: @ 85985D4
-	.string "PICKUP$"
-
-gEasyChatWord_Pattern:: @ 85985DB
-	.string "PATTERN$"
-
-gEasyChatWord_FlashFire:: @ 85985E3
-	.string "FLASH FIRE$"
-
-gEasyChatWord_VitalSpirit:: @ 85985EE
-	.string "VITAL SPIRIT$"
-
-gEasyChatWord_Chlorophyll:: @ 85985FB
-	.string "CHLOROPHYLL$"
-
-gEasyChatWord_PurePower:: @ 8598607
-	.string "PURE POWER$"
-
-gEasyChatWord_ShieldDust:: @ 8598612
-	.string "SHIELD DUST$"
-
-	.align 2
-gEasyChatGroup_Status:: @ 8598620
-	.4byte gEasyChatWord_Dark
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Stench
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ThickFat
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_RainDish
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Drizzle
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ArenaTrap
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Intimidate
-	.4byte 101 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_RockHead
-	.4byte 97 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Color
-	.4byte 106 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_AltColor
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Rock
-	.4byte 68 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Beautiful
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Beauty
-	.4byte 86 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_AirLock
-	.4byte 78 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Psychic
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HyperCutter
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fighting
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ShadowTag
-	.4byte 99 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Smart
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Smartness
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SpeedBoost
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cool
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Coolness
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_BattleArmor
-	.4byte 76 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cute
-	.4byte 72 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cuteness
-	.4byte 88 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sturdy
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SuctionCups
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Grass
-	.4byte 90 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ClearBody
-	.4byte 91 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Torrent
-	.4byte 104 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ghost
-	.4byte 75 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ice
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Guts
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_RoughSkin
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ShellArmor
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_NaturalCure
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Damp
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ground
-	.4byte 73 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Limber
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_MagnetPull
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WhiteSmoke
-	.4byte 71 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Synchronize
-	.4byte 100 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Overgrow
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SwiftSwim
-	.4byte 81 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SandStream
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SandVeil
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_KeenEye
-	.4byte 82 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_InnerFocus
-	.4byte 77 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Static
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Type
-	.4byte 85 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tough
-	.4byte 94 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Toughness
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ShedSkin
-	.4byte 79 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HugePower
-	.4byte 92 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_VoltAbsorb
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WaterAbsorb
-	.4byte 69 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Electric
-	.4byte 64 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Forecast
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SereneGrace
-	.4byte 93 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Poison
-	.4byte 103 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_PoisonPoint
-	.4byte 102 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dragon
-	.4byte 89 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Trace
-	.4byte 83 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Oblivious
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Truant
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_RunAway
-	.4byte 84 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_StickyHold
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_CloudNine
-	.4byte 107 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Normal
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Steel
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Illuminate
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_EarlyBird
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hustle
-	.4byte 66 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shine
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Flying
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Drought
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lightningrod
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Compoundeyes
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_MarvelScale
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WonderGuard
-	.4byte 108 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Insomnia
-	.4byte 74 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Levitate
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Plus
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pressure
-	.4byte 87 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_LiquidOoze
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ColorChange
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Soundproof
-	.4byte 70 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_EffectSpore
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pkrs
-	.4byte 67 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fire
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_FlameBody
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Minus
-	.4byte 98 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_OwnTempo
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_MagmaArmor
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Water
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WaterVeil
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Bug
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Swarm
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_CuteCharm
-	.4byte 63 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Immunity
-	.4byte 65 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Blaze
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pickup
-	.4byte 105 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pattern
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_FlashFire
-	.4byte 95 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_VitalSpirit
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Chlorophyll
-	.4byte 96 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_PurePower
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ShieldDust
-	.4byte 80 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_time.s b/data/text/easy_chat/easy_chat_group_time.s
deleted file mode 100644
index 1604eaf50..000000000
--- a/data/text/easy_chat/easy_chat_group_time.s
+++ /dev/null
@@ -1,316 +0,0 @@
-gEasyChatWord_Fall:: @ 859BD64
-	.string "FALL$"
-
-gEasyChatWord_Morning:: @ 859BD69
-	.string "MORNING$"
-
-gEasyChatWord_Tomorrow:: @ 859BD71
-	.string "TOMORROW$"
-
-gEasyChatWord_Last:: @ 859BD7A
-	.string "LAST$"
-
-gEasyChatWord_Day:: @ 859BD7F
-	.string "DAY$"
-
-gEasyChatWord_Sometime:: @ 859BD83
-	.string "SOMETIME$"
-
-gEasyChatWord_Always:: @ 859BD8C
-	.string "ALWAYS$"
-
-gEasyChatWord_Current:: @ 859BD93
-	.string "CURRENT$"
-
-gEasyChatWord_Forever:: @ 859BD9B
-	.string "FOREVER$"
-
-gEasyChatWord_Days:: @ 859BDA3
-	.string "DAYS$"
-
-gEasyChatWord_End:: @ 859BDA8
-	.string "END$"
-
-gEasyChatWord_Tuesday:: @ 859BDAC
-	.string "TUESDAY$"
-
-gEasyChatWord_Yesterday:: @ 859BDB4
-	.string "YESTERDAY$"
-
-gEasyChatWord_Today:: @ 859BDBE
-	.string "TODAY$"
-
-gEasyChatWord_Friday:: @ 859BDC4
-	.string "FRIDAY$"
-
-gEasyChatWord_Monday:: @ 859BDCB
-	.string "MONDAY$"
-
-gEasyChatWord_Later:: @ 859BDD2
-	.string "LATER$"
-
-gEasyChatWord_Earlier:: @ 859BDD8
-	.string "EARLIER$"
-
-gEasyChatWord_Another:: @ 859BDE0
-	.string "ANOTHER$"
-
-gEasyChatWord_Time:: @ 859BDE8
-	.string "TIME$"
-
-gEasyChatWord_Finish:: @ 859BDED
-	.string "FINISH$"
-
-gEasyChatWord_Wednesday:: @ 859BDF4
-	.string "WEDNESDAY$"
-
-gEasyChatWord_Soon:: @ 859BDFE
-	.string "SOON$"
-
-gEasyChatWord_Start:: @ 859BE03
-	.string "START$"
-
-gEasyChatWord_Month:: @ 859BE09
-	.string "MONTH$"
-
-gEasyChatWord_Stop:: @ 859BE0F
-	.string "STOP$"
-
-gEasyChatWord_Now:: @ 859BE14
-	.string "NOW$"
-
-gEasyChatWord_Final:: @ 859BE18
-	.string "FINAL$"
-
-gEasyChatWord_Next:: @ 859BE1E
-	.string "NEXT$"
-
-gEasyChatWord_Age:: @ 859BE23
-	.string "AGE$"
-
-gEasyChatWord_Saturday:: @ 859BE27
-	.string "SATURDAY$"
-
-gEasyChatWord_Summer:: @ 859BE30
-	.string "SUMMER$"
-
-gEasyChatWord_Sunday:: @ 859BE37
-	.string "SUNDAY$"
-
-gEasyChatWord_Beginning:: @ 859BE3E
-	.string "BEGINNING$"
-
-gEasyChatWord_Spring:: @ 859BE48
-	.string "SPRING$"
-
-gEasyChatWord_Daytime:: @ 859BE4F
-	.string "DAYTIME$"
-
-gEasyChatWord_Winter:: @ 859BE57
-	.string "WINTER$"
-
-gEasyChatWord_Daily:: @ 859BE5E
-	.string "DAILY$"
-
-gEasyChatWord_Olden:: @ 859BE64
-	.string "OLDEN$"
-
-gEasyChatWord_Almost:: @ 859BE6A
-	.string "ALMOST$"
-
-gEasyChatWord_Nearly:: @ 859BE71
-	.string "NEARLY$"
-
-gEasyChatWord_Thursday:: @ 859BE78
-	.string "THURSDAY$"
-
-gEasyChatWord_Nighttime:: @ 859BE81
-	.string "NIGHTTIME$"
-
-gEasyChatWord_Night:: @ 859BE8B
-	.string "NIGHT$"
-
-gEasyChatWord_Week:: @ 859BE91
-	.string "WEEK$"
-
-	.align 2
-gEasyChatGroup_Time:: @ 859BE98
-	.4byte gEasyChatWord_Fall
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Morning
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tomorrow
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Last
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Day
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sometime
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Always
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Current
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Forever
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Days
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_End
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tuesday
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yesterday
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Today
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Friday
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Monday
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Later
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Earlier
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Another
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Time
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Finish
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wednesday
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Soon
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Start
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Month
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Stop
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Now
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Final
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Next
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Age
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Saturday
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Summer
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sunday
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Beginning
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Spring
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Daytime
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Winter
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Daily
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Olden
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Almost
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nearly
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Thursday
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nighttime
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Night
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Week
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_trainer.s b/data/text/easy_chat/easy_chat_group_trainer.s
deleted file mode 100644
index 23a3b0b6a..000000000
--- a/data/text/easy_chat/easy_chat_group_trainer.s
+++ /dev/null
@@ -1,190 +0,0 @@
-gEasyChatWord_IChooseYou:: @ 8598030
-	.string "I CHOOSE YOU$"
-
-gEasyChatWord_Gotcha:: @ 859803D
-	.string "GOTCHA$"
-
-gEasyChatWord_Trade:: @ 8598044
-	.string "TRADE$"
-
-gEasyChatWord_Sapphire:: @ 859804A
-	.string "SAPPHIRE$"
-
-gEasyChatWord_Evolve:: @ 8598053
-	.string "EVOLVE$"
-
-gEasyChatWord_Encyclopedia:: @ 859805A
-	.string "ENCYCLOPEDIA$"
-
-gEasyChatWord_Nature:: @ 8598067
-	.string "NATURE$"
-
-gEasyChatWord_Center:: @ 859806E
-	.string "CENTER$"
-
-gEasyChatWord_Egg:: @ 8598075
-	.string "EGG$"
-
-gEasyChatWord_Link:: @ 8598079
-	.string "LINK$"
-
-gEasyChatWord_SpAbility:: @ 859807E
-	.string "SP. ABILITY$"
-
-gEasyChatWord_Trainer:: @ 859808A
-	.string "TRAINER$"
-
-gEasyChatWord_Version:: @ 8598092
-	.string "VERSION$"
-
-gEasyChatWord_Pokenav:: @ 859809A
-	.string "POKéNAV$"
-
-gEasyChatWord_Pokemon:: @ 85980A2
-	.string "POKéMON$"
-
-gEasyChatWord_Get:: @ 85980AA
-	.string "GET$"
-
-gEasyChatWord_Pokedex:: @ 85980AE
-	.string "POKéDEX$"
-
-gEasyChatWord_Ruby:: @ 85980B6
-	.string "RUBY$"
-
-gEasyChatWord_Level:: @ 85980BB
-	.string "LEVEL$"
-
-gEasyChatWord_Red:: @ 85980C1
-	.string "RED$"
-
-gEasyChatWord_Green:: @ 85980C5
-	.string "GREEN$"
-
-gEasyChatWord_Bag:: @ 85980CB
-	.string "BAG$"
-
-gEasyChatWord_Flame:: @ 85980CF
-	.string "FLAME$"
-
-gEasyChatWord_Gold:: @ 85980D5
-	.string "GOLD$"
-
-gEasyChatWord_Leaf:: @ 85980DA
-	.string "LEAF$"
-
-gEasyChatWord_Silver:: @ 85980DF
-	.string "SILVER$"
-
-gEasyChatWord_Emerald:: @ 85980E6
-	.string "EMERALD$"
-
-	.align 2
-gEasyChatGroup_Trainer:: @ 85980F0
-	.4byte gEasyChatWord_IChooseYou
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gotcha
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Trade
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sapphire
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Evolve
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Encyclopedia
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nature
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Center
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Egg
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Link
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SpAbility
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Trainer
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Version
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pokenav
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pokemon
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Get
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Pokedex
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ruby
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Level
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Red
-	.4byte 19 @ alphabetical order
-	.4byte FALSE @ enabled
-
-	.4byte gEasyChatWord_Green
-	.4byte 17 @ alphabetical order
-	.4byte FALSE @ enabled
-
-	.4byte gEasyChatWord_Bag
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Flame
-	.4byte 25 @ alphabetical order
-	.4byte FALSE @ enabled
-
-	.4byte gEasyChatWord_Gold
-	.4byte 10 @ alphabetical order
-	.4byte FALSE @ enabled
-
-	.4byte gEasyChatWord_Leaf
-	.4byte 2 @ alphabetical order
-	.4byte FALSE @ enabled
-
-	.4byte gEasyChatWord_Silver
-	.4byte 11 @ alphabetical order
-	.4byte FALSE @ enabled
-
-	.4byte gEasyChatWord_Emerald
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_trendy_saying.s b/data/text/easy_chat/easy_chat_group_trendy_saying.s
deleted file mode 100644
index 3e9f7291e..000000000
--- a/data/text/easy_chat/easy_chat_group_trendy_saying.s
+++ /dev/null
@@ -1,232 +0,0 @@
-gEasyChatWord_KthxBye:: @ 859CB88
-	.string "KTHX, BYE.$"
-
-gEasyChatWord_YesSirExcl:: @ 859CB93
-	.string "YES, SIR!$"
-
-gEasyChatWord_AvantGarde:: @ 859CB9D
-	.string "AVANT GARDE$"
-
-gEasyChatWord_Couple:: @ 859CBA9
-	.string "COUPLE$"
-
-gEasyChatWord_MuchObliged:: @ 859CBB0
-	.string "MUCH OBLIGED$"
-
-gEasyChatWord_YeehawExcl:: @ 859CBBD
-	.string "YEEHAW!$"
-
-gEasyChatWord_Mega:: @ 859CBC5
-	.string "MEGA$"
-
-gEasyChatWord_1HitKOExcl:: @ 859CBCA
-	.string "1-HIT KO!$"
-
-gEasyChatWord_Destiny:: @ 859CBD4
-	.string "DESTINY$"
-
-gEasyChatWord_Cancel:: @ 859CBDC
-	.string "CANCEL$"
-
-gEasyChatWord_New:: @ 859CBE3
-	.string "NEW$"
-
-gEasyChatWord_Flatten:: @ 859CBE7
-	.string "FLATTEN$"
-
-gEasyChatWord_Kidding:: @ 859CBEF
-	.string "KIDDING$"
-
-gEasyChatWord_Loser:: @ 859CBF7
-	.string "LOSER$"
-
-gEasyChatWord_Losing:: @ 859CBFD
-	.string "LOSING$"
-
-gEasyChatWord_Happening:: @ 859CC04
-	.string "HAPPENING$"
-
-gEasyChatWord_HipAnd:: @ 859CC0E
-	.string "HIP AND$"
-
-gEasyChatWord_Shake:: @ 859CC16
-	.string "SHAKE$"
-
-gEasyChatWord_Shady:: @ 859CC1C
-	.string "SHADY$"
-
-gEasyChatWord_Upbeat:: @ 859CC22
-	.string "UPBEAT$"
-
-gEasyChatWord_Modern:: @ 859CC29
-	.string "MODERN$"
-
-gEasyChatWord_SmellYa:: @ 859CC30
-	.string "SMELL YA$"
-
-gEasyChatWord_Bang:: @ 859CC39
-	.string "BANG$"
-
-gEasyChatWord_Knockout:: @ 859CC3E
-	.string "KNOCKOUT$"
-
-gEasyChatWord_Hassle:: @ 859CC47
-	.string "HASSLE$"
-
-gEasyChatWord_Winner:: @ 859CC4E
-	.string "WINNER$"
-
-gEasyChatWord_Fever:: @ 859CC55
-	.string "FEVER$"
-
-gEasyChatWord_Wannabe:: @ 859CC5B
-	.string "WANNABE$"
-
-gEasyChatWord_Baby:: @ 859CC63
-	.string "BABY$"
-
-gEasyChatWord_Heart:: @ 859CC68
-	.string "HEART$"
-
-gEasyChatWord_Old:: @ 859CC6E
-	.string "OLD$"
-
-gEasyChatWord_Young:: @ 859CC72
-	.string "YOUNG$"
-
-gEasyChatWord_Ugly:: @ 859CC78
-	.string "UGLY$"
-
-	.align 2
-gEasyChatGroup_TrendySaying:: @ 859CC80
-	.4byte gEasyChatWord_KthxBye
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_YesSirExcl
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_AvantGarde
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Couple
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_MuchObliged
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_YeehawExcl
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mega
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_1HitKOExcl
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Destiny
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cancel
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_New
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Flatten
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Kidding
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Loser
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Losing
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Happening
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_HipAnd
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shake
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shady
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Upbeat
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Modern
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_SmellYa
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Bang
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Knockout
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hassle
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Winner
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fever
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wannabe
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Baby
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Heart
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Old
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Young
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ugly
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_voices.s b/data/text/easy_chat/easy_chat_group_voices.s
deleted file mode 100644
index 548576fd3..000000000
--- a/data/text/easy_chat/easy_chat_group_voices.s
+++ /dev/null
@@ -1,442 +0,0 @@
-gEasyChatWord_Excl:: @ 8599890
-	.string "!$"
-
-gEasyChatWord_ExclExcl:: @ 8599892
-	.string "!!$"
-
-gEasyChatWord_QuesExcl:: @ 8599895
-	.string "?!$"
-
-gEasyChatWord_Ques:: @ 8599898
-	.string "?$"
-
-gEasyChatWord_Ellipsis:: @ 859989A
-	.string "…$"
-
-gEasyChatWord_EllipsisExcl:: @ 859989C
-	.string "…!$"
-
-gEasyChatWord_EllipsisEllipsisEllipsis:: @ 859989F
-	.string "………$"
-
-gEasyChatWord_Dash:: @ 85998A3
-	.string "-$"
-
-gEasyChatWord_DashDashDash:: @ 85998A5
-	.string "- - -$"
-
-gEasyChatWord_UhOh:: @ 85998AB
-	.string "UH-OH$"
-
-gEasyChatWord_Waaah:: @ 85998B1
-	.string "WAAAH$"
-
-gEasyChatWord_Ahaha:: @ 85998B7
-	.string "AHAHA$"
-
-gEasyChatWord_OhQues:: @ 85998BD
-	.string "OH?$"
-
-gEasyChatWord_Nope:: @ 85998C1
-	.string "NOPE$"
-
-gEasyChatWord_Urgh:: @ 85998C6
-	.string "URGH$"
-
-gEasyChatWord_Hmm:: @ 85998CB
-	.string "HMM$"
-
-gEasyChatWord_Whoah:: @ 85998CF
-	.string "WHOAH$"
-
-gEasyChatWord_WroooaarExcl:: @ 85998D5
-	.string "WROOOAAR!$"
-
-gEasyChatWord_Wow:: @ 85998DF
-	.string "WOW$"
-
-gEasyChatWord_Giggle:: @ 85998E3
-	.string "GIGGLE$"
-
-gEasyChatWord_Sigh:: @ 85998EA
-	.string "SIGH$"
-
-gEasyChatWord_Unbelievable:: @ 85998EF
-	.string "UNBELIEVABLE$"
-
-gEasyChatWord_Cries:: @ 85998FC
-	.string "CRIES$"
-
-gEasyChatWord_Agree:: @ 8599902
-	.string "AGREE$"
-
-gEasyChatWord_EhQues:: @ 8599908
-	.string "EH?$"
-
-gEasyChatWord_Cry:: @ 859990C
-	.string "CRY$"
-
-gEasyChatWord_Ehehe:: @ 8599910
-	.string "EHEHE$"
-
-gEasyChatWord_OiOiOi:: @ 8599916
-	.string "OI, OI, OI$"
-
-gEasyChatWord_OhYeah:: @ 8599921
-	.string "OH, YEAH$"
-
-gEasyChatWord_Oh:: @ 859992A
-	.string "OH$"
-
-gEasyChatWord_Oops:: @ 859992D
-	.string "OOPS$"
-
-gEasyChatWord_Shocked:: @ 8599932
-	.string "SHOCKED$"
-
-gEasyChatWord_Eek:: @ 859993A
-	.string "EEK$"
-
-gEasyChatWord_Graaah:: @ 859993E
-	.string "GRAAAH$"
-
-gEasyChatWord_Gwahahaha:: @ 8599945
-	.string "GWAHAHAHA$"
-
-gEasyChatWord_Way:: @ 859994F
-	.string "WAY$"
-
-gEasyChatWord_Tch:: @ 8599953
-	.string "TCH$"
-
-gEasyChatWord_Hehe:: @ 8599957
-	.string "HEHE$"
-
-gEasyChatWord_Hah:: @ 859995C
-	.string "HAH$"
-
-gEasyChatWord_Yup:: @ 8599960
-	.string "YUP$"
-
-gEasyChatWord_Hahaha:: @ 8599964
-	.string "HAHAHA$"
-
-gEasyChatWord_Aiyeeh:: @ 859996B
-	.string "AIYEEH$"
-
-gEasyChatWord_Hiyah:: @ 8599972
-	.string "HIYAH$"
-
-gEasyChatWord_Fufufu:: @ 8599978
-	.string "FUFUFU$"
-
-gEasyChatWord_Lol:: @ 859997F
-	.string "LOL$"
-
-gEasyChatWord_Snort:: @ 8599983
-	.string "SNORT$"
-
-gEasyChatWord_Humph:: @ 8599989
-	.string "HUMPH$"
-
-gEasyChatWord_Hehehe:: @ 859998F
-	.string "HEHEHE$"
-
-gEasyChatWord_Heh:: @ 8599996
-	.string "HEH$"
-
-gEasyChatWord_Hohoho:: @ 859999A
-	.string "HOHOHO$"
-
-gEasyChatWord_UhHuh:: @ 85999A1
-	.string "UH-HUH$"
-
-gEasyChatWord_OhDear:: @ 85999A8
-	.string "OH, DEAR$"
-
-gEasyChatWord_Arrgh:: @ 85999B1
-	.string "ARRGH$"
-
-gEasyChatWord_Mufufu:: @ 85999B7
-	.string "MUFUFU$"
-
-gEasyChatWord_Mmm:: @ 85999BE
-	.string "MMM$"
-
-gEasyChatWord_OhKay:: @ 85999C2
-	.string "OH-KAY$"
-
-gEasyChatWord_Okay:: @ 85999C9
-	.string "OKAY$"
-
-gEasyChatWord_Lalala:: @ 85999CE
-	.string "LALALA$"
-
-gEasyChatWord_Yay:: @ 85999D5
-	.string "YAY$"
-
-gEasyChatWord_Aww:: @ 85999D9
-	.string "AWW$"
-
-gEasyChatWord_Wowee:: @ 85999DD
-	.string "WOWEE$"
-
-gEasyChatWord_Gwah:: @ 85999E3
-	.string "GWAH$"
-
-gEasyChatWord_Wahahaha:: @ 85999E8
-	.string "WAHAHAHA$"
-
-	.align 2
-gEasyChatGroup_Voices:: @ 85999F4
-	.4byte gEasyChatWord_Excl
-	.4byte 0 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_ExclExcl
-	.4byte 1 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_QuesExcl
-	.4byte 7 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ques
-	.4byte 8 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ellipsis
-	.4byte 4 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_EllipsisExcl
-	.4byte 5 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_EllipsisEllipsisEllipsis
-	.4byte 6 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Dash
-	.4byte 3 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_DashDashDash
-	.4byte 2 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_UhOh
-	.4byte 23 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Waaah
-	.4byte 11 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ahaha
-	.4byte 41 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_OhQues
-	.4byte 52 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Nope
-	.4byte 59 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Urgh
-	.4byte 22 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hmm
-	.4byte 25 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Whoah
-	.4byte 32 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_WroooaarExcl
-	.4byte 24 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wow
-	.4byte 26 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Giggle
-	.4byte 43 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Sigh
-	.4byte 19 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Unbelievable
-	.4byte 33 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cries
-	.4byte 61 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Agree
-	.4byte 34 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_EhQues
-	.4byte 38 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Cry
-	.4byte 40 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Ehehe
-	.4byte 48 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_OiOiOi
-	.4byte 37 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_OhYeah
-	.4byte 47 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Oh
-	.4byte 42 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Oops
-	.4byte 15 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Shocked
-	.4byte 49 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Eek
-	.4byte 46 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Graaah
-	.4byte 57 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gwahahaha
-	.4byte 44 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Way
-	.4byte 54 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Tch
-	.4byte 53 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hehe
-	.4byte 13 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hah
-	.4byte 29 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yup
-	.4byte 51 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hahaha
-	.4byte 28 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Aiyeeh
-	.4byte 55 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hiyah
-	.4byte 12 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Fufufu
-	.4byte 27 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lol
-	.4byte 56 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Snort
-	.4byte 30 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Humph
-	.4byte 31 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hehehe
-	.4byte 20 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Heh
-	.4byte 45 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Hohoho
-	.4byte 36 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_UhHuh
-	.4byte 50 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_OhDear
-	.4byte 9 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Arrgh
-	.4byte 21 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mufufu
-	.4byte 14 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Mmm
-	.4byte 10 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_OhKay
-	.4byte 62 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Okay
-	.4byte 35 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Lalala
-	.4byte 16 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Yay
-	.4byte 18 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Aww
-	.4byte 60 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wowee
-	.4byte 17 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Gwah
-	.4byte 58 @ alphabetical order
-	.4byte TRUE @ enabled
-
-	.4byte gEasyChatWord_Wahahaha
-	.4byte 39 @ alphabetical order
-	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_groups.inc b/data/text/easy_chat/easy_chat_groups.inc
deleted file mode 100644
index 94636c7fe..000000000
--- a/data/text/easy_chat/easy_chat_groups.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-	.include "data/text/easy_chat/easy_chat_group_pokemon.s"
-	.include "data/text/easy_chat/easy_chat_group_trainer.s"
-	.include "data/text/easy_chat/easy_chat_group_status.s"
-	.include "data/text/easy_chat/easy_chat_group_battle.s"
-	.include "data/text/easy_chat/easy_chat_group_greetings.s"
-	.include "data/text/easy_chat/easy_chat_group_people.s"
-	.include "data/text/easy_chat/easy_chat_group_voices.s"
-	.include "data/text/easy_chat/easy_chat_group_speech.s"
-	.include "data/text/easy_chat/easy_chat_group_endings.s"
-	.include "data/text/easy_chat/easy_chat_group_feelings.s"
-	.include "data/text/easy_chat/easy_chat_group_conditions.s"
-	.include "data/text/easy_chat/easy_chat_group_actions.s"
-	.include "data/text/easy_chat/easy_chat_group_lifestyle.s"
-	.include "data/text/easy_chat/easy_chat_group_hobbies.s"
-	.include "data/text/easy_chat/easy_chat_group_time.s"
-	.include "data/text/easy_chat/easy_chat_group_misc.s"
-	.include "data/text/easy_chat/easy_chat_group_adjectives.s"
-	.include "data/text/easy_chat/easy_chat_group_events.s"
-	.include "data/text/easy_chat/easy_chat_group_move_1.s"
-	.include "data/text/easy_chat/easy_chat_group_move_2.s"
-	.include "data/text/easy_chat/easy_chat_group_trendy_saying.s"
-	.include "data/text/easy_chat/easy_chat_group_pokemon2.s"
-
-	.align 2
-gEasyChatGroups:: @ 859D004
-	.4byte gEasyChatGroup_Pokemon
-	.2byte 202 @ total number of entries
-	.2byte 202 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Trainer
-	.2byte 27 @ total number of entries
-	.2byte 21 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Status
-	.2byte 109 @ total number of entries
-	.2byte 109 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Battle
-	.2byte 63 @ total number of entries
-	.2byte 63 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Greetings
-	.2byte 42 @ total number of entries
-	.2byte 42 @ number of enabled entries
-
-	.4byte gEasyChatGroup_People
-	.2byte 75 @ total number of entries
-	.2byte 75 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Voices
-	.2byte 63 @ total number of entries
-	.2byte 63 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Speech
-	.2byte 60 @ total number of entries
-	.2byte 60 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Endings
-	.2byte 69 @ total number of entries
-	.2byte 69 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Feelings
-	.2byte 69 @ total number of entries
-	.2byte 69 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Conditions
-	.2byte 69 @ total number of entries
-	.2byte 69 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Actions
-	.2byte 78 @ total number of entries
-	.2byte 78 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Lifestyle
-	.2byte 45 @ total number of entries
-	.2byte 45 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Hobbies
-	.2byte 54 @ total number of entries
-	.2byte 54 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Time
-	.2byte 45 @ total number of entries
-	.2byte 45 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Misc
-	.2byte 42 @ total number of entries
-	.2byte 42 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Adjectives
-	.2byte 36 @ total number of entries
-	.2byte 36 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Events
-	.2byte 29 @ total number of entries
-	.2byte 29 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Move1
-	.2byte 154 @ total number of entries
-	.2byte 154 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Move2
-	.2byte 200 @ total number of entries
-	.2byte 200 @ number of enabled entries
-
-	.4byte gEasyChatGroup_TrendySaying
-	.2byte 33 @ total number of entries
-	.2byte 33 @ number of enabled entries
-
-	.4byte gEasyChatGroup_Pokemon2
-	.2byte 251 @ total number of entries
-	.2byte 251 @ number of enabled entries
diff --git a/data/text/easy_chat/easy_chat_words_by_letter.inc b/data/text/easy_chat/easy_chat_words_by_letter.inc
deleted file mode 100644
index bce4be347..000000000
--- a/data/text/easy_chat/easy_chat_words_by_letter.inc
+++ /dev/null
@@ -1,2656 +0,0 @@
-gEasyChatWordsByLetter_Others:: @ 859D0B4
-	.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:: @ 859D0C8
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(AZUMARILL)
-	.2byte EC_POKEMON2(AZUMARILL)
-	.2byte EC_POKEMON(AZURILL)
-
-gEasyChatWordsByLetter_B:: @ 859D19C
-	.2byte EC_WORD_BABE
-	.2byte EC_WORD_BABY
-	.2byte EC_WORD_BACK
-	.2byte EC_WORD_BAD
-	.2byte EC_WORD_BADLY
-	.2byte EC_WORD_BAG
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_MOVE2(BLAST_BURN)
-	.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:: @ 859D248
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(CROBAT)
-	.2byte EC_POKEMON2(CROBAT)
-	.2byte EC_POKEMON2(CROCONAW)
-	.2byte EC_MOVE(CROSS_CHOP)
-	.2byte EC_MOVE(CRUNCH)
-	.2byte EC_WORD_CRUSH
-	.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:: @ 859D336
-	.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_WORD_DIRECT
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(DODRIO)
-	.2byte EC_POKEMON2(DODRIO)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(DONPHAN)
-	.2byte EC_POKEMON2(DONPHAN)
-	.2byte EC_MOVE2(DOOM_DESIRE)
-	.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:: @ 859D3F2
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(ELECTRODE)
-	.2byte EC_POKEMON2(ELECTRODE)
-	.2byte EC_POKEMON2(ELEKID)
-	.2byte EC_WORD_ELSE
-	.2byte EC_MOVE2(EMBER)
-	.2byte EC_WORD_EMERALD
-	.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:: @ 859D468
-	.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
-	.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_MOVE2(FRENZY_PLANT)
-	.2byte EC_WORD_FRIDAY
-	.2byte EC_WORD_FRIEND
-	.2byte EC_WORD_FROM
-	.2byte EC_WORD_FRONT
-	.2byte EC_WORD_FRONTIER
-	.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:: @ 859D508
-	.2byte EC_WORD_GAME
-	.2byte EC_POKEMON(GARDEVOIR)
-	.2byte EC_POKEMON2(GASTLY)
-	.2byte EC_POKEMON2(GENGAR)
-	.2byte EC_WORD_GENIUS
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(GOLBAT)
-	.2byte EC_POKEMON2(GOLBAT)
-	.2byte EC_WORD_GOLD
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(GOLDEEN)
-	.2byte EC_POKEMON2(GOLDEEN)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(GOLDUCK)
-	.2byte EC_POKEMON2(GOLDUCK)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(GRAVELER)
-	.2byte EC_POKEMON2(GRAVELER)
-	.2byte EC_WORD_GREAT
-	.2byte EC_WORD_GREEN
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(GYARADOS)
-	.2byte EC_POKEMON2(GYARADOS)
-
-gEasyChatWordsByLetter_H:: @ 859D5CC
-	.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 -1, 2 @ doubled Pokémon species names
-	.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_HERS
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_CANNON)
-	.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:: @ 859D696
-	.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_MOVE2(ICICLE_SPEAR)
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859D6F6
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859D710
-	.2byte EC_POKEMON2(KABUTO)
-	.2byte EC_POKEMON2(KABUTOPS)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(KOFFING)
-	.2byte EC_POKEMON2(KOFFING)
-	.2byte EC_POKEMON2(KRABBY)
-	.2byte EC_WORD_KTHX_BYE
-	.2byte EC_POKEMON(KYOGRE)
-
-gEasyChatWordsByLetter_L:: @ 859D752
-	.2byte EC_WORD_LACKING
-	.2byte EC_WORD_LACKS
-	.2byte EC_WORD_LADY
-	.2byte EC_POKEMON(LAIRON)
-	.2byte EC_WORD_LALALA
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_WORD_LEAF
-	.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:: @ 859D7F6
-	.2byte EC_MOVE2(MACH_PUNCH)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(MACHAMP)
-	.2byte EC_POKEMON2(MACHAMP)
-	.2byte EC_WORD_MACHINE
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(MACHOKE)
-	.2byte EC_POKEMON2(MACHOKE)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(MACHOP)
-	.2byte EC_POKEMON2(MACHOP)
-	.2byte EC_WORD_MAGAZINE
-	.2byte EC_POKEMON2(MAGBY)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(MAGCARGO)
-	.2byte EC_POKEMON2(MAGCARGO)
-	.2byte EC_MOVE2(MAGIC_COAT)
-	.2byte EC_MOVE2(MAGICAL_LEAF)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(MAGIKARP)
-	.2byte EC_POKEMON2(MAGIKARP)
-	.2byte EC_WORD_MAGMA_ARMOR
-	.2byte EC_POKEMON2(MAGMAR)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(MAGNEMITE)
-	.2byte EC_POKEMON2(MAGNEMITE)
-	.2byte EC_WORD_MAGNET_PULL
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859D912
-	.2byte EC_WORD_NAME
-	.2byte EC_WORD_NAP
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859D97E
-	.2byte EC_WORD_OBLIVIOUS
-	.2byte EC_MOVE(OCTAZOOKA)
-	.2byte EC_POKEMON2(OCTILLERY)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859D9D6
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(PHANPY)
-	.2byte EC_POKEMON2(PHANPY)
-	.2byte EC_WORD_PHONE
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(PICHU)
-	.2byte EC_POKEMON2(PICHU)
-	.2byte EC_WORD_PICKUP
-	.2byte EC_POKEMON2(PIDGEOT)
-	.2byte EC_POKEMON2(PIDGEOTTO)
-	.2byte EC_POKEMON2(PIDGEY)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(PIKACHU)
-	.2byte EC_POKEMON2(PIKACHU)
-	.2byte EC_POKEMON2(PILOSWINE)
-	.2byte EC_MOVE2(PIN_MISSILE)
-	.2byte EC_POKEMON2(PINECO)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_WORD_PSYCHIC
-	.2byte EC_MOVE(PSYCHIC)
-	.2byte EC_MOVE(PSYCHO_BOOST)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859DAA2
-	.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:: @ 859DAAE
-	.2byte EC_WORD_RADIO
-	.2byte EC_MOVE(RAGE)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_WORD_RED
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(RHYDON)
-	.2byte EC_POKEMON2(RHYDON)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_WORD_ROOM
-	.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:: @ 859DB4E
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(SANDSHREW)
-	.2byte EC_POKEMON2(SANDSHREW)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(SEADRA)
-	.2byte EC_POKEMON2(SEADRA)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_WORD_SILVER
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(STARMIE)
-	.2byte EC_POKEMON2(STARMIE)
-	.2byte EC_WORD_START
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859DD5A
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(TENTACOOL)
-	.2byte EC_POKEMON2(TENTACOOL)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_WORD_TOWER
-	.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:: @ 859DE64
-	.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_WORD_UNION
-	.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:: @ 859DE94
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte EC_MOVE2(VOLT_TACKLE)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(VOLTORB)
-	.2byte EC_POKEMON2(VOLTORB)
-	.2byte EC_WORD_VORACIOUS
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(VULPIX)
-	.2byte EC_POKEMON2(VULPIX)
-
-gEasyChatWordsByLetter_W:: @ 859DED6
-	.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)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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_WORD_WIRELESS
-	.2byte EC_MOVE2(WISH)
-	.2byte EC_WORD_WITH
-	.2byte EC_MOVE(WITHDRAW)
-	.2byte EC_WORD_WITHOUT
-	.2byte EC_WORD_WOBBLY
-	.2byte -1, 2 @ doubled Pokémon species names
-	.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:: @ 859DFB4
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(XATU)
-	.2byte EC_POKEMON2(XATU)
-
-gEasyChatWordsByLetter_Y:: @ 859DFBC
-	.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:: @ 859DFE2
-	.2byte EC_POKEMON(ZANGOOSE)
-	.2byte EC_MOVE2(ZAP_CANNON)
-	.2byte EC_POKEMON2(ZAPDOS)
-	.2byte EC_POKEMON(ZIGZAGOON)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON(ZUBAT)
-	.2byte EC_POKEMON2(ZUBAT)
-
-gEasyChatWordsByLetter_UnusedJapaneseHi:: @ 859DFF2
-	.2byte EC_POKEMON2(CLEFFA)
-	.2byte EC_WORD_AIYEEH
-	.2byte EC_POKEMON2(WEEDLE)
-	.2byte EC_WORD_HERO
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(PIKACHU)
-	.2byte EC_POKEMON(PIKACHU)
-	.2byte EC_MOVE2(LIGHT_SCREEN)
-	.2byte EC_WORD_SHINE
-	.2byte EC_WORD_LOW
-	.2byte EC_POKEMON2(CLEFABLE)
-	.2byte EC_WORD_FLYING
-	.2byte EC_POKEMON2(PIDGEOT)
-	.2byte EC_POKEMON2(PIDGEOTTO)
-	.2byte EC_WORD_LEFT
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(PICHU)
-	.2byte EC_POKEMON(PICHU)
-	.2byte EC_MOVE2(SCRATCH)
-	.2byte EC_WORD_SURPRISE
-	.2byte EC_MOVE2(HYPER_FANG)
-	.2byte EC_POKEMON2(CLEFAIRY)
-	.2byte EC_WORD_DROUGHT
-	.2byte EC_WORD_HIDDEN
-	.2byte EC_WORD_PERSON
-	.2byte EC_WORD_AWFUL
-	.2byte EC_POKEMON2(CHARMANDER)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(STARYU)
-	.2byte EC_POKEMON(STARYU)
-	.2byte EC_WORD_ALONE
-	.2byte EC_POKEMON2(CYNDAQUIL)
-	.2byte EC_MOVE2(EMBER)
-	.2byte EC_POKEMON(VIBRAVA)
-	.2byte EC_WORD_BORED
-	.2byte EC_POKEMON2(SUNKERN)
-	.2byte EC_WORD_SECRET
-	.2byte EC_WORD_SECRET_BASE
-	.2byte EC_MOVE2(SECRET_POWER)
-	.2byte EC_POKEMON2(TEDDIURSA)
-	.2byte EC_WORD_HIYAH
-	.2byte EC_MOVE2(DIZZY_PUNCH)
-	.2byte EC_WORD_LIGHTNINGROD
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(VOLTORB)
-	.2byte EC_POKEMON(VOLTORB)
-	.2byte EC_WORD_DAYTIME
-	.2byte EC_MOVE2(BULK_UP)
-	.2byte EC_WORD_NAP
-	.2byte EC_WORD_HEROINE
-	.2byte EC_POKEMON(FEEBAS)
-
-gEasyChatWordsByLetter_UnusedJapaneseFu:: @ 859E060
-	.2byte EC_WORD_FIGHT
-	.2byte EC_POKEMON2(MOLTRES)
-	.2byte EC_WORD_FASHION
-	.2byte EC_WORD_FEAR
-	.2byte EC_WORD_FEVER
-	.2byte EC_MOVE2(IMPRISON)
-	.2byte EC_POKEMON2(FLAREON)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(ALAKAZAM)
-	.2byte EC_POKEMON(ALAKAZAM)
-	.2byte EC_POKEMON2(MAGMAR)
-	.2byte EC_POKEMON(GRUMPIG)
-	.2byte EC_MOVE2(FEATHER_DANCE)
-	.2byte EC_POKEMON2(FORRETRESS)
-	.2byte EC_MOVE2(WHIRLWIND)
-	.2byte EC_WORD_COMPOUNDEYES
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(WIGGLYTUFF)
-	.2byte EC_POKEMON(WIGGLYTUFF)
-	.2byte EC_MOVE2(BEAT_UP)
-	.2byte EC_WORD_MYSTERY
-	.2byte EC_POKEMON2(IVYSAUR)
-	.2byte EC_POKEMON2(BULBASAUR)
-	.2byte EC_WORD_MARVEL_SCALE
-	.2byte EC_WORD_WONDER_GUARD
-	.2byte EC_POKEMON2(VENUSAUR)
-	.2byte EC_WORD_LACKS
-	.2byte EC_WORD_RESUSCITATE
-	.2byte EC_WORD_SMACK
-	.2byte EC_WORD_FUFUFU
-	.2byte EC_POKEMON2(AERODACTYL)
-	.2byte EC_WORD_WIMPY
-	.2byte EC_POKEMON2(MAGBY)
-	.2byte EC_WORD_LOL
-	.2byte EC_MOVE2(BLIZZARD)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(IGGLYBUFF)
-	.2byte EC_POKEMON(IGGLYBUFF)
-	.2byte EC_WORD_SNORT
-	.2byte EC_MOVE2(STOMP)
-	.2byte EC_WORD_INSOMNIA
-	.2byte EC_WORD_WINTER
-	.2byte EC_WORD_LEVITATE
-	.2byte EC_POKEMON(FLYGON)
-	.2byte EC_WORD_PLUS
-	.2byte EC_MOVE2(BLAST_BURN)
-	.2byte EC_POKEMON(PLUSLE)
-	.2byte EC_POKEMON2(UMBREON)
-	.2byte EC_MOVE2(FLASH)
-	.2byte EC_WORD_WOBBLY
-	.2byte EC_MOVE2(TEETER_DANCE)
-	.2byte EC_WORD_PRETEND
-	.2byte EC_POKEMON2(ARTICUNO)
-	.2byte EC_WORD_WANNABE
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(JIGGLYPUFF)
-	.2byte EC_POKEMON(JIGGLYPUFF)
-	.2byte EC_POKEMON2(SNUBBULL)
-	.2byte EC_WORD_SHAKY
-	.2byte EC_MOVE2(CRUSH_CLAW)
-	.2byte EC_MOVE2(BLAZE_KICK)
-	.2byte EC_MOVE2(PRESENT)
-	.2byte EC_WORD_PRESSURE
-	.2byte EC_WORD_BLEND
-	.2byte EC_WORD_FRONTIER
-	.2byte EC_WORD_HUMPH
-	.2byte EC_MOVE2(ERUPTION)
-
-gEasyChatWordsByLetter_UnusedJapaneseHe:: @ 859E0EE
-	.2byte EC_WORD_HEY
-	.2byte EC_POKEMON(CORPHISH)
-	.2byte EC_WORD_BABY
-	.2byte EC_POKEMON2(BAYLEEF)
-	.2byte EC_WORD_BEST
-	.2byte EC_WORD_LOUSY
-	.2byte EC_WORD_HEHEHE
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(GRIMER)
-	.2byte EC_POKEMON(GRIMER)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(MUK)
-	.2byte EC_POKEMON(MUK)
-	.2byte EC_WORD_LIQUID_OOZE
-	.2byte EC_MOVE2(SLUDGE)
-	.2byte EC_MOVE2(SLUDGE_BOMB)
-	.2byte EC_MOVE2(GLARE)
-	.2byte EC_WORD_HEH
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(HERACROSS)
-	.2byte EC_POKEMON(HERACROSS)
-	.2byte EC_POKEMON(PELIPPER)
-	.2byte EC_POKEMON2(HOUNDOOM)
-	.2byte EC_POKEMON2(PERSIAN)
-	.2byte EC_WORD_RIPPED
-	.2byte EC_POKEMON2(LICKITUNG)
-	.2byte EC_WORD_STUDY
-	.2byte EC_WORD_COLOR_CHANGE
-	.2byte EC_MOVE2(TRANSFORM)
-
-gEasyChatWordsByLetter_UnusedJapaneseHo:: @ 859E12E
-	.2byte EC_MOVE2(POISON_TAIL)
-	.2byte EC_WORD_POINTS
-	.2byte EC_POKEMON2(HO_OH)
-	.2byte EC_WORD_SOUNDPROOF
-	.2byte EC_WORD_ADVENTURE
-	.2byte EC_WORD_EFFECT_SPORE
-	.2byte EC_MOVE2(ROAR)
-	.2byte EC_POKEMON(WAILORD)
-	.2byte EC_POKEMON(WAILMER)
-	.2byte EC_WORD_DUDE
-	.2byte EC_WORD_BOARD
-	.2byte EC_POKEMON2(HOOTHOOT)
-	.2byte EC_POKEMON(SALAMENCE)
-	.2byte EC_WORD_BALL
-	.2byte EC_MOVE2(BONE_RUSH)
-	.2byte EC_WORD_THEY
-	.2byte EC_WORD_THEY_WERE
-	.2byte EC_WORD_TO_THEM
-	.2byte EC_WORD_THEIR
-	.2byte EC_WORD_THEY_RE
-	.2byte EC_WORD_THEY_VE
-	.2byte EC_WORD_POKENAV
-	.2byte EC_WORD_POKEMON
-	.2byte EC_WORD_GET
-	.2byte EC_WORD_POKEDEX
-	.2byte EC_WORD_PKRS
-	.2byte EC_MOVE2(CAMOUFLAGE)
-	.2byte EC_WORD_WANT
-	.2byte EC_MOVE2(COVET)
-	.2byte EC_POKEMON(AGGRON)
-	.2byte EC_MOVE2(TAIL_GLOW)
-	.2byte EC_POKEMON(POOCHYENA)
-	.2byte EC_POKEMON2(PIDGEY)
-	.2byte EC_WORD_AS_MUCH_AS
-	.2byte EC_POKEMON2(PONYTA)
-	.2byte EC_MOVE2(BONE_CLUB)
-	.2byte EC_MOVE2(BONEMERANG)
-	.2byte EC_WORD_FIRE
-	.2byte EC_MOVE2(FIRE_SPIN)
-	.2byte EC_WORD_FLAME_BODY
-	.2byte EC_MOVE2(FIRE_PUNCH)
-	.2byte EC_POKEMON2(SKIPLOOM)
-	.2byte EC_WORD_HOHOHO
-	.2byte EC_WORD_PRAISE
-	.2byte EC_WORD_UH_HUH
-	.2byte EC_POKEMON2(PORYGON)
-	.2byte EC_POKEMON2(PORYGON2)
-	.2byte EC_MOVE2(VOLT_TACKLE)
-	.2byte EC_WORD_POKEBLOCK
-	.2byte EC_MOVE2(PERISH_SONG)
-	.2byte EC_WORD_SHREDDED
-	.2byte EC_POKEMON(CASTFORM)
-	.2byte EC_WORD_BOOK
-	.2byte EC_WORD_SERIOUS
-	.2byte EC_WORD_REALLY
-
-gEasyChatWordsByLetter_UnusedJapaneseMa:: @ 859E19C
-	.2byte EC_WORD_OH_DEAR
-	.2byte EC_WORD_IN
-	.2byte EC_WORD_GIVE_UP
-	.2byte EC_WORD_MINUS
-	.2byte EC_POKEMON(MINUN)
-	.2byte EC_WORD_DAILY
-	.2byte EC_WORD_OWN_TEMPO
-	.2byte EC_MOVE2(WRAP)
-	.2byte EC_MOVE2(SPIKES)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(MAGCARGO)
-	.2byte EC_POKEMON(MAGCARGO)
-	.2byte EC_MOVE2(MAGNITUDE)
-	.2byte EC_POKEMON(MAKUHITA)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(SLUGMA)
-	.2byte EC_POKEMON(SLUGMA)
-	.2byte EC_WORD_MAGMA_ARMOR
-	.2byte EC_POKEMON2(QUILAVA)
-	.2byte EC_WORD_OVERDO
-	.2byte EC_WORD_LOSS
-	.2byte EC_WORD_IF_I_LOSE
-	.2byte EC_WORD_LOST
-	.2byte EC_WORD_LOSE
-	.2byte EC_WORD_TRULY
-	.2byte EC_WORD_SERIOUSLY
-	.2byte EC_MOVE2(MAGICAL_LEAF)
-	.2byte EC_MOVE2(MAGIC_COAT)
-	.2byte EC_WORD_MACHINE
-	.2byte EC_WORD_OUT
-	.2byte EC_WORD_MASTER
-	.2byte EC_WORD_INCREASING
-	.2byte EC_WORD_TOO
-	.2byte EC_WORD_LIKE
-	.2byte EC_POKEMON2(BELLSPROUT)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(WEEZING)
-	.2byte EC_POKEMON(WEEZING)
-	.2byte EC_WORD_SMELL
-	.2byte EC_WORD_YET
-	.2byte EC_WORD_MISTAKE
-	.2byte EC_POKEMON(LINOONE)
-	.2byte EC_WORD_TOTALLY
-	.2byte EC_MOVE2(MUD_SHOT)
-	.2byte EC_MOVE2(MACH_PUNCH)
-	.2byte EC_WORD_FESTIVAL
-	.2byte EC_WORD_UNTIL
-	.2byte EC_WORD_WAIT
-	.2byte EC_WORD_GUARD
-	.2byte EC_MOVE2(PROTECT)
-	.2byte EC_POKEMON(CASCOON)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(MARILL)
-	.2byte EC_POKEMON(MARILL)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(AZUMARILL)
-	.2byte EC_POKEMON(AZUMARILL)
-	.2byte EC_MOVE2(DEFENSE_CURL)
-	.2byte EC_WORD_AS_IF
-	.2byte EC_POKEMON(SWALOT)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(ELECTRODE)
-	.2byte EC_POKEMON(ELECTRODE)
-	.2byte EC_MOVE2(ROLLING_KICK)
-	.2byte EC_WORD_COMICS
-	.2byte EC_POKEMON2(MANKEY)
-	.2byte EC_WORD_SATISFIED
-	.2byte EC_POKEMON2(MANTINE)
-
-gEasyChatWordsByLetter_UnusedJapaneseMi:: @ 859E230
-	.2byte EC_WORD_PARTNER
-	.2byte EC_MOVE2(SUBSTITUTE)
-	.2byte EC_WORD_RIGHT
-	.2byte EC_MOVE2(DETECT)
-	.2byte EC_MOVE2(PIN_MISSILE)
-	.2byte EC_WORD_WATER
-	.2byte EC_MOVE2(WATER_SPORT)
-	.2byte EC_POKEMON(MUDKIP)
-	.2byte EC_MOVE2(WATER_GUN)
-	.2byte EC_MOVE2(MIST_BALL)
-	.2byte EC_MOVE2(WATER_PULSE)
-	.2byte EC_WORD_WATER_VEIL
-	.2byte EC_WORD_SHOW
-	.2byte EC_WORD_SEE
-	.2byte EC_WORD_DID
-	.2byte EC_MOVE2(FURY_ATTACK)
-	.2byte EC_MOVE2(FURY_SWIPES)
-	.2byte EC_MOVE2(DESTINY_BOND)
-	.2byte EC_WORD_LOOKS
-	.2byte EC_WORD_REJECT
-	.2byte EC_WORD_ACCEPT
-	.2byte EC_POKEMON2(DRATINI)
-	.2byte EC_MOVE2(FALSE_SWIPE)
-	.2byte EC_MOVE2(FORESIGHT)
-	.2byte EC_POKEMON2(MEW)
-	.2byte EC_POKEMON2(MEWTWO)
-	.2byte EC_MOVE2(MIRROR_COAT)
-	.2byte EC_MOVE2(FUTURE_SIGHT)
-	.2byte EC_WORD_SEES
-	.2byte EC_MOVE2(MILK_DRINK)
-	.2byte EC_POKEMON2(MILTANK)
-	.2byte EC_POKEMON(MILOTIC)
-	.2byte EC_WORD_WE
-	.2byte EC_WORD_BEEN
-	.2byte EC_WORD_TO_US
-	.2byte EC_WORD_OUR
-	.2byte EC_WORD_WE_RE
-
-gEasyChatWordsByLetter_UnusedJapaneseMu:: @ 859E27A
-	.2byte EC_WORD_MOOD
-	.2byte EC_POKEMON2(MISDREAVUS)
-	.2byte EC_WORD_OLDEN
-	.2byte EC_WORD_ARRGH
-	.2byte EC_WORD_BUG
-	.2byte EC_WORD_SWARM
-	.2byte EC_WORD_RATHER
-	.2byte EC_POKEMON2(SMOOCHUM)
-	.2byte EC_WORD_INVINCIBLE
-	.2byte EC_WORD_HEART
-	.2byte EC_WORD_MUFUFU
-	.2byte EC_WORD_MMM
-
-gEasyChatWordsByLetter_UnusedJapaneseMe:: @ 859E292
-	.2byte EC_MOVE2(CALM_MIND)
-	.2byte EC_WORD_MAIL
-	.2byte EC_MOVE2(MEGA_DRAIN)
-	.2byte EC_MOVE2(MEGA_KICK)
-	.2byte EC_MOVE2(MEGA_PUNCH)
-	.2byte EC_POKEMON2(MEGANIUM)
-	.2byte EC_MOVE2(MEGAHORN)
-	.2byte EC_WORD_SEEK
-	.2byte EC_MOVE2(HIDDEN_POWER)
-	.2byte EC_WORD_RARE
-	.2byte EC_POKEMON(METAGROSS)
-	.2byte EC_POKEMON2(DITTO)
-	.2byte EC_MOVE2(METAL_CLAW)
-	.2byte EC_POKEMON(METANG)
-	.2byte EC_WORD_DESTROYED
-	.2byte EC_WORD_MESSAGE
-	.2byte EC_WORD_AWFULLY
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(TENTACOOL)
-	.2byte EC_POKEMON(TENTACOOL)
-	.2byte EC_WORD_FIERY
-	.2byte EC_POKEMON2(MAREEP)
-	.2byte EC_MOVE2(ATTRACT)
-	.2byte EC_WORD_CUTE_CHARM
-	.2byte EC_WORD_IMMUNITY
-
-gEasyChatWordsByLetter_UnusedJapaneseMo:: @ 859E2C6
-	.2byte EC_WORD_ALMOST
-	.2byte EC_WORD_BLAZE
-	.2byte EC_WORD_NEARLY
-	.2byte EC_WORD_MODE
-	.2byte EC_WORD_OLD
-	.2byte EC_WORD_THURSDAY
-	.2byte EC_POKEMON2(FLAAFFY)
-	.2byte EC_WORD_LISTENING
-	.2byte EC_WORD_OWN
-	.2byte EC_WORD_MORE
-	.2byte EC_WORD_DIDN_T
-	.2byte EC_WORD_PICKUP
-	.2byte EC_MOVE2(MIMIC)
-	.2byte EC_WORD_TOO_LATE
-	.2byte EC_WORD_PATTERN
-	.2byte EC_WORD_FLASH_FIRE
-	.2byte EC_WORD_RECEIVED
-	.2byte EC_POKEMON2(VENOMOTH)
-	.2byte EC_WORD_DOESN_T
-	.2byte EC_POKEMON2(TANGELA)
-
-gEasyChatWordsByLetter_UnusedJapaneseYa:: @ 859E2EE
-	.2byte EC_WORD_HOO_HAH
-	.2byte EC_WORD_PROMISE
-	.2byte EC_WORD_KIND
-	.2byte EC_POKEMON(BALTOY)
-	.2byte EC_WORD_HOLIDAY
-	.2byte EC_WORD_NEGATIVE
-	.2byte EC_MOVE2(FRUSTRATION)
-	.2byte EC_WORD_DONE
-	.2byte EC_WORD_FINALLY
-	.2byte EC_WORD_ANY
-	.2byte EC_WORD_YAHOO
-	.2byte EC_POKEMON2(SLOWKING)
-	.2byte EC_POKEMON2(SLOWBRO)
-	.2byte EC_MOVE2(LEECH_SEED)
-	.2byte EC_POKEMON2(SLOWPOKE)
-	.2byte EC_WORD_DANGER
-	.2byte EC_POKEMON2(MURKROW)
-	.2byte EC_POKEMON(SABLEYE)
-	.2byte EC_WORD_DEFEATED
-	.2byte EC_WORD_BEAT
-	.2byte EC_WORD_VITAL_SPIRIT
-	.2byte EC_POKEMON(VIGOROTH)
-	.2byte EC_WORD_YOUNG
-	.2byte EC_POKEMON2(YANMA)
-
-gEasyChatWordsByLetter_UnusedJapaneseYu:: @ 859E31E
-	.2byte EC_POKEMON(SNORUNT)
-	.2byte EC_WORD_TAKE
-	.2byte EC_WORD_UNION
-	.2byte EC_MOVE2(METRONOME)
-	.2byte EC_WORD_DREAM
-	.2byte EC_MOVE2(DREAM_EATER)
-	.2byte EC_WORD_ALLOW
-	.2byte EC_WORD_FORGET
-	.2byte EC_POKEMON(CRADILY)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(KADABRA)
-	.2byte EC_POKEMON(KADABRA)
-
-gEasyChatWordsByLetter_UnusedJapaneseYo:: @ 859E338
-	.2byte EC_WORD_WITHOUT
-	.2byte EC_WORD_YO
-	.2byte EC_MOVE2(ACID)
-	.2byte EC_WORD_COME_OVER
-	.2byte EC_WORD_KINDERGARTEN
-	.2byte EC_WORD_CHLOROPHYLL
-	.2byte EC_WORD_AFTER
-	.2byte EC_POKEMON2(LARVITAR)
-	.2byte EC_WORD_OH_KAY
-	.2byte EC_WORD_BEFORE
-	.2byte EC_WORD_GREAT
-	.2byte EC_MOVE2(MEDITATE)
-	.2byte EC_WORD_PURE_POWER
-	.2byte EC_WORD_WELL
-	.2byte EC_MOVE2(SNATCH)
-	.2byte EC_WORD_OKAY
-	.2byte EC_WORD_PLANS
-	.2byte EC_WORD_NIGHTTIME
-	.2byte EC_WORD_WHILE
-	.2byte EC_POKEMON(DUSKULL)
-	.2byte EC_WORD_EASY
-	.2byte EC_WORD_INSTEAD
-	.2byte EC_WORD_NIGHT
-	.2byte EC_POKEMON2(NOCTOWL)
-	.2byte EC_WORD_COUNT_ON
-	.2byte EC_WORD_WEAK
-	.2byte EC_WORD_TOO_WEAK
-	.2byte EC_WORD_WEAKENED
-
-gEasyChatWordsByLetter_UnusedJapaneseRa:: @ 859E370
-	.2byte EC_POKEMON2(RAIKOU)
-	.2byte EC_WORD_WEEK
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(RAICHU)
-	.2byte EC_POKEMON(RAICHU)
-	.2byte EC_WORD_RIVAL
-	.2byte EC_WORD_LIFE
-	.2byte EC_POKEMON(MANECTRIC)
-	.2byte EC_WORD_SIMPLE
-	.2byte EC_WORD_PUSHOVER
-	.2byte EC_POKEMON(SWAMPERT)
-	.2byte EC_POKEMON(ELECTRIKE)
-	.2byte EC_WORD_SEEMS
-	.2byte EC_WORD_RADIO
-	.2byte EC_MOVE2(LUSTER_PURGE)
-	.2byte EC_POKEMON2(CHANSEY)
-	.2byte EC_POKEMON2(RATICATE)
-	.2byte EC_POKEMON(LATIAS)
-	.2byte EC_POKEMON(LATIOS)
-	.2byte EC_POKEMON(LUVDISC)
-	.2byte EC_POKEMON2(LAPRAS)
-	.2byte EC_WORD_LOVEY_DOVEY
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(VILEPLUME)
-	.2byte EC_POKEMON(VILEPLUME)
-	.2byte EC_WORD_LALALA
-	.2byte EC_POKEMON(RALTS)
-	.2byte EC_WORD_FORGETS
-	.2byte EC_WORD_APPEARS
-	.2byte EC_WORD_RANK
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(LANTURN)
-	.2byte EC_POKEMON(LANTURN)
-
-gEasyChatWordsByLetter_UnusedJapaneseRi:: @ 859E3B8
-	.2byte EC_WORD_LEADER
-	.2byte EC_MOVE2(LEAF_BLADE)
-	.2byte EC_POKEMON2(CHARMELEON)
-	.2byte EC_POKEMON2(CHARIZARD)
-	.2byte EC_MOVE2(RECYCLE)
-	.2byte EC_MOVE2(REFLECT)
-	.2byte EC_MOVE2(REFRESH)
-	.2byte EC_MOVE2(REVENGE)
-	.2byte EC_WORD_RIBBON
-	.2byte EC_WORD_TRENDY
-	.2byte EC_MOVE2(DRAGON_RAGE)
-	.2byte EC_MOVE2(DRAGON_BREATH)
-	.2byte EC_MOVE2(DRAGON_DANCE)
-	.2byte EC_WORD_VACATION
-	.2byte EC_POKEMON(LILEEP)
-	.2byte EC_POKEMON2(URSARING)
-	.2byte EC_WORD_SHIELD_DUST
-
-gEasyChatWordsByLetter_UnusedJapaneseRu:: @ 859E3DA
-	.2byte EC_POKEMON2(JYNX)
-	.2byte EC_WORD_ROOM
-	.2byte EC_WORD_RULE
-	.2byte EC_POKEMON2(LUGIA)
-	.2byte EC_WORD_LOOK
-	.2byte EC_POKEMON(LUNATONE)
-	.2byte EC_WORD_RUBY
-	.2byte EC_WORD_THAN
-	.2byte EC_POKEMON(AZURILL)
-	.2byte EC_POKEMON(LUDICOLO)
-	.2byte EC_WORD_HAPPILY
-
-gEasyChatWordsByLetter_UnusedJapaneseRe:: @ 859E3F0
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(MAGNETON)
-	.2byte EC_POKEMON(MAGNETON)
-	.2byte EC_MOVE2(ICE_PUNCH)
-	.2byte EC_MOVE2(ICE_BEAM)
-	.2byte EC_POKEMON(REGICE)
-	.2byte EC_POKEMON(REGISTEEL)
-	.2byte EC_POKEMON(REGIROCK)
-	.2byte EC_POKEMON(RAYQUAZA)
-	.2byte EC_WORD_UGLY
-	.2byte EC_POKEMON2(LEDIAN)
-	.2byte EC_POKEMON2(LEDYBA)
-	.2byte EC_WORD_FANTASTIC
-	.2byte EC_WORD_LEVEL
-	.2byte EC_MOVE2(FURY_CUTTER)
-	.2byte EC_MOVE2(COMET_PUNCH)
-	.2byte EC_WORD_RENTAL
-
-gEasyChatWordsByLetter_UnusedJapaneseRo:: @ 859E414
-	.2byte EC_MOVE2(SKULL_BASH)
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(VULPIX)
-	.2byte EC_POKEMON(VULPIX)
-	.2byte EC_POKEMON(ROSELIA)
-	.2byte EC_MOVE2(LOCK_ON)
-	.2byte EC_MOVE2(ROCK_BLAST)
-	.2byte EC_WORD_ROMANTIC
-	.2byte EC_WORD_QUESTION
-
-gEasyChatWordsByLetter_UnusedJapaneseWa:: @ 859E428
-	.2byte EC_WORD_YAY
-	.2byte EC_WORD_WORLD
-	.2byte EC_WORD_AWW
-	.2byte EC_WORD_WIRELESS
-	.2byte EC_WORD_WOWEE
-	.2byte EC_POKEMON(COMBUSKEN)
-	.2byte EC_WORD_UNDERSTAND
-	.2byte EC_WORD_UNDERSTANDS
-	.2byte EC_WORD_FAINT
-	.2byte EC_WORD_ANTICIPATION
-	.2byte EC_WORD_ONCE
-	.2byte EC_WORD_MOVE
-	.2byte EC_WORD_WE_VE
-	.2byte EC_WORD_FAINTED
-	.2byte EC_WORD_WOMAN
-	.2byte EC_WORD_SHE
-	.2byte EC_WORD_SHE_WAS
-	.2byte EC_WORD_TO_HER
-	.2byte EC_WORD_HERS
-	.2byte EC_WORD_SHE_IS
-	.2byte EC_WORD_SOME
-	.2byte EC_POKEMON2(JUMPLUFF)
-	.2byte EC_MOVE2(COTTON_SPORE)
-	.2byte EC_WORD_GWAH
-	.2byte EC_POKEMON2(TOTODILE)
-	.2byte EC_WORD_WAHAHAHA
-	.2byte EC_WORD_ANYWHERE
-	.2byte EC_MOVE2(STRUGGLE)
-	.2byte EC_WORD_BADLY
-	.2byte -1, 2 @ doubled Pokémon species names
-	.2byte EC_POKEMON2(MACHOP)
-	.2byte EC_POKEMON(MACHOP)
-
-	.align 2
-gEasyChatWordsByLetterPointers:: @ 859E46C
-	.4byte gEasyChatWordsByLetter_Others
-	.4byte 10 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_A
-	.4byte 106 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_B
-	.4byte 86 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_C
-	.4byte 119 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_D
-	.4byte 94 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_E
-	.4byte 59 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_F
-	.4byte 80 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_G
-	.4byte 98 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_H
-	.4byte 101 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_I
-	.4byte 48 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_J
-	.4byte 13 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_K
-	.4byte 33 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_L
-	.4byte 82 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_M
-	.4byte 142 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_N
-	.4byte 54 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_O
-	.4byte 44 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_P
-	.4byte 102 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_Q
-	.4byte 6 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_R
-	.4byte 80 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_S
-	.4byte 262 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_T
-	.4byte 133 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_U
-	.4byte 24 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_V
-	.4byte 33 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_W
-	.4byte 111 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_X
-	.4byte 4 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_Y
-	.4byte 19 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_Z
-	.4byte 8 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseHi
-	.4byte 55 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseFu
-	.4byte 71 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseHe
-	.4byte 32 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseHo
-	.4byte 55 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseMa
-	.4byte 74 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseMi
-	.4byte 37 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseMu
-	.4byte 12 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseMe
-	.4byte 26 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseMo
-	.4byte 20 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseYa
-	.4byte 24 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseYu
-	.4byte 13 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseYo
-	.4byte 28 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseRa
-	.4byte 36 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseRi
-	.4byte 17 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseRu
-	.4byte 11 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseRe
-	.4byte 18 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseRo
-	.4byte 10 @ number of entries
-
-	.4byte gEasyChatWordsByLetter_UnusedJapaneseWa
-	.4byte 33 @ number of entries
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index 2083e17df..c56234b13 100644
--- a/data/tilesets/headers.inc
+++ b/data/tilesets/headers.inc
@@ -7,7 +7,7 @@ gTileset_General:: @ 83DF704
 	.4byte gTilesetPalettes_General
 	.4byte gMetatiles_General
 	.4byte gMetatileAttributes_General
-	.4byte TilesetCb_General
+	.4byte InitTilesetAnim_General
 
 	.align 2
 gTileset_Petalburg:: @ 83DF71C
@@ -18,7 +18,7 @@ gTileset_Petalburg:: @ 83DF71C
 	.4byte gTilesetPalettes_Petalburg
 	.4byte gMetatiles_Petalburg
 	.4byte gMetatileAttributes_Petalburg
-	.4byte TilesetCb_Petalburg
+	.4byte InitTilesetAnim_Petalburg
 
 	.align 2
 gTileset_Rustboro:: @ 83DF734
@@ -29,7 +29,7 @@ gTileset_Rustboro:: @ 83DF734
 	.4byte gTilesetPalettes_Rustboro
 	.4byte gMetatiles_Rustboro
 	.4byte gMetatileAttributes_Rustboro
-	.4byte TilesetCb_Rustboro
+	.4byte InitTilesetAnim_Rustboro
 
 	.align 2
 gTileset_Dewford:: @ 83DF74C
@@ -40,7 +40,7 @@ gTileset_Dewford:: @ 83DF74C
 	.4byte gTilesetPalettes_Dewford
 	.4byte gMetatiles_Dewford
 	.4byte gMetatileAttributes_Dewford
-	.4byte TilesetCb_Dewford
+	.4byte InitTilesetAnim_Dewford
 
 	.align 2
 gTileset_Slateport:: @ 83DF764
@@ -51,7 +51,7 @@ gTileset_Slateport:: @ 83DF764
 	.4byte gTilesetPalettes_Slateport
 	.4byte gMetatiles_Slateport
 	.4byte gMetatileAttributes_Slateport
-	.4byte TilesetCb_Slateport
+	.4byte InitTilesetAnim_Slateport
 
 	.align 2
 gTileset_Mauville:: @ 83DF77C
@@ -62,7 +62,7 @@ gTileset_Mauville:: @ 83DF77C
 	.4byte gTilesetPalettes_Mauville
 	.4byte gMetatiles_Mauville
 	.4byte gMetatileAttributes_Mauville
-	.4byte TilesetCb_Mauville
+	.4byte InitTilesetAnim_Mauville
 
 	.align 2
 gTileset_Lavaridge:: @ 83DF794
@@ -73,7 +73,7 @@ gTileset_Lavaridge:: @ 83DF794
 	.4byte gTilesetPalettes_Lavaridge
 	.4byte gMetatiles_Lavaridge
 	.4byte gMetatileAttributes_Lavaridge
-	.4byte TilesetCb_Lavaridge
+	.4byte InitTilesetAnim_Lavaridge
 
 	.align 2
 gTileset_Fallarbor:: @ 83DF7AC
@@ -84,7 +84,7 @@ gTileset_Fallarbor:: @ 83DF7AC
 	.4byte gTilesetPalettes_Fallarbor
 	.4byte gMetatiles_Fallarbor
 	.4byte gMetatileAttributes_Fallarbor
-	.4byte TilesetCb_Fallarbor
+	.4byte InitTilesetAnim_Fallarbor
 
 	.align 2
 gTileset_Fortree:: @ 83DF7C4
@@ -95,7 +95,7 @@ gTileset_Fortree:: @ 83DF7C4
 	.4byte gTilesetPalettes_Fortree
 	.4byte gMetatiles_Fortree
 	.4byte gMetatileAttributes_Fortree
-	.4byte TilesetCb_Fortree
+	.4byte InitTilesetAnim_Fortree
 
 	.align 2
 gTileset_Lilycove:: @ 83DF7DC
@@ -106,7 +106,7 @@ gTileset_Lilycove:: @ 83DF7DC
 	.4byte gTilesetPalettes_Lilycove
 	.4byte gMetatiles_Lilycove
 	.4byte gMetatileAttributes_Lilycove
-	.4byte TilesetCb_Lilycove
+	.4byte InitTilesetAnim_Lilycove
 
 	.align 2
 gTileset_Mossdeep:: @ 83DF7F4
@@ -117,7 +117,7 @@ gTileset_Mossdeep:: @ 83DF7F4
 	.4byte gTilesetPalettes_Mossdeep
 	.4byte gMetatiles_Mossdeep
 	.4byte gMetatileAttributes_Mossdeep
-	.4byte TilesetCb_Mossdeep
+	.4byte InitTilesetAnim_Mossdeep
 
 	.align 2
 gTileset_EverGrande:: @ 83DF80C
@@ -128,7 +128,7 @@ gTileset_EverGrande:: @ 83DF80C
 	.4byte gTilesetPalettes_EverGrande
 	.4byte gMetatiles_EverGrande
 	.4byte gMetatileAttributes_EverGrande
-	.4byte TilesetCb_EverGrande
+	.4byte InitTilesetAnim_EverGrande
 
 	.align 2
 gTileset_Pacifidlog:: @ 83DF824
@@ -139,7 +139,7 @@ gTileset_Pacifidlog:: @ 83DF824
 	.4byte gTilesetPalettes_Pacifidlog
 	.4byte gMetatiles_Pacifidlog
 	.4byte gMetatileAttributes_Pacifidlog
-	.4byte TilesetCb_Pacifidlog
+	.4byte InitTilesetAnim_Pacifidlog
 
 	.align 2
 gTileset_Sootopolis:: @ 83DF83C
@@ -150,7 +150,7 @@ gTileset_Sootopolis:: @ 83DF83C
 	.4byte gTilesetPalettes_Sootopolis
 	.4byte gMetatiles_Sootopolis
 	.4byte gMetatileAttributes_Sootopolis
-	.4byte TilesetCb_Sootopolis
+	.4byte InitTilesetAnim_Sootopolis
 
 	.align 2
 gTileset_BattleFrontierOutsideWest:: @ 83DF854
@@ -161,7 +161,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854
 	.4byte gTilesetPalettes_BattleFrontierOutsideWest
 	.4byte gMetatiles_BattleFrontierOutsideWest
 	.4byte gMetatileAttributes_BattleFrontierOutsideWest
-	.4byte TilesetCb_BattleFrontierOutsideWest
+	.4byte InitTilesetAnim_BattleFrontierOutsideWest
 
 	.align 2
 gTileset_BattleFrontierOutsideEast:: @ 83DF86C
@@ -172,7 +172,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C
 	.4byte gTilesetPalettes_BattleFrontierOutsideEast
 	.4byte gMetatiles_BattleFrontierOutsideEast
 	.4byte gMetatileAttributes_BattleFrontierOutsideEast
-	.4byte TilesetCb_BattleFrontierOutsideEast
+	.4byte InitTilesetAnim_BattleFrontierOutsideEast
 
 	.align 2
 gTileset_Building:: @ 83DF884
@@ -183,7 +183,7 @@ gTileset_Building:: @ 83DF884
 	.4byte gTilesetPalettes_InsideBuilding
 	.4byte gMetatiles_InsideBuilding
 	.4byte gMetatileAttributes_InsideBuilding
-	.4byte TilesetCb_InsideBuilding
+	.4byte InitTilesetAnim_Building
 
 	.align 2
 gTileset_Shop:: @ 83DF89C
@@ -216,7 +216,7 @@ gTileset_Cave:: @ 83DF8CC
 	.4byte gTilesetPalettes_Cave
 	.4byte gMetatiles_Cave
 	.4byte gMetatileAttributes_Cave
-	.4byte TilesetCb_Cave
+	.4byte InitTilesetAnim_Cave
 
 	.align 2
 gTileset_PokemonSchool:: @ 83DF8E4
@@ -337,7 +337,7 @@ gTileset_BikeShop:: @ 83DF9D4
 	.4byte gTilesetPalettes_BikeShop
 	.4byte gMetatiles_BikeShop
 	.4byte gMetatileAttributes_BikeShop
-	.4byte TilesetCb_BikeShop
+	.4byte InitTilesetAnim_BikeShop
 
 	.align 2
 gTileset_RusturfTunnel:: @ 83DF9EC
@@ -491,7 +491,7 @@ gTileset_Underwater:: @ 83DFB24
 	.4byte gTilesetPalettes_Underwater
 	.4byte gMetatiles_Underwater
 	.4byte gMetatileAttributes_Underwater
-	.4byte TilesetCb_Underwater
+	.4byte InitTilesetAnim_Underwater
 
 	.align 2
 gTileset_PetalburgGym:: @ 83DFB3C
@@ -513,7 +513,7 @@ gTileset_SootopolisGym:: @ 83DFB54
 	.4byte gTilesetPalettes_SootopolisGym
 	.4byte gMetatiles_SootopolisGym
 	.4byte gMetatileAttributes_SootopolisGym
-	.4byte TilesetCb_SootopolisGym
+	.4byte InitTilesetAnim_SootopolisGym
 
 	.align 2
 gTileset_GenericBuilding:: @ 83DFB6C
@@ -568,7 +568,7 @@ gTileset_MauvilleGym:: @ 83DFBCC
 	.4byte gTilesetPalettes_MauvilleGym
 	.4byte gMetatiles_MauvilleGym
 	.4byte gMetatileAttributes_MauvilleGym
-	.4byte TilesetCb_MauvilleGym
+	.4byte InitTilesetAnim_MauvilleGym
 
 	.align 2
 gTileset_LavaridgeGym:: @ 83DFBE4
@@ -653,7 +653,7 @@ gTileset_EliteFour:: @ 83DFC7C
 	.4byte gTilesetPalettes_EliteFour
 	.4byte gMetatiles_EliteFour
 	.4byte gMetatileAttributes_EliteFour
-	.4byte TilesetCb_EliteFour
+	.4byte InitTilesetAnim_EliteFour
 
 	.align 2
 gTileset_BattleFrontier:: @ 83DFC94
@@ -686,7 +686,7 @@ gTileset_BattleDome:: @ 83DFCC4
 	.4byte gTilesetPalettes_BattleDome
 	.4byte gMetatiles_BattleDome
 	.4byte gMetatileAttributes_BattleDome
-	.4byte TilesetCb_BattleDome
+	.4byte InitTilesetAnim_BattleDome
 
 	.align 2
 gTileset_BattleFactory:: @ 83DFCDC
@@ -730,7 +730,7 @@ gTileset_BattlePyramid:: @ 83DFD24
 	.4byte gTilesetPalettes_BattlePyramid
 	.4byte gMetatiles_BattlePyramid
 	.4byte gMetatileAttributes_BattlePyramid
-	.4byte TilesetCb_BattlePyramid
+	.4byte InitTilesetAnim_BattlePyramid
 
 	.align 2
 gTileset_MirageTower:: @ 83DFD3C
diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/tv_turned_on/0.png
index 1d98f3621..1d98f3621 100644
--- a/data/tilesets/primary/building/anim/0.png
+++ b/data/tilesets/primary/building/anim/tv_turned_on/0.png
diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/tv_turned_on/1.png
index 6798473b7..6798473b7 100644
--- a/data/tilesets/primary/building/anim/1.png
+++ b/data/tilesets/primary/building/anim/tv_turned_on/1.png
diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/flower/0.png
index 1254a7655..1254a7655 100644
--- a/data/tilesets/primary/general/anim/0/0.png
+++ b/data/tilesets/primary/general/anim/flower/0.png
diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/flower/1.png
index 50bd949f2..50bd949f2 100644
--- a/data/tilesets/primary/general/anim/0/1.png
+++ b/data/tilesets/primary/general/anim/flower/1.png
diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/flower/2.png
index 5d8192c9d..5d8192c9d 100644
--- a/data/tilesets/primary/general/anim/0/2.png
+++ b/data/tilesets/primary/general/anim/flower/2.png
diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/land_water_edge/0.png
index ba160b633..ba160b633 100644
--- a/data/tilesets/primary/general/anim/4/0.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/0.png
diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/land_water_edge/1.png
index 48274c9a0..48274c9a0 100644
--- a/data/tilesets/primary/general/anim/4/1.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/1.png
diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/land_water_edge/2.png
index 9e1f98c1b..9e1f98c1b 100644
--- a/data/tilesets/primary/general/anim/4/2.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/2.png
diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/land_water_edge/3.png
index c5b446f65..c5b446f65 100644
--- a/data/tilesets/primary/general/anim/4/3.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/3.png
diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/sand_water_edge/0.png
index 80c99c473..80c99c473 100644
--- a/data/tilesets/primary/general/anim/2/0.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/0.png
diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/sand_water_edge/1.png
index 52051f056..52051f056 100644
--- a/data/tilesets/primary/general/anim/2/1.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/1.png
diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/sand_water_edge/2.png
index 39c6e2f87..39c6e2f87 100644
--- a/data/tilesets/primary/general/anim/2/2.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/2.png
diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/sand_water_edge/3.png
index abb5ff362..abb5ff362 100644
--- a/data/tilesets/primary/general/anim/2/3.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/3.png
diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/sand_water_edge/4.png
index a7bde9837..a7bde9837 100644
--- a/data/tilesets/primary/general/anim/2/4.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/4.png
diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/sand_water_edge/5.png
index 05f88d81e..05f88d81e 100644
--- a/data/tilesets/primary/general/anim/2/5.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/5.png
diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/sand_water_edge/6.png
index 01f9c203d..01f9c203d 100644
--- a/data/tilesets/primary/general/anim/2/6.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/6.png
diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/water/0.png
index d3f2ea0da..d3f2ea0da 100644
--- a/data/tilesets/primary/general/anim/1/0.png
+++ b/data/tilesets/primary/general/anim/water/0.png
diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/water/1.png
index 86b0ff176..86b0ff176 100644
--- a/data/tilesets/primary/general/anim/1/1.png
+++ b/data/tilesets/primary/general/anim/water/1.png
diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/water/2.png
index d2302180e..d2302180e 100644
--- a/data/tilesets/primary/general/anim/1/2.png
+++ b/data/tilesets/primary/general/anim/water/2.png
diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/water/3.png
index f757f8253..f757f8253 100644
--- a/data/tilesets/primary/general/anim/1/3.png
+++ b/data/tilesets/primary/general/anim/water/3.png
diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/water/4.png
index 950b88585..950b88585 100644
--- a/data/tilesets/primary/general/anim/1/4.png
+++ b/data/tilesets/primary/general/anim/water/4.png
diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/water/5.png
index 4de7d4225..4de7d4225 100644
--- a/data/tilesets/primary/general/anim/1/5.png
+++ b/data/tilesets/primary/general/anim/water/5.png
diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/water/6.png
index 73c1cabdd..73c1cabdd 100644
--- a/data/tilesets/primary/general/anim/1/6.png
+++ b/data/tilesets/primary/general/anim/water/6.png
diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/water/7.png
index 827fd8b74..827fd8b74 100644
--- a/data/tilesets/primary/general/anim/1/7.png
+++ b/data/tilesets/primary/general/anim/water/7.png
diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/waterfall/0.png
index e307d81aa..e307d81aa 100644
--- a/data/tilesets/primary/general/anim/3/0.png
+++ b/data/tilesets/primary/general/anim/waterfall/0.png
diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/waterfall/1.png
index df6aaf3bc..df6aaf3bc 100644
--- a/data/tilesets/primary/general/anim/3/1.png
+++ b/data/tilesets/primary/general/anim/waterfall/1.png
diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/waterfall/2.png
index 560f89d06..560f89d06 100644
--- a/data/tilesets/primary/general/anim/3/2.png
+++ b/data/tilesets/primary/general/anim/waterfall/2.png
diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/waterfall/3.png
index a8db289ae..a8db289ae 100644
--- a/data/tilesets/primary/general/anim/3/3.png
+++ b/data/tilesets/primary/general/anim/waterfall/3.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png
index 98f1a9283..98f1a9283 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png
index d0254e9ee..d0254e9ee 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png
index 1be9641b8..1be9641b8 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png
index 7a536f24c..7a536f24c 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png
index 98f1a9283..98f1a9283 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png
index d0254e9ee..d0254e9ee 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png
index 1be9641b8..1be9641b8 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png
index 7a536f24c..7a536f24c 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png
index c135df824..c135df824 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/1/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png
index 2588bdac0..2588bdac0 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/1/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png
index fbbf67d2f..fbbf67d2f 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/1/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png
index 04bb8ad84..04bb8ad84 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/0/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png
index e292686f9..e292686f9 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/0/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png
index fa24db001..fa24db001 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/0/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png
diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png
index 127ed4e47..127ed4e47 100644
--- a/data/tilesets/secondary/bike_shop/anim/0.png
+++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png
diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png
index 71f12a746..71f12a746 100644
--- a/data/tilesets/secondary/bike_shop/anim/1.png
+++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png
diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/lava/0.png
index e98a161eb..e98a161eb 100644
--- a/data/tilesets/secondary/cave/anim/0.png
+++ b/data/tilesets/secondary/cave/anim/lava/0.png
diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/lava/1.png
index 12ffcd12c..12ffcd12c 100644
--- a/data/tilesets/secondary/cave/anim/1.png
+++ b/data/tilesets/secondary/cave/anim/lava/1.png
diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/lava/2.png
index c5be89c00..c5be89c00 100644
--- a/data/tilesets/secondary/cave/anim/2.png
+++ b/data/tilesets/secondary/cave/anim/lava/2.png
diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/lava/3.png
index 635a81154..635a81154 100644
--- a/data/tilesets/secondary/cave/anim/3.png
+++ b/data/tilesets/secondary/cave/anim/lava/3.png
diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/lava/4.png
index cea6ece85..cea6ece85 100644
--- a/data/tilesets/secondary/cave/anim/unused/0.png
+++ b/data/tilesets/secondary/cave/anim/lava/4.png
diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/lava/5.png
index 01d8a300a..01d8a300a 100644
--- a/data/tilesets/secondary/cave/anim/unused/1.png
+++ b/data/tilesets/secondary/cave/anim/lava/5.png
diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/lava/6.png
index ba13bda8c..ba13bda8c 100644
--- a/data/tilesets/secondary/cave/anim/unused/2.png
+++ b/data/tilesets/secondary/cave/anim/lava/6.png
diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/lava/7.png
index 117f04aa4..117f04aa4 100644
--- a/data/tilesets/secondary/cave/anim/unused/3.png
+++ b/data/tilesets/secondary/cave/anim/lava/7.png
diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/flag/0.png
index f80971c45..f80971c45 100644
--- a/data/tilesets/secondary/dewford/anim/0.png
+++ b/data/tilesets/secondary/dewford/anim/flag/0.png
diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/flag/1.png
index b98d9cafb..b98d9cafb 100644
--- a/data/tilesets/secondary/dewford/anim/1.png
+++ b/data/tilesets/secondary/dewford/anim/flag/1.png
diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/flag/2.png
index 6f88f493f..6f88f493f 100644
--- a/data/tilesets/secondary/dewford/anim/2.png
+++ b/data/tilesets/secondary/dewford/anim/flag/2.png
diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/flag/3.png
index b95b4bc9e..b95b4bc9e 100644
--- a/data/tilesets/secondary/dewford/anim/3.png
+++ b/data/tilesets/secondary/dewford/anim/flag/3.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/floor_light/0.png
index 6e508308b..6e508308b 100644
--- a/data/tilesets/secondary/elite_four/anim/1/0.png
+++ b/data/tilesets/secondary/elite_four/anim/floor_light/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/floor_light/1.png
index 794f26195..794f26195 100644
--- a/data/tilesets/secondary/elite_four/anim/1/1.png
+++ b/data/tilesets/secondary/elite_four/anim/floor_light/1.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png
index 108a2099b..108a2099b 100644
--- a/data/tilesets/secondary/elite_four/anim/0/0.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png
index 64b23f061..64b23f061 100644
--- a/data/tilesets/secondary/elite_four/anim/0/1.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png
index 0d9f603fc..0d9f603fc 100644
--- a/data/tilesets/secondary/elite_four/anim/0/2.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png
index 64b23f061..64b23f061 100644
--- a/data/tilesets/secondary/elite_four/anim/0/3.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png
diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/0.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/0.png
diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/flowers/1.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/1.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/1.png
diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/flowers/2.png
index 4f8baa2a3..4f8baa2a3 100644
--- a/data/tilesets/secondary/ever_grande/anim/2.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/2.png
diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/flowers/3.png
index f120dee16..f120dee16 100644
--- a/data/tilesets/secondary/ever_grande/anim/3.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/3.png
diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/flowers/4.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/4.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/4.png
diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/flowers/5.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/5.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/5.png
diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/flowers/6.png
index d7cfd4529..d7cfd4529 100644
--- a/data/tilesets/secondary/ever_grande/anim/6.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/6.png
diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/flowers/7.png
index d7cfd4529..d7cfd4529 100644
--- a/data/tilesets/secondary/ever_grande/anim/7.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/7.png
diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/steam/0.png
index 434041fbd..434041fbd 100644
--- a/data/tilesets/secondary/lavaridge/anim/0.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/0.png
diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/steam/1.png
index ebc028ed4..ebc028ed4 100644
--- a/data/tilesets/secondary/lavaridge/anim/1.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/1.png
diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/steam/2.png
index aee227f05..aee227f05 100644
--- a/data/tilesets/secondary/lavaridge/anim/2.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/2.png
diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/steam/3.png
index 99149ae62..99149ae62 100644
--- a/data/tilesets/secondary/lavaridge/anim/3.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/3.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/flower_1/0.png
index b20c5470e..b20c5470e 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/0.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/0.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/1.png
index 0587295fc..0587295fc 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/1.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/flower_1/2.png
index af0dd4ffe..af0dd4ffe 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/2.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/2.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/flower_1/3.png
index bc132f2ef..bc132f2ef 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/3.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/3.png
diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/4.png
index 911b980a3..911b980a3 100644
--- a/data/tilesets/secondary/mauville/anim/1/a/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/4.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/flower_2/0.png
index b20c5470e..b20c5470e 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/0.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/0.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/1.png
index 0587295fc..0587295fc 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/1.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/flower_2/2.png
index af0dd4ffe..af0dd4ffe 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/2.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/2.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/flower_2/3.png
index bc132f2ef..bc132f2ef 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/3.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/3.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/4.png
index 911b980a3..911b980a3 100644
--- a/data/tilesets/secondary/mauville/anim/1/b/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/4.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png
index ebf603978..ebf603978 100644
--- a/data/tilesets/secondary/mauville_gym/anim/0.png
+++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png
index 34072707f..34072707f 100644
--- a/data/tilesets/secondary/mauville_gym/anim/1.png
+++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png
index 316eb500e..316eb500e 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png
index ee9d4316e..ee9d4316e 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png
index 221a71585..221a71585 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png
index 6d432eb25..6d432eb25 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png
index 7588b8a72..7588b8a72 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png
index 2a11e5065..2a11e5065 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png
index be4089ff4..be4089ff4 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/3.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png
index 4c16111de..4c16111de 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/4.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png
index 93bbc6375..93bbc6375 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/5.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png
index b08f5a0d9..b08f5a0d9 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/6.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png
index 1a5f0ae5c..1a5f0ae5c 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/7.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/fountain/0.png
index 07471595b..07471595b 100644
--- a/data/tilesets/secondary/rustboro/anim/1/0.png
+++ b/data/tilesets/secondary/rustboro/anim/fountain/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/fountain/1.png
index 408f2b03a..408f2b03a 100644
--- a/data/tilesets/secondary/rustboro/anim/1/1.png
+++ b/data/tilesets/secondary/rustboro/anim/fountain/1.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/windy_water/0.png
index af00b97c7..af00b97c7 100644
--- a/data/tilesets/secondary/rustboro/anim/0/0.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/windy_water/1.png
index 20b1ef630..20b1ef630 100644
--- a/data/tilesets/secondary/rustboro/anim/0/1.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/1.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/windy_water/2.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/2.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/2.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/windy_water/3.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/3.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/3.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/windy_water/4.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/4.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/4.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/windy_water/5.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/5.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/5.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/windy_water/6.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/6.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/6.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/windy_water/7.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/7.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/7.png
diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/balloons/0.png
index 28bf60f26..28bf60f26 100644
--- a/data/tilesets/secondary/slateport/anim/0.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/0.png
diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/balloons/1.png
index 31d22f697..31d22f697 100644
--- a/data/tilesets/secondary/slateport/anim/1.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/1.png
diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/balloons/2.png
index 83b0e3940..83b0e3940 100644
--- a/data/tilesets/secondary/slateport/anim/2.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/2.png
diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/balloons/3.png
index 31d22f697..31d22f697 100644
--- a/data/tilesets/secondary/slateport/anim/3.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/3.png
diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png
index 6ae032652..6ae032652 100644
--- a/data/tilesets/secondary/sootopolis/anim/0.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png
diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png
index 5bf8f7a98..5bf8f7a98 100644
--- a/data/tilesets/secondary/sootopolis/anim/1.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png
diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png
index 85598e145..85598e145 100644
--- a/data/tilesets/secondary/sootopolis/anim/2.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png
diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png
index c7aad10c7..c7aad10c7 100644
--- a/data/tilesets/secondary/sootopolis/anim/3.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png
diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png
index ec446b9db..ec446b9db 100644
--- a/data/tilesets/secondary/sootopolis/anim/4.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png
diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png
index cbe1769c0..cbe1769c0 100644
--- a/data/tilesets/secondary/sootopolis/anim/5.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png
diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png
index 690c5fd8e..690c5fd8e 100644
--- a/data/tilesets/secondary/sootopolis/anim/6.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png
diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png
index e4026a02f..e4026a02f 100644
--- a/data/tilesets/secondary/sootopolis/anim/7.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png
index dc6cf500e..dc6cf500e 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png
index 93dd79753..93dd79753 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png
index 30961482c..30961482c 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png
index 180b5522e..180b5522e 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png
index af3ab12d2..af3ab12d2 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png
index 8481c0cde..8481c0cde 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png
diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/seaweed/0.png
index fab28e54f..fab28e54f 100644
--- a/data/tilesets/secondary/underwater/anim/0.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/0.png
diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/seaweed/1.png
index 869bc6060..869bc6060 100644
--- a/data/tilesets/secondary/underwater/anim/1.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/1.png
diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/seaweed/2.png
index 64e4b267d..64e4b267d 100644
--- a/data/tilesets/secondary/underwater/anim/2.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/2.png
diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/seaweed/3.png
index 0c1392011..0c1392011 100644
--- a/data/tilesets/secondary/underwater/anim/3.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/3.png