2332 files changed, 81370 insertions, 65206 deletions

diff --git a/Makefile b/Makefile
index 32cc9df73..1841eb6b8 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE)
 PREPROC := tools/preproc/preproc$(EXE)
 RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
 FIX := tools/gbafix/gbafix$(EXE)
+MAPJSON := tools/mapjson/mapjson$(EXE)
 
 # Clear the default suffixes
 .SUFFIXES:
@@ -97,12 +98,16 @@ clean: tidy
 	rm -f sound/direct_sound_samples/*.bin
 	rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
+	rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
+	rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
+	find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
 
 tidy:
 	rm -f $(ROM) $(ELF) $(MAP)
 	rm -r build/*
 
 include graphics_file_rules.mk
+include map_data_rules.mk
 include spritesheet_rules.mk
 include songs.mk
 
@@ -121,6 +126,7 @@ include songs.mk
 sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
 sound/%.bin: sound/%.aif ; $(AIF) $< $@
 
+
 $(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
 $(C_BUILDDIR)/libc.o: CFLAGS := -O2
 
@@ -130,8 +136,7 @@ $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
 
-$(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
-$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
+$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
 
 $(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding
 
diff --git a/asm/contest.s b/asm/contest.s
deleted file mode 100644
index a9abd9430..000000000
--- a/asm/contest.s
+++ /dev/null
@@ -1,8290 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80DB884
-sub_80DB884: @ 80DB884
-	push {r4,lr}
-	movs r4, 0
-_080DB888:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80DB798
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DB888
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DB884
-
-	thumb_func_start sub_80DB89C
-sub_80DB89C: @ 80DB89C
-	push {lr}
-	movs r0, 0x4
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0x4
-	movs r1, 0x2
-	bl CopyWindowToVram
-	movs r0, 0
-	bl Contest_SetBgCopyFlags
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DB89C
-
-	thumb_func_start sub_80DB8B8
-sub_80DB8B8: @ 80DB8B8
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r5, r4, 0
-	adds r0, r4, 0
-	bl Contest_IsMonsTurnDisabled
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DB8D0
-	movs r0, 0
-	b _080DB90A
-_080DB8D0:
-	ldr r0, =gContestPlayerMonIndex
-	ldrb r0, [r0]
-	cmp r4, r0
-	beq _080DB8F4
-	adds r0, r4, 0
-	bl ContestAI_ResetAI
-	bl ContestAI_GetActionToUse
-	lsls r0, 24
-	ldr r2, =gContestMons
-	lsrs r0, 23
-	lsls r1, r4, 6
-	b _080DB902
-	.pool
-_080DB8F4:
-	ldr r2, =gContestMons
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	lsls r0, 1
-	lsls r1, r5, 6
-_080DB902:
-	adds r0, r1
-	adds r2, 0x1E
-	adds r0, r2
-	ldrh r0, [r0]
-_080DB90A:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DB8B8
-
-	thumb_func_start sub_80DB918
-sub_80DB918: @ 80DB918
-	push {r4,r5,lr}
-	movs r4, 0
-	movs r5, 0
-_080DB91E:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80DB8B8
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r1, [r1, 0x4]
-	adds r1, r5, r1
-	strh r0, [r1, 0x6]
-	adds r5, 0x1C
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DB91E
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DB918
-
-	thumb_func_start sub_80DB944
-sub_80DB944: @ 80DB944
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x8
-	ldr r5, =gContestResources
-	mov r4, sp
-	movs r3, 0
-	movs r6, 0x3
-_080DB956:
-	ldr r2, [r5]
-	ldr r1, [r2, 0x4]
-	adds r1, r3, r1
-	ldrh r0, [r1, 0x2]
-	ldrh r7, [r1, 0x4]
-	adds r0, r7
-	strh r0, [r1, 0x4]
-	ldr r0, [r2, 0x4]
-	adds r0, r3, r0
-	ldrh r0, [r0, 0x4]
-	strh r0, [r4]
-	adds r4, 0x2
-	adds r3, 0x1C
-	subs r6, 0x1
-	cmp r6, 0
-	bge _080DB956
-	movs r6, 0
-_080DB978:
-	movs r4, 0x3
-	cmp r4, r6
-	ble _080DB9A4
-_080DB97E:
-	subs r5, r4, 0x1
-	lsls r0, r5, 1
-	mov r1, sp
-	adds r3, r1, r0
-	lsls r0, r4, 1
-	adds r2, r1, r0
-	ldrh r4, [r3]
-	movs r7, 0
-	ldrsh r1, [r3, r7]
-	movs r7, 0
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	bge _080DB99E
-	ldrh r0, [r2]
-	strh r4, [r2]
-	strh r0, [r3]
-_080DB99E:
-	adds r4, r5, 0
-	cmp r4, r6
-	bgt _080DB97E
-_080DB9A4:
-	adds r6, 0x1
-	cmp r6, 0x2
-	ble _080DB978
-	movs r6, 0
-	movs r0, 0x4
-	negs r0, r0
-	mov r9, r0
-	ldr r1, =gContestResources
-	mov r8, r1
-	movs r7, 0x3
-	mov r12, r7
-_080DB9BA:
-	movs r4, 0
-	lsls r0, r6, 3
-	adds r7, r6, 0x1
-	subs r0, r6
-	lsls r5, r0, 2
-	mov r3, sp
-_080DB9C6:
-	mov r1, r8
-	ldr r0, [r1]
-	ldr r0, [r0, 0x4]
-	adds r2, r5, r0
-	movs r6, 0x4
-	ldrsh r1, [r2, r6]
-	movs r6, 0
-	ldrsh r0, [r3, r6]
-	cmp r1, r0
-	bne _080DB9F0
-	mov r0, r12
-	ands r4, r0
-	ldrb r1, [r2, 0xB]
-	mov r0, r9
-	ands r0, r1
-	orrs r0, r4
-	strb r0, [r2, 0xB]
-	b _080DB9F8
-	.pool
-_080DB9F0:
-	adds r3, 0x2
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DB9C6
-_080DB9F8:
-	adds r6, r7, 0
-	cmp r6, 0x3
-	ble _080DB9BA
-	movs r0, 0x1
-	bl sub_80DCE58
-	bl sub_80DD590
-	add sp, 0x8
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DB944
-
-	thumb_func_start sub_80DBA18
-sub_80DBA18: @ 80DBA18
-	push {r4,r5,lr}
-	ldr r4, =gContestResources
-	movs r2, 0
-	movs r3, 0x3
-_080DBA20:
-	ldr r0, [r4]
-	ldr r0, [r0, 0x4]
-	adds r1, r2, r0
-	ldrh r0, [r1, 0x6]
-	cmp r0, 0
-	bne _080DBA34
-	movs r1, 0x5
-	b _080DBA52
-	.pool
-_080DBA34:
-	movs r5, 0x2
-	ldrsh r0, [r1, r5]
-	movs r1, 0
-	cmp r0, 0
-	ble _080DBA52
-	movs r1, 0x1
-	cmp r0, 0x1D
-	ble _080DBA52
-	movs r1, 0x2
-	cmp r0, 0x3B
-	ble _080DBA52
-	movs r1, 0x4
-	cmp r0, 0x4F
-	bgt _080DBA52
-	movs r1, 0x3
-_080DBA52:
-	ldr r0, [r4]
-	ldr r0, [r0, 0x4]
-	adds r0, r2, r0
-	strb r1, [r0, 0x1A]
-	adds r2, 0x1C
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080DBA20
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DBA18
-
-	thumb_func_start sub_80DBA68
-sub_80DBA68: @ 80DBA68
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r2, [r1, 0x4]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r2, r1, r2
-	ldrb r1, [r2, 0xC]
-	movs r0, 0x6
-	ands r0, r1
-	cmp r0, 0
-	bne _080DBA90
-	ldrb r1, [r2, 0xB]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _080DBA98
-_080DBA90:
-	movs r0, 0
-	b _080DBA9A
-	.pool
-_080DBA98:
-	movs r0, 0x1
-_080DBA9A:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DBA68
-
-	thumb_func_start sub_80DBAA0
-sub_80DBAA0: @ 80DBAA0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r5, =gContestResources
-	movs r0, 0
-	mov r8, r0
-	movs r1, 0x7
-	negs r1, r1
-	mov r10, r1
-	movs r0, 0x2
-	negs r0, r0
-	mov r9, r0
-	movs r4, 0
-	movs r6, 0x3
-_080DBAC0:
-	ldr r1, [r5]
-	ldr r0, [r1, 0x4]
-	adds r0, r4, r0
-	movs r2, 0
-	strh r2, [r0, 0x2]
-	ldr r0, [r1, 0x4]
-	adds r0, r4, r0
-	strh r2, [r0]
-	ldr r0, [r1, 0x4]
-	adds r0, r4, r0
-	mov r1, r8
-	strb r1, [r0, 0x12]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r3, r4, r0
-	ldrb r2, [r3, 0xC]
-	movs r0, 0x6
-	ands r0, r2
-	cmp r0, 0
-	beq _080DBAFC
-	lsls r0, r2, 29
-	lsrs r0, 30
-	subs r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	lsls r0, 1
-	mov r1, r10
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r3, 0xC]
-_080DBAFC:
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r0, r4, r0
-	mov r1, r8
-	strb r1, [r0, 0xE]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x10]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1, 0x10]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r0, r4, r0
-	mov r1, r8
-	strb r1, [r0, 0xF]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x10]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x10]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x10]
-	movs r7, 0x5
-	negs r7, r7
-	adds r0, r7, 0
-	ands r0, r2
-	strb r0, [r1, 0x10]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x10]
-	movs r0, 0x9
-	negs r0, r0
-	mov r12, r0
-	ands r0, r2
-	strb r0, [r1, 0x10]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0xC]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1, 0xC]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r0, r4, r0
-	movs r1, 0xFF
-	strb r1, [r0, 0x13]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r0, r4, r0
-	movs r1, 0x1
-	negs r1, r1
-	strb r1, [r0, 0x14]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x10]
-	movs r0, 0x31
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x10]
-	ldr r0, [r5]
-	ldr r2, [r0, 0x4]
-	adds r2, r4, r2
-	ldrb r3, [r2, 0x15]
-	lsls r1, r3, 31
-	lsrs r1, 31
-	lsls r1, 2
-	adds r0, r7, 0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2, 0x15]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x15]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1, 0x15]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x11]
-	movs r0, 0x4
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x11]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x11]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x11]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r2, r4, r0
-	ldrb r1, [r2, 0x11]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _080DBBF4
-	ldrb r1, [r2, 0xC]
-	mov r0, r10
-	ands r0, r1
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r2, 0xC]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x11]
-	adds r0, r7, 0
-	ands r0, r2
-	strb r0, [r1, 0x11]
-_080DBBF4:
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r2, r4, r0
-	ldrb r1, [r2, 0x11]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _080DBC1A
-	ldrb r0, [r2, 0xB]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0xB]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x11]
-	mov r0, r12
-	ands r0, r2
-	strb r0, [r1, 0x11]
-_080DBC1A:
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x11]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x11]
-	adds r4, 0x1C
-	subs r6, 0x1
-	cmp r6, 0
-	blt _080DBC34
-	b _080DBAC0
-_080DBC34:
-	movs r6, 0
-	ldr r5, =gContestResources
-	movs r7, 0
-	movs r4, 0
-_080DBC3C:
-	ldr r3, [r5]
-	ldr r0, [r3, 0x4]
-	adds r0, r4, r0
-	ldrh r1, [r0, 0x6]
-	strh r1, [r0, 0x8]
-	ldr r2, [r3]
-	lsls r1, r6, 1
-	ldrb r0, [r2, 0x1]
-	lsls r0, 3
-	adds r1, r0
-	adds r2, 0x1C
-	adds r2, r1
-	ldr r0, [r3, 0x4]
-	adds r0, r4, r0
-	ldrh r0, [r0, 0x6]
-	strh r0, [r2]
-	ldr r0, [r3, 0x4]
-	adds r0, r4, r0
-	ldrh r0, [r0, 0x6]
-	bl Contest_GetMoveExcitement
-	ldr r1, [r5]
-	ldr r2, [r1]
-	ldrb r1, [r2, 0x1]
-	lsls r1, 2
-	adds r1, r6, r1
-	adds r2, 0x44
-	adds r2, r1
-	strb r0, [r2]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r0, r4, r0
-	strh r7, [r0, 0x6]
-	adds r4, 0x1C
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _080DBC3C
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0, 0x10]
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x1]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DBAA0
-
-	thumb_func_start Contest_IsMonsTurnDisabled
-Contest_IsMonsTurnDisabled: @ 80DBCA8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r2, [r1, 0x4]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r2, r1, r2
-	ldrb r1, [r2, 0xC]
-	movs r0, 0x6
-	ands r0, r1
-	cmp r0, 0
-	bne _080DBCD0
-	ldrb r1, [r2, 0xB]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _080DBCD8
-_080DBCD0:
-	movs r0, 0x1
-	b _080DBCDA
-	.pool
-_080DBCD8:
-	movs r0, 0
-_080DBCDA:
-	pop {r1}
-	bx r1
-	thumb_func_end Contest_IsMonsTurnDisabled
-
-	thumb_func_start sub_80DBCE0
-sub_80DBCE0: @ 80DBCE0
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl sub_80DBD34
-	ldr r1, =gUnknown_02039F18
-	lsls r4, 1
-	adds r1, r4, r1
-	strh r0, [r1]
-	ldr r2, =gUnknown_02039F08
-	adds r2, r4, r2
-	ldr r1, =gContestMonConditions
-	adds r4, r1
-	ldrh r4, [r4]
-	adds r0, r4
-	strh r0, [r2]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DBCE0
-
-	thumb_func_start sub_80DBD18
-sub_80DBD18: @ 80DBD18
-	push {r4,lr}
-	movs r4, 0
-_080DBD1C:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80DBCE0
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DBD1C
-	bl sub_80DBD4C
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DBD18
-
-	thumb_func_start sub_80DBD34
-sub_80DBD34: @ 80DBD34
-	lsls r0, 24
-	ldr r1, =gUnknown_02039F10
-	lsrs r0, 23
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	lsls r0, 17
-	asrs r0, 16
-	bx lr
-	.pool
-	thumb_func_end sub_80DBD34
-
-	thumb_func_start sub_80DBD4C
-sub_80DBD4C: @ 80DBD4C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x70
-	mov r0, sp
-	movs r1, 0
-	movs r2, 0x8
-	bl memset
-	movs r0, 0
-	mov r9, r0
-	mov r1, sp
-	adds r1, 0x8
-	str r1, [sp, 0x64]
-	mov r3, sp
-	adds r3, 0xC
-	str r3, [sp, 0x68]
-	mov r6, sp
-	adds r6, 0x14
-	str r6, [sp, 0x6C]
-	mov r4, sp
-_080DBD7A:
-	bl Random
-	strh r0, [r4]
-	movs r2, 0
-	cmp r2, r9
-	bge _080DBDB8
-	mov r1, sp
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r1]
-	cmp r0, r1
-	bne _080DBD9C
-	subs r4, 0x2
-	movs r7, 0x1
-	negs r7, r7
-	add r9, r7
-	b _080DBDB8
-_080DBD9C:
-	adds r2, 0x1
-	cmp r2, r9
-	bge _080DBDB8
-	lsls r0, r2, 1
-	mov r3, sp
-	adds r1, r3, r0
-	ldrh r0, [r4]
-	ldrh r1, [r1]
-	cmp r0, r1
-	bne _080DBD9C
-	subs r4, 0x2
-	movs r6, 0x1
-	negs r6, r6
-	add r9, r6
-_080DBDB8:
-	adds r4, 0x2
-	movs r7, 0x1
-	add r9, r7
-	mov r0, r9
-	cmp r0, 0x3
-	ble _080DBD7A
-	movs r1, 0
-	mov r9, r1
-	mov r4, sp
-	ldr r6, =gUnknown_02039F08
-	ldr r2, [sp, 0x64]
-	ldr r5, =gContestMonConditions
-	ldr r3, [sp, 0x68]
-_080DBDD2:
-	mov r7, r9
-	lsls r1, r7, 4
-	movs r7, 0
-	ldrsh r0, [r6, r7]
-	str r0, [r2]
-	movs r7, 0
-	ldrsh r0, [r5, r7]
-	str r0, [r3]
-	ldrh r0, [r4]
-	str r0, [r2, 0x8]
-	ldr r0, [sp, 0x6C]
-	adds r1, r0, r1
-	mov r7, r9
-	str r7, [r1]
-	adds r4, 0x2
-	adds r6, 0x2
-	adds r2, 0x10
-	adds r5, 0x2
-	adds r3, 0x10
-	movs r0, 0x1
-	add r9, r0
-	mov r1, r9
-	cmp r1, 0x3
-	ble _080DBDD2
-	movs r3, 0
-	mov r9, r3
-_080DBE06:
-	movs r4, 0x3
-	cmp r4, r9
-	ble _080DBE90
-	add r7, sp, 0x48
-	ldr r6, [sp, 0x68]
-	str r6, [sp, 0x58]
-	ldr r0, [sp, 0x64]
-	adds r0, 0x8
-	str r0, [sp, 0x5C]
-	ldr r1, [sp, 0x6C]
-	str r1, [sp, 0x60]
-_080DBE1C:
-	subs r3, r4, 0x1
-	mov r10, r3
-	mov r0, r10
-	adds r1, r4, 0
-	ldr r2, [sp, 0x64]
-	bl sub_80DBF30
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DBE8A
-	mov r6, r10
-	lsls r2, r6, 4
-	ldr r0, [sp, 0x64]
-	adds r3, r0, r2
-	ldr r0, [r3]
-	str r0, [sp, 0x48]
-	ldr r1, [sp, 0x58]
-	adds r6, r1, r2
-	ldr r0, [r6]
-	str r0, [r7, 0x4]
-	ldr r0, [sp, 0x5C]
-	adds r0, r2
-	mov r8, r0
-	ldr r0, [r0]
-	str r0, [r7, 0x8]
-	ldr r1, [sp, 0x60]
-	adds r2, r1, r2
-	ldr r0, [r2]
-	str r0, [r7, 0xC]
-	lsls r1, r4, 4
-	ldr r0, [sp, 0x64]
-	adds r5, r0, r1
-	ldr r0, [r5]
-	str r0, [r3]
-	ldr r3, [sp, 0x58]
-	adds r4, r3, r1
-	ldr r0, [r4]
-	str r0, [r6]
-	ldr r6, [sp, 0x5C]
-	adds r3, r6, r1
-	ldr r0, [r3]
-	mov r6, r8
-	str r0, [r6]
-	ldr r0, [sp, 0x60]
-	adds r1, r0, r1
-	ldr r0, [r1]
-	str r0, [r2]
-	ldr r0, [sp, 0x48]
-	str r0, [r5]
-	ldr r0, [r7, 0x4]
-	str r0, [r4]
-	ldr r0, [r7, 0x8]
-	str r0, [r3]
-	ldr r0, [r7, 0xC]
-	str r0, [r1]
-_080DBE8A:
-	mov r4, r10
-	cmp r4, r9
-	bgt _080DBE1C
-_080DBE90:
-	movs r1, 0x1
-	add r9, r1
-	mov r3, r9
-	cmp r3, 0x2
-	ble _080DBE06
-	movs r6, 0
-	mov r9, r6
-	ldr r2, =gContestFinalStandings
-	ldr r1, [sp, 0x6C]
-_080DBEA2:
-	ldr r0, [r1]
-	adds r0, r2
-	mov r7, r9
-	strb r7, [r0]
-	adds r1, 0x10
-	movs r0, 0x1
-	add r9, r0
-	mov r3, r9
-	cmp r3, 0x3
-	ble _080DBEA2
-	add sp, 0x70
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DBD4C
-
-	thumb_func_start sub_80DBED4
-sub_80DBED4: @ 80DBED4
-	push {lr}
-	ldr r0, =gIsLinkContest
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080DBF0E
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldr r1, =gContestFinalStandings
-	ldr r0, =gContestPlayerMonIndex
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r1, 1
-	ldr r0, =gSpecialVar_ContestCategory
-	ldrh r0, [r0]
-	lsls r0, 3
-	adds r1, r0
-	ldr r0, =0x00000624
-	adds r2, r0
-	adds r2, r1
-	ldrh r0, [r2]
-	adds r0, 0x1
-	ldr r1, =0x0000270f
-	cmp r0, r1
-	ble _080DBF0C
-	adds r0, r1, 0
-_080DBF0C:
-	strh r0, [r2]
-_080DBF0E:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DBED4
-
-	thumb_func_start sub_80DBF30
-sub_80DBF30: @ 80DBF30
-	push {lr}
-	lsls r0, 4
-	adds r0, r2
-	lsls r1, 4
-	adds r3, r1, r2
-	ldr r2, [r0]
-	ldr r1, [r3]
-	cmp r2, r1
-	blt _080DBF60
-	cmp r2, r1
-	bgt _080DBF52
-	ldr r2, [r0, 0x4]
-	ldr r1, [r3, 0x4]
-	cmp r2, r1
-	blt _080DBF60
-	cmp r2, r1
-	ble _080DBF56
-_080DBF52:
-	movs r2, 0
-	b _080DBF62
-_080DBF56:
-	ldr r1, [r0, 0x8]
-	ldr r0, [r3, 0x8]
-	movs r2, 0
-	cmp r1, r0
-	bge _080DBF62
-_080DBF60:
-	movs r2, 0x1
-_080DBF62:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DBF30
-
-	thumb_func_start sub_80DBF68
-sub_80DBF68: @ 80DBF68
-	push {lr}
-	ldr r0, =gBattle_BG0_Y
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gBattle_BG2_Y
-	strh r1, [r0]
-	bl sub_80DB89C
-	ldr r0, =gUnknown_0827E8DA
-	movs r1, 0
-	bl Contest_StartTextPrinter
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DBF68
-
-	thumb_func_start sub_80DBF90
-sub_80DBF90: @ 80DBF90
-	push {r4,r5,lr}
-	sub sp, 0xC
-	movs r5, 0x80
-	lsls r5, 18
-	movs r4, 0x3
-_080DBF9A:
-	lsrs r3, r5, 24
-	movs r0, 0x8
-	str r0, [sp]
-	movs r0, 0x2
-	str r0, [sp, 0x4]
-	movs r0, 0x11
-	str r0, [sp, 0x8]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x16
-	bl ContestBG_FillBoxWithTile
-	movs r0, 0xA0
-	lsls r0, 19
-	adds r5, r0
-	subs r4, 0x1
-	cmp r4, 0
-	bge _080DBF9A
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DBF90
-
-	thumb_func_start sub_80DBFC8
-sub_80DBFC8: @ 80DBFC8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =0x00005011
-	cmp r0, 0
-	beq _080DBFE2
-	ldr r1, =0x00006011
-	cmp r0, 0x1
-	beq _080DBFE2
-	ldr r1, =0x00008011
-	cmp r0, 0x2
-	bne _080DBFE2
-	ldr r1, =0x00007011
-_080DBFE2:
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DBFC8
-
-	thumb_func_start sub_80DBFFC
-sub_80DBFFC: @ 80DBFFC
-	push {lr}
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0xA
-	bl __divsi3
-	lsls r0, 24
-	lsrs r1, r0, 24
-	asrs r2, r0, 24
-	cmp r2, 0x10
-	ble _080DC016
-	movs r1, 0x10
-	b _080DC020
-_080DC016:
-	movs r0, 0x10
-	negs r0, r0
-	cmp r2, r0
-	bge _080DC020
-	movs r1, 0xF0
-_080DC020:
-	lsls r0, r1, 24
-	asrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DBFFC
-
-	thumb_func_start sub_80DC028
-sub_80DC028: @ 80DC028
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 16
-	lsrs r6, 16
-	lsls r2, 24
-	lsrs r2, 24
-	mov r8, r2
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x14]
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrb r0, [r1, 0x2]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1, 0x2]
-	ldr r0, =sub_80DC0F4
-	movs r1, 0x14
-	bl CreateTask
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r5, 16
-	asrs r5, 16
-	adds r0, r5, 0
-	bl sub_80DBFFC
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r6, 16
-	asrs r6, 16
-	adds r5, r6
-	lsls r5, 16
-	asrs r5, 16
-	adds r0, r5, 0
-	bl sub_80DBFFC
-	lsls r4, 24
-	asrs r4, 24
-	subs r0, r4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	mov r0, r8
-	bl sub_80DBFC8
-	ldr r2, =gTasks
-	lsls r3, r7, 2
-	adds r0, r3, r7
-	lsls r0, 3
-	adds r1, r0, r2
-	adds r0, r4, 0
-	cmp r4, 0
-	bge _080DC0A0
-	negs r0, r4
-_080DC0A0:
-	strh r0, [r1, 0x8]
-	lsls r0, r5, 24
-	asrs r0, 24
-	strh r0, [r1, 0xA]
-	cmp r4, 0
-	bgt _080DC0B4
-	cmp r4, 0
-	bne _080DC0C8
-	cmp r0, 0
-	ble _080DC0C8
-_080DC0B4:
-	movs r0, 0x1
-	strh r0, [r1, 0xC]
-	b _080DC0D6
-	.pool
-_080DC0C8:
-	ldr r2, =gTasks
-	lsls r3, r7, 2
-	adds r0, r3, r7
-	lsls r0, 3
-	adds r0, r2
-	ldr r1, =0x0000ffff
-	strh r1, [r0, 0xC]
-_080DC0D6:
-	adds r0, r3, r7
-	lsls r0, 3
-	adds r0, r2
-	mov r1, r8
-	strh r1, [r0, 0xE]
-	adds r0, r7, 0
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DC028
-
-	thumb_func_start sub_80DC0F4
-sub_80DC0F4: @ 80DC0F4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r1, =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrb r0, [r4, 0xE]
-	mov r9, r0
-	ldrh r3, [r4, 0x8]
-	ldrh r1, [r4, 0xA]
-	ldrh r0, [r4, 0x1C]
-	adds r0, 0x1
-	strh r0, [r4, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xE
-	bgt _080DC126
-	b _080DC2A8
-_080DC126:
-	movs r0, 0
-	strh r0, [r4, 0x1C]
-	ldrh r2, [r4, 0xA]
-	movs r5, 0xA
-	ldrsh r0, [r4, r5]
-	cmp r0, 0
-	bne _080DC15C
-	adds r0, r7, 0
-	bl DestroyTask
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x14]
-	mov r2, r9
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrb r2, [r1, 0x2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x2]
-	b _080DC2A8
-	.pool
-_080DC15C:
-	cmp r3, 0
-	bne _080DC1A4
-	lsls r0, r1, 16
-	mov r8, r0
-	cmp r0, 0
-	bge _080DC17A
-	mov r0, r9
-	bl sub_80DBFC8
-	adds r0, 0x2
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	b _080DC188
-_080DC17A:
-	mov r0, r9
-	bl sub_80DBFC8
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldrh r0, [r4, 0xA]
-	subs r0, 0x1
-_080DC188:
-	strh r0, [r4, 0xA]
-	ldr r1, =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x8]
-	adds r2, r1, 0x1
-	strh r2, [r0, 0x8]
-	lsls r1, 24
-	lsrs r5, r1, 24
-	b _080DC210
-	.pool
-_080DC1A4:
-	movs r3, 0xC
-	ldrsh r0, [r4, r3]
-	cmp r0, 0
-	bge _080DC1DE
-	lsls r0, r1, 16
-	mov r8, r0
-	cmp r0, 0
-	bge _080DC1CC
-	ldrh r0, [r4, 0x8]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x8]
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r2, 0x1
-	strh r0, [r4, 0xA]
-	mov r0, r9
-	bl sub_80DBFC8
-	adds r0, 0x2
-	b _080DC20C
-_080DC1CC:
-	ldrh r0, [r4, 0x8]
-	subs r0, 0x1
-	strh r0, [r4, 0x8]
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r6, 0
-	subs r0, r2, 0x1
-	strh r0, [r4, 0xA]
-	b _080DC210
-_080DC1DE:
-	lsls r0, r1, 16
-	mov r8, r0
-	cmp r0, 0
-	bge _080DC1F8
-	ldrh r0, [r4, 0x8]
-	subs r0, 0x1
-	strh r0, [r4, 0x8]
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r6, 0
-	adds r0, r2, 0x1
-	strh r0, [r4, 0xA]
-	b _080DC210
-_080DC1F8:
-	ldrh r0, [r4, 0x8]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x8]
-	lsls r0, 24
-	lsrs r5, r0, 24
-	subs r0, r2, 0x1
-	strh r0, [r4, 0xA]
-	mov r0, r9
-	bl sub_80DBFC8
-_080DC20C:
-	lsls r0, 16
-	lsrs r6, r0, 16
-_080DC210:
-	str r5, [sp, 0xC]
-	movs r0, 0
-	mov r10, r0
-	cmp r5, 0x7
-	bls _080DC226
-	movs r2, 0x1
-	mov r10, r2
-	adds r0, r5, 0
-	subs r0, 0x8
-	lsls r0, 24
-	lsrs r5, r0, 24
-_080DC226:
-	adds r2, r5, 0
-	adds r2, 0x16
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r0, =gUnknown_02039F26
-	add r0, r9
-	ldrb r0, [r0]
-	lsls r3, r0, 2
-	adds r3, r0
-	adds r3, 0x2
-	add r3, r10
-	lsls r3, 24
-	lsrs r3, 24
-	movs r0, 0x1
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	movs r0, 0x11
-	str r0, [sp, 0x8]
-	movs r0, 0
-	adds r1, r6, 0
-	bl ContestBG_FillBoxWithTile
-	mov r3, r8
-	cmp r3, 0
-	ble _080DC284
-	movs r0, 0x60
-	bl PlaySE
-	ldr r4, =gMPlayInfo_SE1
-	adds r0, r4, 0
-	bl m4aMPlayImmInit
-	ldr r1, =0x0000ffff
-	ldr r0, [sp, 0xC]
-	lsls r2, r0, 24
-	asrs r2, 16
-	adds r0, r4, 0
-	bl m4aMPlayPitchControl
-	b _080DC28A
-	.pool
-_080DC284:
-	movs r0, 0x16
-	bl PlaySE
-_080DC28A:
-	mov r2, r10
-	cmp r2, 0
-	bne _080DC2A8
-	cmp r5, 0
-	bne _080DC2A8
-	cmp r6, 0
-	bne _080DC2A8
-	ldr r0, =gTasks
-	lsls r1, r7, 2
-	adds r1, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0xC]
-	negs r0, r0
-	strh r0, [r1, 0xC]
-_080DC2A8:
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC0F4
-
-	thumb_func_start sub_80DC2BC
-sub_80DC2BC: @ 80DC2BC
-	push {r4,r5,lr}
-	ldr r0, =gUnknown_08587A74
-	bl LoadSpriteSheet
-	movs r4, 0
-	ldr r5, =gUnknown_08587A6C
-_080DC2C8:
-	ldr r0, =gUnknown_02039F26
-	adds r0, r4, r0
-	ldrb r0, [r0]
-	adds r0, r5
-	ldrb r2, [r0]
-	ldr r0, =gSpriteTemplate_8587AD0
-	movs r1, 0xB4
-	movs r3, 0x1
-	bl CreateSprite
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r2, [r1, 0x14]
-	lsls r1, r4, 2
-	adds r1, r2
-	strb r0, [r1]
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DC2C8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC2BC
-
-	thumb_func_start sub_80DC308
-sub_80DC308: @ 80DC308
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r4, =gContestResources
-	ldr r0, [r4]
-	ldr r2, [r0, 0x14]
-	lsls r3, r6, 2
-	adds r2, r3, r2
-	ldrb r0, [r2, 0x2]
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2, 0x2]
-	ldr r1, [r4]
-	ldr r0, [r1, 0x14]
-	adds r3, r0
-	ldrb r7, [r3]
-	ldr r1, [r1, 0x4]
-	lsls r0, r6, 3
-	subs r0, r6
-	lsls r0, 2
-	adds r0, r1
-	movs r1, 0x4
-	ldrsh r0, [r0, r1]
-	movs r1, 0xA
-	bl __divsi3
-	lsls r0, 17
-	lsrs r5, r0, 16
-	asrs r0, 16
-	cmp r0, 0x38
-	ble _080DC350
-	movs r5, 0x38
-	b _080DC356
-	.pool
-_080DC350:
-	cmp r0, 0
-	bge _080DC356
-	movs r5, 0
-_080DC356:
-	ldr r2, =gSprites
-	lsls r3, r7, 4
-	adds r0, r3, r7
-	lsls r0, 2
-	adds r4, r0, r2
-	movs r0, 0x3E
-	adds r0, r4
-	mov r12, r0
-	ldrb r1, [r0]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	mov r1, r12
-	strb r0, [r1]
-	strh r6, [r4, 0x2E]
-	strh r5, [r4, 0x30]
-	lsls r0, r5, 16
-	asrs r0, 16
-	movs r5, 0x24
-	ldrsh r1, [r4, r5]
-	cmp r0, r1
-	ble _080DC38C
-	movs r0, 0x1
-	b _080DC38E
-	.pool
-_080DC38C:
-	ldr r0, =0x0000ffff
-_080DC38E:
-	strh r0, [r4, 0x32]
-	adds r0, r3, r7
-	lsls r0, 2
-	adds r1, r2, 0
-	adds r1, 0x1C
-	adds r0, r1
-	ldr r1, =sub_80DC408
-	str r1, [r0]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC308
-
-	thumb_func_start sub_80DC3AC
-sub_80DC3AC: @ 80DC3AC
-	push {r4,lr}
-	movs r4, 0
-_080DC3B0:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80DC308
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DC3B0
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DC3AC
-
-	thumb_func_start sub_80DC3C4
-sub_80DC3C4: @ 80DC3C4
-	push {r4,lr}
-	movs r2, 0
-	ldr r3, =gContestResources
-	ldr r0, [r3]
-	ldr r0, [r0, 0x14]
-	ldrb r1, [r0, 0x2]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _080DC3F2
-	movs r4, 0x1
-_080DC3DA:
-	adds r2, 0x1
-	cmp r2, 0x3
-	bgt _080DC3F2
-	ldr r0, [r3]
-	ldr r1, [r0, 0x14]
-	lsls r0, r2, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x2]
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080DC3DA
-_080DC3F2:
-	cmp r2, 0x4
-	beq _080DC400
-	movs r0, 0
-	b _080DC402
-	.pool
-_080DC400:
-	movs r0, 0x1
-_080DC402:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DC3C4
-
-	thumb_func_start sub_80DC408
-sub_80DC408: @ 80DC408
-	push {r4,lr}
-	adds r3, r0, 0
-	ldrh r2, [r3, 0x24]
-	movs r0, 0x24
-	ldrsh r1, [r3, r0]
-	movs r4, 0x30
-	ldrsh r0, [r3, r4]
-	cmp r1, r0
-	bne _080DC440
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	movs r2, 0x2E
-	ldrsh r1, [r3, r2]
-	ldr r0, [r0, 0x14]
-	lsls r1, 2
-	adds r1, r0
-	ldrb r2, [r1, 0x2]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x2]
-	ldr r0, =SpriteCallbackDummy
-	str r0, [r3, 0x1C]
-	b _080DC446
-	.pool
-_080DC440:
-	ldrh r0, [r3, 0x32]
-	adds r0, r2, r0
-	strh r0, [r3, 0x24]
-_080DC446:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DC408
-
-	thumb_func_start sub_80DC44C
-sub_80DC44C: @ 80DC44C
-	push {r4-r6,lr}
-	movs r2, 0
-	ldr r6, =gSprites
-	ldr r5, =gContestResources
-	ldr r4, =gUnknown_08587A6C
-	ldr r3, =gUnknown_02039F26
-_080DC458:
-	ldr r0, [r5]
-	ldr r1, [r0, 0x14]
-	lsls r0, r2, 2
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	adds r0, r2, r3
-	ldrb r0, [r0]
-	adds r0, r4
-	ldrb r0, [r0]
-	strh r0, [r1, 0x22]
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _080DC458
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC44C
-
-	thumb_func_start sub_80DC490
-sub_80DC490: @ 80DC490
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r3, 0
-	ldr r7, =gUnknown_02039F26
-	ldr r5, =gSprites
-	ldr r4, =gContestResources
-	movs r2, 0
-_080DC4A0:
-	adds r0, r3, r7
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bls _080DC4E2
-	cmp r6, 0
-	bne _080DC4CC
-	ldr r0, [r4]
-	ldr r0, [r0, 0x14]
-	adds r0, r2, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0xB4
-	b _080DC4E0
-	.pool
-_080DC4CC:
-	ldr r0, [r4]
-	ldr r0, [r0, 0x14]
-	adds r0, r2, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x80
-	lsls r1, 1
-_080DC4E0:
-	strh r1, [r0, 0x20]
-_080DC4E2:
-	adds r2, 0x4
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _080DC4A0
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DC490
-
-	thumb_func_start sub_80DC4F0
-sub_80DC4F0: @ 80DC4F0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r0, =gUnknown_08587B08
-	bl LoadSpritePalette
-	movs r5, 0
-	ldr r7, =gContestResources
-	ldr r0, =gSprites
-	mov r8, r0
-	movs r6, 0
-_080DC506:
-	lsls r0, r5, 3
-	ldr r1, =gUnknown_08587AE8
-	adds r0, r1
-	bl LoadCompressedSpriteSheet
-	ldr r0, =gSpriteTemplate_8587B18
-	adds r0, r6, r0
-	ldr r2, =gUnknown_08587A70
-	ldr r1, =gUnknown_02039F26
-	adds r1, r5, r1
-	ldrb r1, [r1]
-	adds r1, r2
-	ldrb r2, [r1]
-	movs r1, 0xCC
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r7]
-	ldr r1, [r1, 0x14]
-	lsls r4, r5, 2
-	adds r1, r4, r1
-	strb r0, [r1, 0x1]
-	ldr r0, [r7]
-	ldr r0, [r0, 0x14]
-	adds r0, r4, r0
-	ldrb r1, [r0, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	add r0, r8
-	ldr r1, =gSubspriteTables_8587B80
-	bl SetSubspriteTables
-	ldr r0, [r7]
-	ldr r0, [r0, 0x14]
-	adds r4, r0
-	ldrb r1, [r4, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	add r0, r8
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	adds r6, 0x18
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DC506
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC4F0
-
-	thumb_func_start sub_80DC594
-sub_80DC594: @ 80DC594
-	push {lr}
-	ldr r0, =gUnknown_08587BB0
-	bl LoadCompressedSpriteSheet
-	ldr r0, =gUnknown_08587BB8
-	bl LoadSpritePalette
-	ldr r0, =gSpriteTemplate_8587BC8
-	movs r1, 0x1E
-	movs r2, 0x2C
-	movs r3, 0x1
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	movs r3, 0x4
-	orrs r2, r3
-	strb r2, [r1]
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r1, [r1]
-	adds r1, 0x58
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC594
-
-	thumb_func_start sub_80DC5E8
-sub_80DC5E8: @ 80DC5E8
-	push {r4,lr}
-	ldr r0, =sub_80DC728
-	movs r1, 0x1E
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r1, [r1]
-	strb r0, [r1, 0xD]
-	movs r2, 0
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r4, =gTasks + 0x8
-	movs r3, 0xFF
-_080DC60A:
-	lsls r0, r2, 3
-	adds r0, r1
-	adds r0, r4
-	strh r3, [r0]
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x3
-	bls _080DC60A
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC5E8
-
-	thumb_func_start sub_80DC630
-sub_80DC630: @ 80DC630
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r3, =gTasks
-	ldr r1, =gContestResources
-	ldr r5, [r1]
-	ldr r1, [r5]
-	ldrb r2, [r1, 0xD]
-	lsls r1, r2, 2
-	adds r1, r2
-	adds r1, r0
-	lsls r1, 3
-	adds r3, 0x8
-	adds r1, r3
-	movs r4, 0
-	strh r4, [r1]
-	lsls r0, 2
-	adds r0, 0x1
-	lsls r0, 1
-	ldr r1, [r5]
-	ldrb r2, [r1, 0xD]
-	lsls r1, r2, 2
-	adds r1, r2
-	lsls r1, 3
-	adds r0, r1
-	adds r0, r3
-	strh r4, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC630
-
-	thumb_func_start sub_80DC674
-sub_80DC674: @ 80DC674
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, =sub_80DC6A4
-	movs r1, 0x1F
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r4, [r1, 0x8]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC674
-
-	thumb_func_start sub_80DC6A4
-sub_80DC6A4: @ 80DC6A4
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r0, 0
-	ldr r2, =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r0, r2
-	ldrb r0, [r0, 0x8]
-	adds r5, r0, 0
-	ldr r0, =gContestResources
-	ldr r4, [r0]
-	ldr r0, [r4]
-	ldrb r1, [r0, 0xD]
-	lsls r0, r1, 2
-	adds r0, r1
-	adds r0, r5
-	lsls r0, 3
-	adds r7, r2, 0
-	adds r7, 0x8
-	adds r1, r0, r7
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _080DC6DC
-	cmp r0, 0xFF
-	bne _080DC716
-_080DC6DC:
-	movs r3, 0
-	movs r0, 0xFF
-	strh r0, [r1]
-	lsls r1, r5, 2
-	adds r1, 0x1
-	lsls r1, 1
-	ldr r0, [r4]
-	ldrb r2, [r0, 0xD]
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r1, r0
-	adds r1, r7
-	strh r3, [r1]
-	ldr r0, [r4]
-	adds r0, 0x14
-	adds r0, r5
-	ldrb r0, [r0]
-	adds r0, 0x5
-	lsls r0, 4
-	adds r0, 0x6
-	ldr r3, =0x00004bff
-	movs r1, 0x2
-	movs r2, 0
-	bl BlendPalette
-	adds r0, r6, 0
-	bl DestroyTask
-_080DC716:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC6A4
-
-	thumb_func_start sub_80DC728
-sub_80DC728: @ 80DC728
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	movs r6, 0
-	lsls r1, r0, 2
-	adds r1, r0
-	mov r9, r1
-	lsls r7, r1, 3
-	ldr r0, =gTasks + 0x8
-	mov r8, r0
-	movs r1, 0x8
-	negs r1, r1
-	add r1, r8
-	mov r10, r1
-_080DC74C:
-	lsls r0, r6, 26
-	lsrs r3, r0, 24
-	lsls r0, r3, 1
-	adds r0, r7
-	mov r4, r8
-	adds r2, r0, r4
-	ldrh r4, [r2]
-	movs r5, 0
-	ldrsh r0, [r2, r5]
-	cmp r0, 0xFF
-	beq _080DC7CA
-	adds r0, r3, 0x1
-	lsls r1, r0, 1
-	adds r1, r7
-	add r1, r8
-	movs r5, 0
-	ldrsh r1, [r1, r5]
-	adds r5, r0, 0
-	cmp r1, 0
-	bne _080DC77C
-	adds r0, r4, 0x1
-	b _080DC77E
-	.pool
-_080DC77C:
-	subs r0, r4, 0x1
-_080DC77E:
-	strh r0, [r2]
-	lsls r1, r3, 1
-	mov r0, r9
-	lsls r2, r0, 3
-	adds r0, r1, r2
-	mov r3, r10
-	adds r3, 0x8
-	adds r0, r3
-	movs r4, 0
-	ldrsh r0, [r0, r4]
-	adds r4, r1, 0
-	cmp r0, 0x10
-	beq _080DC79C
-	cmp r0, 0
-	bne _080DC7AA
-_080DC79C:
-	lsls r0, r5, 1
-	adds r0, r2
-	adds r0, r3
-	ldrh r1, [r0]
-	movs r2, 0x1
-	eors r1, r2
-	strh r1, [r0]
-_080DC7AA:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	adds r0, 0x14
-	adds r0, r6
-	ldrb r0, [r0]
-	adds r0, 0x5
-	lsls r0, 4
-	adds r0, 0x6
-	adds r1, r4, r7
-	add r1, r8
-	ldrb r2, [r1]
-	movs r1, 0x2
-	ldr r3, =0x00004bff
-	bl BlendPalette
-_080DC7CA:
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x3
-	bls _080DC74C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC728
-
-	thumb_func_start sub_80DC7EC
-sub_80DC7EC: @ 80DC7EC
-	push {r4,lr}
-	ldr r0, =sub_80DC8D0
-	movs r1, 0x1E
-	bl CreateTask
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r1, [r1]
-	strb r0, [r1, 0xE]
-	movs r4, 0
-_080DC800:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80DC81C
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DC800
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC7EC
-
-	thumb_func_start sub_80DC81C
-sub_80DC81C: @ 80DC81C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r3, =gTasks
-	ldr r1, =gContestResources
-	ldr r4, [r1]
-	ldr r1, [r4]
-	ldrb r2, [r1, 0xE]
-	lsls r1, r2, 2
-	adds r1, r2
-	adds r1, r0
-	lsls r1, 3
-	adds r3, 0x8
-	adds r1, r3
-	movs r5, 0
-	movs r2, 0xFF
-	strh r2, [r1]
-	lsls r0, 2
-	adds r0, 0x1
-	lsls r0, 1
-	ldr r1, [r4]
-	ldrb r2, [r1, 0xE]
-	lsls r1, r2, 2
-	adds r1, r2
-	lsls r1, 3
-	adds r0, r1
-	adds r0, r3
-	strh r5, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC81C
-
-	thumb_func_start sub_80DC864
-sub_80DC864: @ 80DC864
-	push {r4,lr}
-	movs r4, 0
-_080DC868:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80DC87C
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DC868
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DC864
-
-	thumb_func_start sub_80DC87C
-sub_80DC87C: @ 80DC87C
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl sub_80DC81C
-	adds r0, r4, 0x5
-	lsls r2, r0, 5
-	ldr r3, =gPlttBufferUnfaded + 0x14
-	adds r6, r2, r3
-	ldr r5, =gPlttBufferFaded + 0x14
-	adds r2, r5
-	ldr r1, =0x040000d4
-	str r6, [r1]
-	str r2, [r1, 0x4]
-	ldr r2, =0x80000001
-	str r2, [r1, 0x8]
-	ldr r6, [r1, 0x8]
-	lsls r0, 4
-	adds r4, 0xC
-	adds r0, r4
-	lsls r0, 1
-	subs r3, 0x14
-	adds r3, r0, r3
-	subs r5, 0x14
-	adds r0, r5
-	str r3, [r1]
-	str r0, [r1, 0x4]
-	str r2, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC87C
-
-	thumb_func_start sub_80DC8D0
-sub_80DC8D0: @ 80DC8D0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	movs r7, 0
-	lsls r1, r0, 2
-	adds r1, r0
-	mov r9, r1
-	lsls r6, r1, 3
-	ldr r0, =gTasks + 0x8
-	mov r8, r0
-	ldr r1, =0x00004bff
-	mov r10, r1
-_080DC8F0:
-	lsls r0, r7, 26
-	lsrs r3, r0, 24
-	lsls r0, r3, 1
-	adds r0, r6
-	mov r4, r8
-	adds r2, r0, r4
-	movs r5, 0
-	ldrsh r0, [r2, r5]
-	cmp r0, 0xFF
-	beq _080DC996
-	adds r0, r3, 0x2
-	lsls r0, 1
-	adds r0, r6
-	adds r1, r0, r4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	movs r4, 0
-	strh r0, [r1]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	ble _080DC996
-	strh r4, [r1]
-	adds r0, r3, 0x1
-	lsls r1, r0, 1
-	adds r1, r6
-	add r1, r8
-	movs r4, 0
-	ldrsh r1, [r1, r4]
-	adds r4, r0, 0
-	cmp r1, 0
-	bne _080DC940
-	ldrh r0, [r2]
-	adds r0, 0x1
-	b _080DC944
-	.pool
-_080DC940:
-	ldrh r0, [r2]
-	subs r0, 0x1
-_080DC944:
-	strh r0, [r2]
-	lsls r1, r3, 1
-	mov r5, r9
-	lsls r2, r5, 3
-	adds r0, r1, r2
-	ldr r3, =gTasks
-	adds r3, 0x8
-	adds r0, r3
-	movs r5, 0
-	ldrsh r0, [r0, r5]
-	adds r5, r1, 0
-	cmp r0, 0x10
-	beq _080DC962
-	cmp r0, 0
-	bne _080DC970
-_080DC962:
-	lsls r0, r4, 1
-	adds r0, r2
-	adds r0, r3
-	ldrh r1, [r0]
-	movs r2, 0x1
-	eors r1, r2
-	strh r1, [r0]
-_080DC970:
-	adds r4, r7, 0x5
-	lsls r4, 4
-	adds r0, r4, 0
-	adds r0, 0xA
-	adds r5, r6
-	add r5, r8
-	ldrb r2, [r5]
-	movs r1, 0x1
-	mov r3, r10
-	bl BlendPalette
-	adds r4, 0xC
-	adds r4, r7
-	ldrb r2, [r5]
-	adds r0, r4, 0
-	movs r1, 0x1
-	mov r3, r10
-	bl BlendPalette
-_080DC996:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0x3
-	bls _080DC8F0
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DC8D0
-
-	thumb_func_start sub_80DC9B4
-sub_80DC9B4: @ 80DC9B4
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x15]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080DC9E0
-	adds r0, r2, 0
-	bl sub_80DC630
-	b _080DC9E6
-	.pool
-_080DC9E0:
-	adds r0, r2, 0
-	bl sub_80DC674
-_080DC9E6:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DC9B4
-
-	thumb_func_start sub_80DC9EC
-sub_80DC9EC: @ 80DC9EC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp, 0xC]
-	ldr r6, =gUnknown_02039F26
-	adds r6, r0, r6
-	ldrb r0, [r6]
-	lsls r5, r0, 2
-	adds r5, r0
-	lsls r5, 27
-	movs r0, 0x80
-	lsls r0, 22
-	adds r5, r0
-	lsrs r5, 24
-	ldr r1, [sp, 0xC]
-	lsls r4, r1, 3
-	ldr r0, =gUnknown_08589904
-	adds r0, r4, r0
-	bl LoadCompressedSpriteSheet
-	ldr r0, =gUnknown_08589924
-	adds r4, r0
-	adds r0, r4, 0
-	bl LoadSpritePalette
-	ldr r2, [sp, 0xC]
-	lsls r4, r2, 1
-	adds r4, r2
-	lsls r4, 3
-	ldr r0, =gSpriteTemplate_858998C
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0xB8
-	adds r2, r5, 0
-	movs r3, 0x1D
-	bl CreateSprite
-	mov r9, r0
-	mov r3, r9
-	lsls r3, 24
-	lsrs r3, 24
-	mov r9, r3
-	adds r0, r4, 0
-	movs r1, 0xF8
-	adds r2, r5, 0
-	movs r3, 0x1D
-	bl CreateSprite
-	mov r8, r0
-	mov r0, r8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r5, r0, 4
-	add r5, r8
-	lsls r5, 2
-	ldr r1, =gSprites
-	adds r5, r1
-	ldrh r2, [r5, 0x4]
-	lsls r1, r2, 22
-	lsrs r1, 22
-	adds r1, 0x40
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r1, r0
-	ldr r0, =0xfffffc00
-	ands r0, r2
-	orrs r0, r1
-	strh r0, [r5, 0x4]
-	movs r4, 0xC0
-	lsls r4, 19
-	ldrb r0, [r6]
-	lsls r3, r0, 2
-	adds r3, r0
-	lsls r3, 6
-	ldr r0, =0x0600e026
-	adds r3, r0
-	ldr r7, =gContestResources
-	ldr r0, [r7]
-	ldr r0, [r0, 0x34]
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0x3
-	adds r2, r4, 0
-	bl CopySpriteTiles
-	ldrb r0, [r6]
-	lsls r3, r0, 2
-	adds r3, r0
-	lsls r3, 6
-	ldr r1, =0x0600e036
-	adds r3, r1
-	ldr r0, [r7]
-	ldr r0, [r0, 0x38]
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0x3
-	adds r2, r4, 0
-	bl CopySpriteTiles
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r0, [r7]
-	ldr r1, [r0, 0x34]
-	movs r6, 0xA0
-	lsls r6, 3
-	adds r1, r6
-	ldr r2, =0x050000c0
-	mov r10, r2
-	add r0, sp, 0x4
-	bl CpuSet
-	str r4, [sp, 0x8]
-	add r0, sp, 0x8
-	ldr r1, [r7]
-	ldr r1, [r1, 0x38]
-	adds r1, r6
-	mov r2, r10
-	bl CpuSet
-	ldr r0, [r7]
-	ldr r0, [r0, 0x34]
-	mov r3, r9
-	lsls r4, r3, 4
-	add r4, r9
-	lsls r4, 2
-	ldr r1, =gSprites
-	adds r4, r1
-	ldrh r1, [r4, 0x4]
-	lsls r1, 22
-	lsrs r1, 17
-	ldr r6, =0x06010000
-	adds r1, r6
-	movs r2, 0x80
-	lsls r2, 4
-	mov r10, r2
-	movs r3, 0x1
-	bl RequestDma3Copy
-	ldr r0, [r7]
-	ldr r0, [r0, 0x38]
-	ldrh r1, [r5, 0x4]
-	lsls r1, 22
-	lsrs r1, 17
-	adds r1, r6
-	mov r2, r10
-	movs r3, 0x1
-	bl RequestDma3Copy
-	mov r3, r8
-	strh r3, [r4, 0x2E]
-	mov r0, r9
-	strh r0, [r5, 0x2E]
-	mov r1, sp
-	ldrh r1, [r1, 0xC]
-	strh r1, [r4, 0x30]
-	mov r2, sp
-	ldrh r2, [r2, 0xC]
-	strh r2, [r5, 0x30]
-	mov r0, r9
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DC9EC
-
-	thumb_func_start sub_80DCB78
-sub_80DCB78: @ 80DCB78
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gSprites
-	lsls r5, r0, 4
-	adds r5, r0
-	lsls r5, 2
-	adds r5, r1
-	ldrh r0, [r5, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	adds r4, r1
-	adds r0, r4, 0
-	bl FreeSpriteOamMatrix
-	adds r0, r4, 0
-	bl DestroySprite
-	adds r0, r5, 0
-	bl DestroySpriteAndFreeResources
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DCB78
-
-	thumb_func_start sub_80DCBB4
-sub_80DCBB4: @ 80DCBB4
-	push {lr}
-	movs r1, 0xFD
-	lsls r1, 6
-	movs r0, 0x50
-	bl SetGpuReg
-	ldr r1, =0x00000907
-	movs r0, 0x52
-	bl SetGpuReg
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DCBB4
-
-	thumb_func_start sub_80DCBD0
-sub_80DCBD0: @ 80DCBD0
-	push {lr}
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x52
-	movs r1, 0
-	bl SetGpuReg
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DCBD0
-
-	thumb_func_start sub_80DCBE8
-sub_80DCBE8: @ 80DCBE8
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	adds r4, r0, 0
-	mov r9, r1
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, r9
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	bl sub_80DCBB4
-	ldr r0, =gContestResources
-	ldr r1, [r0]
-	ldr r2, =gSprites
-	mov r8, r2
-	lsls r6, r4, 4
-	adds r6, r4
-	lsls r6, 2
-	adds r0, r6, r2
-	movs r3, 0x30
-	ldrsh r2, [r0, r3]
-	ldr r1, [r1, 0x14]
-	lsls r2, 2
-	adds r2, r1
-	ldrb r1, [r2, 0x2]
-	movs r3, 0x2
-	orrs r1, r3
-	strb r1, [r2, 0x2]
-	ldrh r5, [r0, 0x2E]
-	lsls r5, 24
-	lsrs r5, 24
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	lsls r4, r5, 4
-	adds r4, r5
-	lsls r4, 2
-	mov r1, r8
-	adds r0, r4, r1
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	movs r2, 0x1C
-	add r8, r2
-	add r6, r8
-	ldr r0, =sub_80DCC84
-	str r0, [r6]
-	add r4, r8
-	ldr r0, =SpriteCallbackDummy
-	str r0, [r4]
-	mov r3, r9
-	cmp r3, 0
-	bne _080DCC70
-	movs r0, 0x65
-	bl PlaySE
-	b _080DCC76
-	.pool
-_080DCC70:
-	movs r0, 0x2
-	bl PlaySE
-_080DCC76:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DCBE8
-
-	thumb_func_start sub_80DCC84
-sub_80DCC84: @ 80DCC84
-	push {lr}
-	mov r12, r0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080DCCCC
-	mov r0, r12
-	ldrh r1, [r0, 0x2E]
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, =gSprites
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r2
-	adds r0, r1, 0
-	adds r0, 0x3F
-	ldrb r0, [r0]
-	lsls r0, 26
-	cmp r0, 0
-	bge _080DCCCC
-	mov r3, r12
-	adds r3, 0x3E
-	ldrb r0, [r3]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r3]
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	orrs r0, r2
-	strb r0, [r1]
-	ldr r0, =sub_80DCCD8
-	mov r1, r12
-	str r0, [r1, 0x1C]
-_080DCCCC:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DCC84
-
-	thumb_func_start sub_80DCCD8
-sub_80DCCD8: @ 80DCCD8
-	push {lr}
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	movs r3, 0x30
-	ldrsh r2, [r0, r3]
-	ldr r1, [r1, 0x14]
-	lsls r2, 2
-	adds r2, r1
-	ldrb r3, [r2, 0x2]
-	movs r1, 0x3
-	negs r1, r1
-	ands r1, r3
-	strb r1, [r2, 0x2]
-	ldrh r0, [r0, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80DCB78
-	bl sub_80DCBD0
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DCCD8
-
-	thumb_func_start sub_80DCD08
-sub_80DCD08: @ 80DCD08
-	push {lr}
-	ldr r0, =gHeap
-	movs r1, 0xD0
-	lsls r1, 9
-	adds r2, r0, r1
-	ldrb r1, [r2]
-	adds r3, r0, 0
-	cmp r1, 0x1
-	bne _080DCD24
-	movs r0, 0
-	b _080DCD26
-	.pool
-_080DCD24:
-	movs r0, 0x1
-_080DCD26:
-	strb r0, [r2]
-	movs r1, 0xD0
-	lsls r1, 9
-	adds r0, r3, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DCD3E
-	bl sub_80DAEA4
-	bl sub_80DB2BC
-	b _080DCD42
-_080DCD3E:
-	bl sub_80DCD48
-_080DCD42:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DCD08
-
-	thumb_func_start sub_80DCD48
-sub_80DCD48: @ 80DCD48
-	push {r4,r5,lr}
-	sub sp, 0xC
-	ldr r0, =gUnknown_020322D5
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080DCE44
-	ldr r0, =gHeap
-	movs r1, 0xD0
-	lsls r1, 9
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080DCE44
-	cmp r0, 0
-	blt _080DCD7C
-	cmp r0, 0x3
-	bgt _080DCD7C
-	cmp r0, 0x2
-	blt _080DCD7C
-	bl sub_80DF750
-	b _080DCE44
-	.pool
-_080DCD7C:
-	movs r5, 0
-_080DCD7E:
-	adds r0, r5, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x3
-	bls _080DCD7E
-	movs r5, 0
-_080DCD92:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	adds r0, r1
-	add r2, sp, 0x4
-	ldrh r4, [r0, 0x4]
-	movs r1, 0x4
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bge _080DCDBC
-	negs r0, r0
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r2, 0
-	ldr r1, =gText_OneDash
-	bl StringCopy
-	adds r2, r0, 0
-_080DCDBC:
-	lsls r1, r4, 16
-	asrs r1, 16
-	adds r0, r2, 0
-	movs r2, 0
-	movs r3, 0x4
-	bl ConvertIntToDecimalStringN
-	ldr r0, =gUnknown_02039F26
-	adds r0, r5, r0
-	ldrb r0, [r0]
-	movs r1, 0x7
-	str r1, [sp]
-	add r1, sp, 0x4
-	movs r2, 0x37
-	movs r3, 0x1
-	bl Contest_PrintTextToBg0WindowAt
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x3
-	bls _080DCD92
-	movs r5, 0
-_080DCDEA:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	adds r0, r1
-	add r2, sp, 0x4
-	ldrh r4, [r0, 0x2]
-	movs r1, 0x2
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bge _080DCE14
-	negs r0, r0
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r2, 0
-	ldr r1, =gText_OneDash
-	bl StringCopy
-	adds r2, r0, 0
-_080DCE14:
-	lsls r1, r4, 16
-	asrs r1, 16
-	adds r0, r2, 0
-	movs r2, 0
-	movs r3, 0x4
-	bl ConvertIntToDecimalStringN
-	ldr r0, =gUnknown_02039F26
-	adds r0, r5, r0
-	ldrb r0, [r0]
-	movs r1, 0x7
-	str r1, [sp]
-	add r1, sp, 0x4
-	movs r2, 0x5
-	movs r3, 0x1
-	bl Contest_PrintTextToBg0WindowAt
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x3
-	bls _080DCDEA
-	bl sub_80DB2BC
-_080DCE44:
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DCD48
-
-	thumb_func_start sub_80DCE58
-sub_80DCE58: @ 80DCE58
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x14
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	add r4, sp, 0x4
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x8
-	bl memset
-	movs r5, 0
-	add r4, sp, 0x4
-	adds r6, r4, 0
-	movs r7, 0
-_080DCE7E:
-	bl Random
-	adds r1, r0, 0
-	mov r0, sp
-	adds r0, r7
-	adds r0, 0x4
-	strh r1, [r0]
-	movs r2, 0
-	cmp r2, r5
-	bge _080DCEB6
-	lsls r0, r1, 16
-	lsrs r0, 16
-	mov r1, sp
-	ldrh r1, [r1, 0x4]
-	cmp r0, r1
-	beq _080DCEB0
-_080DCE9E:
-	adds r2, 0x1
-	cmp r2, r5
-	bge _080DCEB6
-	lsls r0, r2, 1
-	adds r0, r4, r0
-	ldrh r1, [r6]
-	ldrh r0, [r0]
-	cmp r1, r0
-	bne _080DCE9E
-_080DCEB0:
-	subs r6, 0x2
-	subs r7, 0x2
-	subs r5, 0x1
-_080DCEB6:
-	adds r6, 0x2
-	adds r7, 0x2
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DCE7E
-	mov r2, r8
-	cmp r2, 0
-	bne _080DCF80
-	movs r5, 0
-	ldr r3, =gUnknown_02039F26
-	mov r8, r3
-_080DCECC:
-	mov r6, r8
-	strb r5, [r6]
-	movs r4, 0
-	cmp r4, r5
-	bge _080DCF48
-	ldr r7, =gContestMonConditions
-	mov r9, r7
-	lsls r0, r5, 1
-	adds r1, r0, 0
-	add r1, r9
-	mov r12, r1
-	mov r2, sp
-	adds r2, 0x4
-	str r2, [sp, 0xC]
-	add r0, sp
-	adds r0, 0x4
-	str r0, [sp, 0x10]
-	ldr r3, =gUnknown_02039F26
-	adds r6, r3, 0
-	mov r10, r6
-_080DCEF4:
-	ldrb r0, [r3]
-	lsls r2, r0, 1
-	mov r7, r9
-	adds r0, r2, r7
-	movs r6, 0
-	ldrsh r1, [r0, r6]
-	mov r7, r12
-	movs r6, 0
-	ldrsh r0, [r7, r6]
-	cmp r1, r0
-	blt _080DCF1C
-	cmp r1, r0
-	bne _080DCF40
-	ldr r7, [sp, 0xC]
-	adds r0, r7, r2
-	ldrh r0, [r0]
-	ldr r1, [sp, 0x10]
-	ldrh r1, [r1]
-	cmp r0, r1
-	bcs _080DCF40
-_080DCF1C:
-	adds r2, r5, 0
-	cmp r5, r4
-	ble _080DCF34
-	subs r0, r5, 0x1
-	mov r6, r10
-	adds r1, r0, r6
-_080DCF28:
-	ldrb r0, [r1]
-	strb r0, [r1, 0x1]
-	subs r1, 0x1
-	subs r2, 0x1
-	cmp r2, r4
-	bgt _080DCF28
-_080DCF34:
-	strb r5, [r3]
-	b _080DCF48
-	.pool
-_080DCF40:
-	adds r3, 0x1
-	adds r4, 0x1
-	cmp r4, r5
-	blt _080DCEF4
-_080DCF48:
-	cmp r4, r5
-	bne _080DCF50
-	mov r7, r8
-	strb r5, [r7]
-_080DCF50:
-	movs r0, 0x1
-	add r8, r0
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DCECC
-	ldr r4, =gUnknown_02039F26
-	mov r0, sp
-	adds r1, r4, 0
-	movs r2, 0x4
-	bl memcpy
-	movs r5, 0
-_080DCF68:
-	mov r1, sp
-	adds r0, r1, r5
-	ldrb r0, [r0]
-	adds r0, r4
-	strb r5, [r0]
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DCF68
-	b _080DD034
-	.pool
-_080DCF80:
-	mov r0, sp
-	movs r1, 0xFF
-	movs r2, 0x4
-	bl memset
-	movs r5, 0
-	ldr r3, =gUnknown_02039F26
-	movs r6, 0
-_080DCF90:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x4]
-	adds r0, r6, r0
-	ldrb r0, [r0, 0xB]
-	lsls r0, 30
-	lsrs r2, r0, 30
-	mov r7, sp
-	adds r1, r7, r2
-	b _080DCFB6
-	.pool
-_080DCFAC:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	mov r0, sp
-	adds r1, r0, r2
-_080DCFB6:
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _080DCFAC
-	strb r5, [r1]
-	strb r2, [r3]
-	adds r3, 0x1
-	adds r6, 0x1C
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DCF90
-	movs r5, 0
-_080DCFCC:
-	movs r4, 0x3
-	adds r1, r5, 0x1
-	mov r10, r1
-	cmp r4, r5
-	ble _080DD02E
-	mov r9, r4
-	ldr r2, =gUnknown_02039F26
-	mov r8, r2
-	add r3, sp, 0x4
-	mov r12, r3
-_080DCFE0:
-	ldr r6, =gContestResources
-	ldr r0, [r6]
-	ldr r1, [r0, 0x4]
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	adds r0, r1
-	adds r1, r0, 0
-	subs r1, 0x1C
-	ldrb r2, [r1, 0xB]
-	ldrb r3, [r0, 0xB]
-	mov r1, r9
-	ands r1, r2
-	mov r0, r9
-	ands r0, r3
-	subs r3, r4, 0x1
-	cmp r1, r0
-	bne _080DD028
-	mov r0, r8
-	adds r7, r3, r0
-	adds r2, r4, r0
-	ldrb r6, [r7]
-	ldrb r1, [r2]
-	cmp r6, r1
-	bcs _080DD028
-	lsls r0, r3, 1
-	add r0, r12
-	lsls r1, r4, 1
-	add r1, r12
-	ldrh r0, [r0]
-	ldrh r1, [r1]
-	cmp r0, r1
-	bcs _080DD028
-	ldrb r0, [r2]
-	strb r6, [r2]
-	strb r0, [r7]
-_080DD028:
-	adds r4, r3, 0
-	cmp r4, r5
-	bgt _080DCFE0
-_080DD02E:
-	mov r5, r10
-	cmp r5, 0x2
-	ble _080DCFCC
-_080DD034:
-	add sp, 0x14
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DCE58
-
-	thumb_func_start sub_80DD04C
-sub_80DD04C: @ 80DD04C
-	push {r4,r5,lr}
-	movs r4, 0
-	movs r5, 0xA0
-_080DD052:
-	ldr r0, =gHeap+0x1A004
-	adds r0, r5, r0
-	ldr r1, =gUnknown_02039F26
-	adds r1, r4, r1
-	ldrb r1, [r1]
-	adds r1, 0x5
-	lsls r1, 4
-	movs r2, 0x20
-	bl LoadPalette
-	adds r5, 0x20
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DD052
-	bl sub_80DAEA4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DD04C
-
-	thumb_func_start sub_80DD080
-sub_80DD080: @ 80DD080
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r4, =gContestResources
-	ldr r3, [r4]
-	ldr r1, [r3, 0x4]
-	lsls r7, r6, 3
-	subs r0, r7, r6
-	lsls r5, r0, 2
-	adds r1, r5, r1
-	movs r2, 0
-	strh r2, [r1, 0x2]
-	ldr r0, [r3, 0x4]
-	adds r0, r5, r0
-	strh r2, [r0]
-	adds r0, r6, 0
-	bl sub_80DBA68
-	lsls r0, 24
-	mov r8, r4
-	cmp r0, 0
-	bne _080DD0B4
-	b _080DD3C4
-_080DD0B4:
-	ldr r0, [r4]
-	ldr r1, [r0, 0x4]
-	adds r1, r5, r1
-	ldrh r0, [r1, 0x6]
-	ldr r2, =gContestMoves
-	lsls r0, 3
-	adds r0, r2
-	ldrb r2, [r0]
-	mov r9, r2
-	ldrb r0, [r0, 0x1]
-	lsls r0, 29
-	lsrs r0, 29
-	strb r0, [r1, 0xA]
-	ldr r0, [r4]
-	ldr r0, [r0, 0x4]
-	adds r2, r5, r0
-	ldrh r0, [r2, 0x6]
-	ldrh r1, [r2, 0x8]
-	cmp r0, r1
-	bne _080DD110
-	cmp r0, 0
-	beq _080DD110
-	ldrb r0, [r2, 0x15]
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2, 0x15]
-	ldr r0, [r4]
-	ldr r2, [r0, 0x4]
-	adds r2, r5, r2
-	ldrb r3, [r2, 0xB]
-	lsls r1, r3, 25
-	lsrs r1, 29
-	adds r1, 0x1
-	movs r0, 0x7
-	ands r1, r0
-	lsls r1, 4
-	movs r0, 0x71
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2, 0xB]
-	b _080DD12C
-	.pool
-_080DD110:
-	ldr r4, =gContestResources
-	ldr r0, [r4]
-	ldr r0, [r0, 0x4]
-	lsls r3, r6, 3
-	subs r1, r3, r6
-	lsls r1, 2
-	adds r1, r0
-	ldrb r2, [r1, 0xB]
-	movs r0, 0x71
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0xB]
-	mov r8, r4
-	adds r7, r3, 0
-_080DD12C:
-	mov r2, r8
-	ldr r4, [r2]
-	ldr r2, [r4, 0x4]
-	subs r0, r7, r6
-	lsls r0, 2
-	adds r2, r0, r2
-	ldr r3, =gContestEffects
-	mov r1, r9
-	lsls r5, r1, 2
-	adds r3, r5, r3
-	ldrb r1, [r3, 0x1]
-	strh r1, [r2]
-	ldr r1, [r4, 0x4]
-	adds r0, r1
-	ldrh r1, [r0]
-	strh r1, [r0, 0x2]
-	ldr r1, [r4, 0x8]
-	ldrb r0, [r3, 0x2]
-	strh r0, [r1, 0x4]
-	ldr r1, [r4, 0x8]
-	ldrh r0, [r1, 0x4]
-	strh r0, [r1, 0x6]
-	ldr r0, [r4, 0x8]
-	strb r6, [r0, 0x11]
-	movs r2, 0
-	mov r9, r5
-	mov r4, r8
-	movs r3, 0
-	movs r1, 0
-_080DD166:
-	ldr r0, [r4]
-	ldr r0, [r0, 0x4]
-	adds r0, r1, r0
-	strb r3, [r0, 0xE]
-	ldr r0, [r4]
-	ldr r0, [r0, 0x8]
-	adds r0, 0xD
-	adds r0, r2
-	strb r3, [r0]
-	adds r1, 0x1C
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _080DD166
-	ldr r5, =gContestResources
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	subs r0, r7, r6
-	lsls r4, r0, 2
-	adds r2, r4, r1
-	ldrb r1, [r2, 0x15]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080DD1B4
-	ldrh r0, [r2, 0x8]
-	ldrh r1, [r2, 0x6]
-	bl AreMovesContestCombo
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD1B4
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x15]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x15]
-_080DD1B4:
-	ldr r0, =gContestEffectFuncs
-	add r0, r9
-	ldr r0, [r0]
-	bl _call_via_r0
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	subs r0, r7, r6
-	lsls r0, 2
-	adds r2, r0, r1
-	ldrb r1, [r2, 0x10]
-	movs r0, 0x30
-	ands r0, r1
-	cmp r0, 0x10
-	bne _080DD1EC
-	ldrh r1, [r2, 0x2]
-	subs r1, 0xA
-	movs r0, 0xD
-	ldrsb r0, [r2, r0]
-	b _080DD206
-	.pool
-_080DD1EC:
-	ldrb r1, [r2, 0x11]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080DD200
-	movs r1, 0xD
-	ldrsb r1, [r2, r1]
-	lsls r0, r1, 1
-	adds r0, r1
-	b _080DD204
-_080DD200:
-	movs r0, 0xD
-	ldrsb r0, [r2, r0]
-_080DD204:
-	ldrh r1, [r2, 0x2]
-_080DD206:
-	adds r0, r1
-	strh r0, [r2, 0x2]
-	ldr r5, =gContestResources
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	subs r0, r7, r6
-	lsls r4, r0, 2
-	adds r1, r4, r1
-	movs r0, 0
-	strb r0, [r1, 0x16]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x15]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x15]
-	adds r0, r6, 0
-	bl sub_80DE1E8
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DD2E2
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrh r0, [r1, 0x8]
-	ldrh r1, [r1, 0x6]
-	bl AreMovesContestCombo
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0
-	beq _080DD29C
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r2, r4, r0
-	ldrb r1, [r2, 0x15]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080DD29C
-	strb r3, [r2, 0x16]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r0, [r1, 0x15]
-	movs r2, 0x40
-	orrs r0, r2
-	strb r0, [r1, 0x15]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x15]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x15]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r0, r4, r0
-	movs r1, 0
-	ldrsh r2, [r0, r1]
-	ldrb r1, [r0, 0x16]
-	muls r1, r2
-	strb r1, [r0, 0x17]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r0, [r1, 0x15]
-	movs r2, 0x8
-	b _080DD2C8
-	.pool
-_080DD29C:
-	ldr r2, =gContestMoves
-	ldr r5, =gContestResources
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	subs r0, r7, r6
-	lsls r4, r0, 2
-	adds r3, r4, r1
-	ldrh r0, [r3, 0x6]
-	lsls r0, 3
-	adds r0, r2
-	ldrb r0, [r0, 0x2]
-	cmp r0, 0
-	beq _080DD2D8
-	ldrb r0, [r3, 0x15]
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r3, 0x15]
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	adds r1, r4, r1
-	ldrb r0, [r1, 0x15]
-	movs r2, 0x40
-_080DD2C8:
-	orrs r0, r2
-	strb r0, [r1, 0x15]
-	b _080DD2E2
-	.pool
-_080DD2D8:
-	ldrb r1, [r3, 0x15]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r3, 0x15]
-_080DD2E2:
-	ldr r5, =gContestResources
-	ldr r0, [r5]
-	ldr r1, [r0, 0x4]
-	subs r0, r7, r6
-	lsls r4, r0, 2
-	adds r2, r4, r1
-	ldrb r1, [r2, 0x15]
-	movs r0, 0x1
-	mov r8, r0
-	ands r0, r1
-	cmp r0, 0
-	beq _080DD30A
-	ldrb r0, [r2, 0xB]
-	lsls r0, 25
-	lsrs r0, 29
-	adds r0, 0x1
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 1
-	strb r1, [r2, 0x18]
-_080DD30A:
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r2, r4, r0
-	ldrb r1, [r2, 0xC]
-	mov r0, r8
-	ands r0, r1
-	cmp r0, 0
-	beq _080DD334
-	ldrb r1, [r2, 0x15]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x15]
-	ldr r2, [r5]
-	ldr r0, [r2, 0x4]
-	adds r0, r4, r0
-	movs r1, 0
-	strh r1, [r0, 0x2]
-	ldr r0, [r2, 0x4]
-	adds r0, r4, r0
-	strh r1, [r0]
-_080DD334:
-	ldr r0, [r5]
-	ldr r0, [r0, 0x4]
-	adds r0, r4, r0
-	ldrh r0, [r0, 0x6]
-	bl Contest_GetMoveExcitement
-	ldr r1, [r5]
-	ldr r1, [r1, 0x10]
-	strb r0, [r1]
-	ldr r2, [r5]
-	ldr r0, [r2, 0x4]
-	adds r0, r4, r0
-	ldrb r1, [r0, 0x11]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080DD35C
-	ldr r0, [r2, 0x10]
-	mov r1, r8
-	strb r1, [r0]
-_080DD35C:
-	ldr r1, [r5]
-	ldr r3, [r1, 0x10]
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	cmp r0, 0
-	ble _080DD388
-	ldr r0, [r1]
-	ldrb r0, [r0, 0x13]
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0
-	ldrsb r1, [r3, r1]
-	adds r0, r1
-	cmp r0, 0x4
-	ble _080DD384
-	movs r0, 0x3C
-	b _080DD38A
-	.pool
-_080DD384:
-	movs r0, 0xA
-	b _080DD38A
-_080DD388:
-	movs r0, 0
-_080DD38A:
-	strb r0, [r3, 0x2]
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	movs r2, 0
-	b _080DD3AE
-_080DD3A2:
-	subs r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-_080DD3A8:
-	adds r2, 0x1
-	cmp r2, 0x3
-	bgt _080DD3B6
-_080DD3AE:
-	cmp r2, r6
-	beq _080DD3A8
-	cmp r0, 0
-	bne _080DD3A2
-_080DD3B6:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	subs r0, r7, r6
-	lsls r0, 2
-	adds r0, r1
-	strb r2, [r0, 0x1B]
-_080DD3C4:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DD080
-
-	thumb_func_start SetContestantEffectStringID
-SetContestantEffectStringID: @ 80DD3D4
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gContestResources
-	ldr r2, [r2]
-	ldr r3, [r2, 0x4]
-	lsls r2, r0, 3
-	subs r2, r0
-	lsls r2, 2
-	adds r2, r3
-	strb r1, [r2, 0x13]
-	bx lr
-	.pool
-	thumb_func_end SetContestantEffectStringID
-
-	thumb_func_start SetContestantEffectStringID2
-SetContestantEffectStringID2: @ 80DD3F0
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gContestResources
-	ldr r2, [r2]
-	ldr r3, [r2, 0x4]
-	lsls r2, r0, 3
-	subs r2, r0
-	lsls r2, 2
-	adds r2, r3
-	strb r1, [r2, 0x14]
-	bx lr
-	.pool
-	thumb_func_end SetContestantEffectStringID2
-
-	thumb_func_start SetStartledString
-SetStartledString: @ 80DD40C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r3, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r2, r1, 0
-	cmp r1, 0x3B
-	bls _080DD426
-	movs r1, 0x35
-	bl SetContestantEffectStringID
-	b _080DD456
-_080DD426:
-	cmp r1, 0x27
-	bls _080DD432
-	movs r1, 0x34
-	bl SetContestantEffectStringID
-	b _080DD456
-_080DD432:
-	cmp r1, 0x1D
-	bls _080DD43E
-	movs r1, 0x33
-	bl SetContestantEffectStringID
-	b _080DD456
-_080DD43E:
-	cmp r1, 0x13
-	bls _080DD44A
-	movs r1, 0x32
-	bl SetContestantEffectStringID
-	b _080DD456
-_080DD44A:
-	cmp r2, 0x9
-	bls _080DD456
-	adds r0, r3, 0
-	movs r1, 0x31
-	bl SetContestantEffectStringID
-_080DD456:
-	pop {r0}
-	bx r0
-	thumb_func_end SetStartledString
-
-	thumb_func_start sub_80DD45C
-sub_80DD45C: @ 80DD45C
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r1, 24
-	lsrs r6, r1, 24
-	ldr r0, =gStringVar1
-	lsls r1, r4, 6
-	ldr r2, =gContestMons + 2
-	adds r1, r2
-	bl StringCopy
-	ldr r0, =gStringVar2
-	ldr r5, =gContestResources
-	ldr r1, [r5]
-	ldr r2, [r1, 0x4]
-	lsls r1, r4, 3
-	subs r1, r4
-	lsls r1, 2
-	adds r1, r2
-	ldrh r2, [r1, 0x6]
-	movs r1, 0xD
-	muls r1, r2
-	ldr r2, =gMoveNames
-	adds r1, r2
-	bl StringCopy
-	ldr r3, =gContestMoves
-	ldr r1, [r5]
-	ldr r0, [r1, 0x8]
-	ldrb r2, [r0, 0x11]
-	ldr r1, [r1, 0x4]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r1
-	ldrh r0, [r0, 0x6]
-	lsls r0, 3
-	adds r0, r3
-	ldrb r0, [r0, 0x1]
-	lsls r1, r0, 29
-	cmp r1, 0
-	bne _080DD4DC
-	ldr r0, =gStringVar3
-	ldr r1, =gText_0827E837
-	bl StringCopy
-	b _080DD52C
-	.pool
-_080DD4DC:
-	lsrs r0, r1, 29
-	cmp r0, 0x1
-	bne _080DD4F4
-	ldr r0, =gStringVar3
-	ldr r1, =gText_0827E83F
-	bl StringCopy
-	b _080DD52C
-	.pool
-_080DD4F4:
-	lsrs r0, r1, 29
-	cmp r0, 0x2
-	bne _080DD50C
-	ldr r0, =gStringVar3
-	ldr r1, =gText_0827E847
-	bl StringCopy
-	b _080DD52C
-	.pool
-_080DD50C:
-	lsrs r0, r1, 29
-	cmp r0, 0x3
-	bne _080DD524
-	ldr r0, =gStringVar3
-	ldr r1, =gText_0827E850
-	bl StringCopy
-	b _080DD52C
-	.pool
-_080DD524:
-	ldr r0, =gStringVar3
-	ldr r1, =gText_0827E85A
-	bl StringCopy
-_080DD52C:
-	ldr r4, =gStringVar4
-	ldr r1, =gUnknown_08587E10
-	lsls r0, r6, 2
-	adds r0, r1
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	bl sub_80DB89C
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl Contest_StartTextPrinter
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DD45C
-
-	thumb_func_start MakeContestantNervous
-MakeContestantNervous: @ 80DD560
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r4, =gContestResources
-	ldr r1, [r4]
-	ldr r3, [r1, 0x4]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r3, r1, r3
-	ldrb r0, [r3, 0xC]
-	movs r2, 0x1
-	orrs r0, r2
-	strb r0, [r3, 0xC]
-	ldr r0, [r4]
-	ldr r0, [r0, 0x4]
-	adds r1, r0
-	movs r0, 0
-	strh r0, [r1, 0x6]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end MakeContestantNervous
-
-	thumb_func_start sub_80DD590
-sub_80DD590: @ 80DD590
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x8
-	movs r0, 0
-	mov r12, r0
-	movs r4, 0
-	ldr r1, =gUnknown_02039F26
-	mov r9, r1
-	add r2, sp, 0x4
-	mov r6, r9
-	movs r5, 0
-	adds r3, r2, 0
-_080DD5AC:
-	mov r0, sp
-	adds r1, r0, r4
-	adds r0, r4, r6
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r0, r3, r4
-	strb r5, [r0]
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DD5AC
-	movs r4, 0
-	ldr r7, =gContestResources
-	ldr r1, [r7]
-	mov r8, r1
-	adds r5, r2, 0
-_080DD5CA:
-	movs r2, 0
-	mov r0, r8
-	ldr r1, [r0, 0x4]
-_080DD5D0:
-	ldrb r0, [r1, 0x19]
-	cmp r0, r4
-	beq _080DD604
-	adds r1, 0x1C
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _080DD5D0
-_080DD5DE:
-	cmp r2, 0x4
-	bne _080DD684
-	movs r2, 0
-	ldrb r0, [r5]
-	cmp r0, 0
-	bne _080DD612
-	ldr r0, [r7]
-	ldr r0, [r0, 0x4]
-	ldrb r0, [r0, 0x19]
-	cmp r0, 0xFF
-	bne _080DD612
-	mov r12, r2
-	movs r2, 0x1
-	b _080DD63A
-	.pool
-_080DD604:
-	mov r1, sp
-	adds r0, r1, r2
-	strb r4, [r0]
-	adds r1, r5, r2
-	movs r0, 0x1
-	strb r0, [r1]
-	b _080DD5DE
-_080DD612:
-	adds r2, 0x1
-	cmp r2, 0x3
-	bgt _080DD676
-	adds r0, r5, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DD612
-	ldr r0, [r7]
-	ldr r1, [r0, 0x4]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r1
-	ldrb r0, [r0, 0x19]
-	cmp r0, 0xFF
-	bne _080DD612
-	lsls r0, r2, 24
-	lsrs r0, 24
-	mov r12, r0
-	adds r2, 0x1
-_080DD63A:
-	cmp r2, 0x3
-	bgt _080DD676
-	ldr r6, =gUnknown_02039F26
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r3, r0, 2
-_080DD646:
-	adds r0, r5, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DD66E
-	ldr r0, [r7]
-	ldr r0, [r0, 0x4]
-	adds r0, r3, r0
-	ldrb r0, [r0, 0x19]
-	cmp r0, 0xFF
-	bne _080DD66E
-	mov r1, r12
-	adds r0, r1, r6
-	adds r1, r2, r6
-	ldrb r0, [r0]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bls _080DD66E
-	lsls r0, r2, 24
-	lsrs r0, 24
-	mov r12, r0
-_080DD66E:
-	adds r3, 0x1C
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _080DD646
-_080DD676:
-	mov r0, sp
-	add r0, r12
-	strb r4, [r0]
-	mov r0, r12
-	adds r1, r5, r0
-	movs r0, 0x1
-	strb r0, [r1]
-_080DD684:
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DD5CA
-	movs r4, 0
-	ldr r6, =gContestResources
-	movs r5, 0
-_080DD690:
-	ldr r0, [r6]
-	ldr r1, [r0, 0x8]
-	adds r1, r4
-	mov r0, sp
-	adds r3, r0, r4
-	ldrb r0, [r3]
-	strb r0, [r1]
-	ldr r0, [r6]
-	ldr r0, [r0, 0x4]
-	adds r0, r5, r0
-	movs r1, 0xFF
-	strb r1, [r0, 0x19]
-	ldr r0, [r6]
-	ldr r1, [r0, 0x4]
-	adds r1, r5, r1
-	ldrb r2, [r1, 0x10]
-	movs r0, 0x3F
-	ands r0, r2
-	strb r0, [r1, 0x10]
-	mov r0, r9
-	adds r1, r4, r0
-	ldrb r0, [r3]
-	strb r0, [r1]
-	adds r5, 0x1C
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DD690
-	add sp, 0x8
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DD590
-
-	thumb_func_start sub_80DD6DC
-sub_80DD6DC: @ 80DD6DC
-	push {lr}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x30]
-	adds r1, r0, 0x1
-	strh r1, [r2, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x54
-	ble _080DD712
-	movs r0, 0
-	strh r0, [r2, 0x30]
-	adds r3, r2, 0
-	adds r3, 0x3E
-	ldrb r0, [r3]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r3]
-	ldr r0, =SpriteCallbackDummy
-	str r0, [r2, 0x1C]
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x6]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x6]
-_080DD712:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DD6DC
-
-	thumb_func_start sub_80DD720
-sub_80DD720: @ 80DD720
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	ldrb r5, [r0, 0x12]
-	cmp r1, 0x8
-	bls _080DD734
-	b _080DD8D4
-_080DD734:
-	lsls r0, r1, 2
-	ldr r1, =_080DD748
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080DD748:
-	.4byte _080DD76C
-	.4byte _080DD76C
-	.4byte _080DD79C
-	.4byte _080DD7D0
-	.4byte _080DD804
-	.4byte _080DD838
-	.4byte _080DD86C
-	.4byte _080DD8D4
-	.4byte _080DD8A0
-_080DD76C:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r1, 0x2E]
-	ldr r2, =0x000003ff
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0x20
-	bl PlaySE
-	b _080DD8F8
-	.pool
-_080DD79C:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r2, [r1, 0x2E]
-	adds r2, 0x4
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0x1F
-	bl PlaySE
-	b _080DD8F8
-	.pool
-_080DD7D0:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r2, [r1, 0x2E]
-	adds r2, 0x8
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0x1F
-	bl PlaySE
-	b _080DD8F8
-	.pool
-_080DD804:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r2, [r1, 0x2E]
-	adds r2, 0xC
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0x2D
-	bl PlaySE
-	b _080DD8F8
-	.pool
-_080DD838:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r2, [r1, 0x2E]
-	adds r2, 0xC
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0x2D
-	bl PlaySE
-	b _080DD8F8
-	.pool
-_080DD86C:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r2, [r1, 0x2E]
-	adds r2, 0x10
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0x2D
-	bl PlaySE
-	b _080DD8F8
-	.pool
-_080DD8A0:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r2, [r1, 0x2E]
-	adds r2, 0x18
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0xC3
-	bl PlaySE
-	b _080DD8F8
-	.pool
-_080DD8D4:
-	ldr r0, =gSprites
-	lsls r4, r5, 4
-	adds r1, r4, r5
-	lsls r1, 2
-	adds r1, r0
-	ldrh r2, [r1, 0x2E]
-	adds r2, 0x14
-	ldr r3, =0x000003ff
-	adds r0, r3, 0
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	movs r0, 0x2D
-	bl PlaySE
-_080DD8F8:
-	adds r2, r4, 0
-	ldr r4, =gSprites
-	adds r2, r5
-	lsls r2, 2
-	adds r1, r2, r4
-	movs r0, 0
-	strh r0, [r1, 0x30]
-	adds r1, 0x3E
-	ldrb r3, [r1]
-	subs r0, 0x5
-	ands r0, r3
-	strb r0, [r1]
-	adds r4, 0x1C
-	adds r2, r4
-	ldr r0, =sub_80DD6DC
-	str r0, [r2]
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x6]
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r2, 0x6]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DD720
-
-	thumb_func_start sub_80DD940
-sub_80DD940: @ 80DD940
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	movs r5, 0
-	ldr r6, =gContestResources
-	ldr r0, =gSprites
-	mov r9, r0
-	ldr r0, =0x06010000
-	mov r8, r0
-	ldr r7, =0x04000008
-_080DD956:
-	ldr r0, [r6]
-	ldr r1, [r0]
-	movs r0, 0x13
-	ldrsb r0, [r1, r0]
-	ldr r4, =gContestApplauseMeterGfx
-	cmp r5, r0
-	bge _080DD966
-	adds r4, 0x40
-_080DD966:
-	adds r0, r1, 0
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	add r0, r9
-	ldrh r1, [r0, 0x4]
-	lsls r1, 22
-	lsrs r1, 22
-	adds r0, r5, 0
-	adds r0, 0x11
-	adds r1, r0
-	lsls r1, 5
-	add r1, r8
-	adds r0, r4, 0
-	adds r2, r7, 0
-	bl CpuSet
-	adds r0, r4, 0
-	adds r0, 0x20
-	ldr r1, [r6]
-	ldr r1, [r1]
-	adds r1, 0x58
-	ldrb r2, [r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r9
-	ldrh r1, [r1, 0x4]
-	lsls r1, 22
-	lsrs r1, 22
-	adds r2, r5, 0
-	adds r2, 0x19
-	adds r1, r2
-	lsls r1, 5
-	add r1, r8
-	adds r2, r7, 0
-	bl CpuSet
-	ldr r0, [r6]
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x13]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0x4
-	ble _080DD9C8
-	bl sub_80DDA20
-_080DD9C8:
-	adds r5, 0x1
-	cmp r5, 0x4
-	ble _080DD956
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DD940
-
-	thumb_func_start Contest_GetMoveExcitement
-Contest_GetMoveExcitement: @ 80DD9F0
-	lsls r0, 16
-	ldr r3, =gUnknown_085899EC
-	ldr r1, =gContestMoves
-	lsrs r0, 13
-	adds r0, r1
-	ldrb r1, [r0, 0x1]
-	lsls r1, 29
-	lsrs r1, 29
-	ldr r0, =gSpecialVar_ContestCategory
-	ldrh r2, [r0]
-	lsls r0, r2, 2
-	adds r0, r2
-	adds r1, r0
-	adds r1, r3
-	movs r0, 0
-	ldrsb r0, [r1, r0]
-	bx lr
-	.pool
-	thumb_func_end Contest_GetMoveExcitement
-
-	thumb_func_start sub_80DDA20
-sub_80DDA20: @ 80DDA20
-	push {r4,r5,lr}
-	ldr r0, =c3_08130B10
-	movs r1, 0xA
-	bl CreateTask
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r0, =gTasks
-	lsls r4, r5, 2
-	adds r4, r5
-	lsls r4, 3
-	adds r4, r0
-	movs r0, 0x1
-	strh r0, [r4, 0xA]
-	ldr r0, =0x0000abe2
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0xC]
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DDA20
-
-	thumb_func_start c3_08130B10
-c3_08130B10: @ 80DDA60
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r2, r0, r1
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	bne _080DDAFE
-	movs r0, 0
-	strh r0, [r2, 0x8]
-	movs r3, 0xE
-	ldrsh r0, [r2, r3]
-	cmp r0, 0
-	bne _080DDA94
-	ldrh r0, [r2, 0x10]
-	adds r0, 0x1
-	b _080DDA98
-	.pool
-_080DDA94:
-	ldrh r0, [r2, 0x10]
-	subs r0, 0x1
-_080DDA98:
-	strh r0, [r2, 0x10]
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	lsls r0, 4
-	movs r3, 0x84
-	lsls r3, 1
-	adds r6, r3, 0
-	adds r0, r6
-	lsls r0, 16
-	lsrs r0, 16
-	ldrb r2, [r4, 0x10]
-	ldr r3, =0x00007fff
-	movs r1, 0x1
-	bl BlendPalette
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _080DDACA
-	cmp r0, 0x10
-	bne _080DDAFE
-_080DDACA:
-	ldrh r0, [r4, 0xE]
-	movs r1, 0x1
-	eors r0, r1
-	strh r0, [r4, 0xE]
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x13]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0x4
-	bgt _080DDAFE
-	movs r3, 0xC
-	ldrsh r0, [r4, r3]
-	lsls r0, 4
-	adds r0, r6
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	movs r2, 0
-	movs r3, 0x1F
-	bl BlendPalette
-	adds r0, r5, 0
-	bl DestroyTask
-_080DDAFE:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end c3_08130B10
-
-	thumb_func_start sub_80DDB0C
-sub_80DDB0C: @ 80DDB0C
-	push {r4,lr}
-	ldr r0, =sub_80DDB6C
-	movs r1, 0xA
-	bl CreateTask
-	ldr r3, =gSprites
-	ldr r4, =gContestResources
-	ldr r2, [r4]
-	ldr r0, [r2]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldr r1, =0x0000ffba
-	strh r1, [r0, 0x24]
-	ldr r0, [r2]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	ldr r0, [r4]
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x6]
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r2, 0x6]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDB0C
-
-	thumb_func_start sub_80DDB6C
-sub_80DDB6C: @ 80DDB6C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r3, r0, 0
-	ldr r4, =gContestResources
-	ldr r0, [r4]
-	ldr r0, [r0]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r2, r0, r1
-	ldr r0, =gTasks
-	lsls r1, r3, 2
-	adds r1, r3
-	lsls r1, 3
-	adds r1, r0
-	movs r5, 0xD0
-	lsls r5, 3
-	adds r0, r5, 0
-	ldrh r5, [r1, 0x1C]
-	adds r0, r5
-	strh r0, [r1, 0x1C]
-	lsls r0, 16
-	asrs r0, 24
-	ldrh r5, [r2, 0x24]
-	adds r0, r5
-	strh r0, [r2, 0x24]
-	ldrb r0, [r1, 0x1C]
-	strh r0, [r1, 0x1C]
-	movs r1, 0x24
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	ble _080DDBB8
-	movs r0, 0
-	strh r0, [r2, 0x24]
-_080DDBB8:
-	movs r5, 0x24
-	ldrsh r0, [r2, r5]
-	cmp r0, 0
-	bne _080DDBD4
-	ldr r0, [r4]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x6]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x6]
-	adds r0, r3, 0
-	bl DestroyTask
-_080DDBD4:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDB6C
-
-	thumb_func_start sub_80DDBE8
-sub_80DDBE8: @ 80DDBE8
-	push {r4,r5,lr}
-	ldr r5, =gSprites
-	ldr r4, =gContestResources
-	ldr r0, [r4]
-	ldr r2, [r0]
-	adds r0, r2, 0
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	adds r0, 0x3E
-	ldrb r0, [r0]
-	lsls r0, 29
-	cmp r0, 0
-	bge _080DDC1C
-	ldrb r1, [r2, 0x6]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	b _080DDC40
-	.pool
-_080DDC1C:
-	ldr r0, =task08_080CD1CC
-	movs r1, 0xA
-	bl CreateTask
-	ldr r2, [r4]
-	ldr r0, [r2]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0
-	strh r1, [r0, 0x24]
-	ldr r2, [r2]
-	ldrb r0, [r2, 0x6]
-	movs r1, 0x40
-	orrs r0, r1
-_080DDC40:
-	strb r0, [r2, 0x6]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDBE8
-
-	thumb_func_start task08_080CD1CC
-task08_080CD1CC: @ 80DDC4C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	ldr r5, =gContestResources
-	ldr r0, [r5]
-	ldr r0, [r0]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r3, r0, r1
-	ldr r0, =gTasks
-	lsls r2, r4, 2
-	adds r2, r4
-	lsls r2, 3
-	adds r2, r0
-	movs r1, 0xD0
-	lsls r1, 3
-	adds r0, r1, 0
-	ldrh r1, [r2, 0x1C]
-	adds r0, r1
-	strh r0, [r2, 0x1C]
-	lsls r0, 16
-	asrs r0, 24
-	ldrh r1, [r3, 0x24]
-	subs r1, r0
-	strh r1, [r3, 0x24]
-	ldrb r0, [r2, 0x1C]
-	strh r0, [r2, 0x1C]
-	movs r2, 0x24
-	ldrsh r0, [r3, r2]
-	movs r1, 0x46
-	negs r1, r1
-	cmp r0, r1
-	bge _080DDC9C
-	ldr r0, =0x0000ffba
-	strh r0, [r3, 0x24]
-_080DDC9C:
-	movs r2, 0x24
-	ldrsh r0, [r3, r2]
-	cmp r0, r1
-	bne _080DDCC4
-	adds r2, r3, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, [r5]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x6]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x6]
-	adds r0, r4, 0
-	bl DestroyTask
-_080DDCC4:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task08_080CD1CC
-
-	thumb_func_start sub_80DDCDC
-sub_80DDCDC: @ 80DDCDC
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, =sub_80DDD20
-	movs r1, 0x5
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	lsls r4, 24
-	asrs r4, 24
-	strh r4, [r1, 0x8]
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x6]
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r2, 0x6]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDCDC
-
-	thumb_func_start sub_80DDD20
-sub_80DDD20: @ 80DDD20
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	movs r1, 0x1C
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _080DDD54
-	cmp r0, 0x1
-	bgt _080DDD48
-	cmp r0, 0
-	beq _080DDD4E
-	b _080DDD9C
-	.pool
-_080DDD48:
-	cmp r0, 0x2
-	beq _080DDD70
-	b _080DDD9C
-_080DDD4E:
-	bl sub_80DDB0C
-	b _080DDD64
-_080DDD54:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	ldrb r1, [r0, 0x6]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _080DDD9C
-_080DDD64:
-	ldrh r0, [r4, 0x1C]
-	adds r0, 0x1
-	strh r0, [r4, 0x1C]
-	b _080DDD9C
-	.pool
-_080DDD70:
-	ldrh r0, [r4, 0x1E]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x1E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x14
-	ble _080DDD9C
-	movs r0, 0
-	strh r0, [r4, 0x1E]
-	bl sub_80DD940
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x6]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x6]
-	adds r0, r5, 0
-	bl DestroyTask
-_080DDD9C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDD20
-
-	thumb_func_start sub_80DDDA8
-sub_80DDDA8: @ 80DDDA8
-	ldr r3, =gSprites
-	ldr r0, =gContestResources
-	ldr r2, [r0]
-	ldr r0, [r2]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	movs r1, 0
-	strh r1, [r0, 0x24]
-	ldr r0, [r2]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_80DDDA8
-
-	thumb_func_start sub_80DDDE4
-sub_80DDDE4: @ 80DDDE4
-	ldr r2, =gSprites
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	adds r0, 0x58
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_80DDDE4
-
-	thumb_func_start sub_80DDE0C
-sub_80DDE0C: @ 80DDE0C
-	push {lr}
-	ldr r0, =sub_80DDE30
-	movs r1, 0xF
-	bl CreateTask
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x6]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x6]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDE0C
-
-	thumb_func_start sub_80DDE30
-sub_80DDE30: @ 80DDE30
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x1C]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x6
-	ble _080DDEBA
-	movs r0, 0
-	strh r0, [r4, 0x1C]
-	movs r1, 0x1E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080DDE78
-	ldr r0, =gHeap+0x19000
-	ldr r1, =0x06002000
-	movs r2, 0x80
-	lsls r2, 5
-	movs r3, 0x1
-	bl RequestDma3Copy
-	b _080DDE8C
-	.pool
-_080DDE78:
-	ldr r0, =gHeap+0x18000
-	ldr r1, =0x06002000
-	movs r2, 0x80
-	lsls r2, 5
-	movs r3, 0x1
-	bl RequestDma3Copy
-	ldrh r0, [r4, 0x20]
-	adds r0, 0x1
-	strh r0, [r4, 0x20]
-_080DDE8C:
-	ldr r1, =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x1E]
-	movs r2, 0x1
-	eors r1, r2
-	strh r1, [r0, 0x1E]
-	movs r1, 0x20
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x9
-	bne _080DDEBA
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x6]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r2, 0x6]
-	adds r0, r5, 0
-	bl DestroyTask
-_080DDEBA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDE30
-
-	thumb_func_start sub_80DDED0
-sub_80DDED0: @ 80DDED0
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	ldr r0, =sub_80DDF80
-	movs r1, 0xA
-	bl CreateTask
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r4, 24
-	cmp r4, 0
-	ble _080DDF38
-	ldr r7, =0x0000237e
-	lsls r0, r5, 24
-	adds r4, r0, 0
-	cmp r4, 0
-	ble _080DDF1C
-	movs r5, 0
-	ldr r2, =gContestResources
-	ldr r0, [r2]
-	ldr r0, [r0]
-	movs r1, 0x13
-	ldrsb r1, [r0, r1]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	b _080DDF4E
-	.pool
-_080DDF1C:
-	ldr r2, =gContestResources
-	ldr r0, [r2]
-	ldr r0, [r0]
-	movs r1, 0x13
-	ldrsb r1, [r0, r1]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	b _080DDF4E
-	.pool
-_080DDF38:
-	movs r7, 0
-	lsls r0, r5, 24
-	adds r4, r0, 0
-	cmp r4, 0
-	ble _080DDF48
-	movs r5, 0
-	movs r3, 0xC
-	b _080DDF4C
-_080DDF48:
-	movs r5, 0xC
-	movs r3, 0
-_080DDF4C:
-	ldr r2, =gContestResources
-_080DDF4E:
-	ldr r1, =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r0, r1
-	strh r7, [r0, 0x8]
-	strh r5, [r0, 0xA]
-	asrs r1, r4, 24
-	strh r1, [r0, 0xC]
-	strh r3, [r0, 0xE]
-	ldr r0, [r2]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x7]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x7]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDED0
-
-	thumb_func_start sub_80DDF80
-sub_80DDF80: @ 80DDF80
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r2, =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r3, r0, r2
-	ldrh r0, [r3, 0x1C]
-	adds r1, r0, 0x1
-	strh r1, [r3, 0x1C]
-	lsls r0, 16
-	cmp r0, 0
-	blt _080DDFFC
-	movs r0, 0
-	strh r0, [r3, 0x1C]
-	movs r1, 0xC
-	ldrsh r0, [r3, r1]
-	cmp r0, 0
-	ble _080DDFB4
-	ldrh r0, [r3, 0xA]
-	adds r0, 0x1
-	b _080DDFB8
-	.pool
-_080DDFB4:
-	ldrh r0, [r3, 0xA]
-	subs r0, 0x1
-_080DDFB8:
-	strh r0, [r3, 0xA]
-	lsls r4, r5, 2
-	adds r4, r5
-	lsls r4, 3
-	adds r4, r2
-	ldrb r2, [r4, 0xA]
-	ldrh r3, [r4, 0x8]
-	movs r0, 0x11
-	movs r1, 0x1
-	bl BlendPalette
-	ldrb r2, [r4, 0xA]
-	ldrh r3, [r4, 0x8]
-	movs r0, 0x1A
-	movs r1, 0x1
-	bl BlendPalette
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	movs r2, 0xE
-	ldrsh r0, [r4, r2]
-	cmp r1, r0
-	bne _080DDFFC
-	adds r0, r5, 0
-	bl DestroyTask
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x7]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x7]
-_080DDFFC:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DDF80
-
-	thumb_func_start sub_80DE008
-sub_80DE008: @ 80DE008
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	movs r5, 0
-	ldr r0, =gContestResources
-	mov r9, r0
-	mov r8, r9
-	ldr r6, =gSprites
-	movs r4, 0
-	movs r7, 0
-_080DE026:
-	mov r1, r8
-	ldr r0, [r1]
-	ldr r0, [r0, 0x4]
-	adds r0, r7, r0
-	ldrb r1, [r0, 0x10]
-	movs r0, 0xC0
-	ands r0, r1
-	cmp r0, 0
-	beq _080DE0BC
-	mov r2, r10
-	cmp r2, 0
-	beq _080DE0BC
-	lsls r0, r5, 24
-	lsrs r0, 24
-	bl sub_80DE0F0
-	mov r3, r8
-	ldr r1, [r3]
-	ldr r1, [r1, 0x14]
-	adds r1, r4, r1
-	ldrb r2, [r1, 0x1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r6
-	ldrh r1, [r1, 0x4]
-	lsls r1, 22
-	lsrs r1, 17
-	ldr r2, =0x060100c0
-	adds r1, r2
-	ldr r2, =0x04000008
-	bl CpuSet
-	mov r0, r8
-	ldr r3, [r0]
-	ldr r0, [r3, 0x14]
-	adds r0, r4, r0
-	ldrb r0, [r0, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	ldr r2, =gUnknown_08587A70
-	ldr r0, =gUnknown_02039F26
-	adds r0, r5, r0
-	ldrb r0, [r0]
-	adds r0, r2
-	ldrb r0, [r0]
-	strh r0, [r1, 0x22]
-	ldr r0, [r3, 0x14]
-	adds r0, r4, r0
-	ldrb r1, [r0, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r3, 0x5
-	negs r3, r3
-	adds r2, r3, 0
-	ands r1, r2
-	b _080DE0D6
-	.pool
-_080DE0BC:
-	mov r1, r9
-	ldr r0, [r1]
-	ldr r0, [r0, 0x14]
-	adds r0, r4, r0
-	ldrb r1, [r0, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-_080DE0D6:
-	strb r1, [r0]
-	adds r4, 0x4
-	adds r7, 0x1C
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DE026
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DE008
-
-	thumb_func_start sub_80DE0F0
-sub_80DE0F0: @ 80DE0F0
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r2, [r1, 0x4]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r2, r1, r2
-	ldrb r1, [r2, 0x10]
-	movs r0, 0xC0
-	ands r0, r1
-	cmp r0, 0x40
-	bne _080DE120
-	ldrb r0, [r2, 0x19]
-	lsls r0, 5
-	ldr r1, =gUnknown_08D8E9B4
-	adds r0, r1
-	b _080DE122
-	.pool
-_080DE120:
-	ldr r0, =gUnknown_08D8EA34
-_080DE122:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DE0F0
-
-	thumb_func_start sub_80DE12C
-sub_80DE12C: @ 80DE12C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	movs r7, 0
-	movs r0, 0x2
-	mov r10, r0
-	movs r0, 0x1
-	mov r8, r0
-	movs r0, 0x11
-	mov r9, r0
-_080DE146:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x8]
-	adds r0, 0xD
-	adds r0, r7
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080DE1CA
-	lsls r0, r7, 24
-	lsrs r0, 24
-	bl Contest_IsMonsTurnDisabled
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DE1CA
-	ldr r0, =gUnknown_02039F26
-	adds r0, r7, r0
-	ldrb r0, [r0]
-	lsls r5, r0, 2
-	adds r5, r0
-	adds r6, r5, 0x2
-	movs r0, 0x3
-	bl sub_80DB748
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r6, 24
-	lsrs r6, 24
-	mov r0, r10
-	str r0, [sp]
-	mov r0, r8
-	str r0, [sp, 0x4]
-	mov r0, r9
-	str r0, [sp, 0x8]
-	mov r0, r8
-	str r0, [sp, 0xC]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x14
-	adds r3, r6, 0
-	bl ContestBG_FillBoxWithIncrementingTile
-	adds r4, 0x10
-	lsls r4, 16
-	lsrs r4, 16
-	adds r5, 0x3
-	lsls r5, 24
-	lsrs r5, 24
-	mov r0, r10
-	str r0, [sp]
-	mov r0, r8
-	str r0, [sp, 0x4]
-	mov r0, r9
-	str r0, [sp, 0x8]
-	mov r0, r8
-	str r0, [sp, 0xC]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x14
-	adds r3, r5, 0
-	bl ContestBG_FillBoxWithIncrementingTile
-	movs r0, 0x63
-	bl PlaySE
-_080DE1CA:
-	adds r7, 0x1
-	cmp r7, 0x3
-	ble _080DE146
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE12C
-
-	thumb_func_start sub_80DE1E8
-sub_80DE1E8: @ 80DE1E8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r2, [r1, 0x4]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r2, r1, r2
-	ldrb r1, [r2, 0x15]
-	movs r3, 0x1
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080DE212
-	ldrb r1, [r2, 0xC]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080DE21C
-_080DE212:
-	movs r0, 0
-	b _080DE21E
-	.pool
-_080DE21C:
-	movs r0, 0x1
-_080DE21E:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DE1E8
-
-	thumb_func_start sub_80DE224
-sub_80DE224: @ 80DE224
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0xC
-	movs r0, 0xA
-	bl GetGpuReg
-	mov r1, sp
-	strh r0, [r1]
-	mov r2, sp
-	ldrb r1, [r2]
-	movs r4, 0x4
-	negs r4, r4
-	adds r0, r4, 0
-	ands r0, r1
-	strb r0, [r2]
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x1]
-	ldrb r1, [r2]
-	movs r0, 0xD
-	negs r0, r0
-	mov r8, r0
-	ands r0, r1
-	strb r0, [r2]
-	mov r0, sp
-	ldrh r1, [r0]
-	movs r0, 0xA
-	bl SetGpuReg
-	movs r0, 0x8
-	bl GetGpuReg
-	mov r6, sp
-	adds r6, 0x2
-	strh r0, [r6]
-	movs r0, 0xC
-	bl GetGpuReg
-	add r5, sp, 0x4
-	strh r0, [r5]
-	ldrb r1, [r6]
-	adds r0, r4, 0
-	ands r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r6]
-	ldrb r0, [r5]
-	ands r4, r0
-	orrs r4, r1
-	strb r4, [r5]
-	ldrh r1, [r6]
-	movs r0, 0x8
-	bl SetGpuReg
-	ldrh r1, [r5]
-	movs r0, 0xC
-	bl SetGpuReg
-	ldr r1, =gBattle_BG1_X
-	movs r0, 0xF0
-	strh r0, [r1]
-	ldr r4, =gBattle_BG1_Y
-	movs r0, 0xA0
-	strh r0, [r4]
-	movs r0, 0x14
-	movs r1, 0xF0
-	bl SetGpuReg
-	ldrh r1, [r4]
-	movs r0, 0x16
-	bl SetGpuReg
-	movs r0, 0
-	str r0, [sp, 0x8]
-	add r0, sp, 0x8
-	ldr r4, =gContestResources
-	ldr r1, [r4]
-	ldr r1, [r1, 0x28]
-	ldr r2, =0x05000400
-	bl CpuSet
-	ldr r1, =gUnknown_08C17980
-	movs r0, 0x1
-	movs r2, 0
-	movs r3, 0
-	bl CopyToBgTilemapBuffer
-	movs r0, 0x1
-	bl Contest_SetBgCopyFlags
-	movs r5, 0
-	ldr r7, =gSprites
-	movs r6, 0x4
-_080DE2F0:
-	ldr r0, [r4]
-	ldr r0, [r0, 0x14]
-	lsls r3, r5, 2
-	adds r0, r3, r0
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	ldrb r2, [r1, 0x5]
-	mov r0, r8
-	ands r0, r2
-	orrs r0, r6
-	strb r0, [r1, 0x5]
-	ldr r0, [r4]
-	ldr r0, [r0, 0x14]
-	adds r3, r0
-	ldrb r0, [r3, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	ldrb r2, [r1, 0x5]
-	mov r0, r8
-	ands r0, r2
-	orrs r0, r6
-	strb r0, [r1, 0x5]
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DE2F0
-	add sp, 0xC
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE224
-
-	thumb_func_start sub_80DE350
-sub_80DE350: @ 80DE350
-	push {r4-r7,lr}
-	sub sp, 0x8
-	ldr r1, =0x06008000
-	movs r2, 0x80
-	lsls r2, 6
-	movs r0, 0
-	movs r3, 0x1
-	bl RequestDma3Fill
-	movs r5, 0
-	str r5, [sp]
-	ldr r6, =gContestResources
-	ldr r0, [r6]
-	ldr r1, [r0, 0x28]
-	ldr r2, =0x05000400
-	mov r0, sp
-	bl CpuSet
-	movs r0, 0x1
-	bl Contest_SetBgCopyFlags
-	movs r0, 0xA
-	bl GetGpuReg
-	add r3, sp, 0x4
-	strh r0, [r3]
-	ldrb r1, [r3]
-	movs r0, 0x4
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r3]
-	mov r1, sp
-	adds r1, 0x5
-	ldrb r2, [r1]
-	movs r0, 0x3F
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r2, [r1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r1, [r3]
-	movs r4, 0xD
-	negs r4, r4
-	adds r0, r4, 0
-	ands r0, r1
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r3]
-	ldrh r1, [r3]
-	movs r0, 0xA
-	bl SetGpuReg
-	ldr r0, =gBattle_BG1_X
-	strh r5, [r0]
-	ldr r0, =gBattle_BG1_Y
-	strh r5, [r0]
-	ldr r7, =gSprites
-_080DE3CA:
-	ldr r0, [r6]
-	ldr r0, [r0, 0x14]
-	lsls r3, r5, 2
-	adds r0, r3, r0
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	ldrb r2, [r1, 0x5]
-	adds r0, r4, 0
-	ands r0, r2
-	strb r0, [r1, 0x5]
-	ldr r0, [r6]
-	ldr r0, [r0, 0x14]
-	adds r3, r0
-	ldrb r0, [r3, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	ldrb r2, [r1, 0x5]
-	adds r0, r4, 0
-	ands r0, r2
-	strb r0, [r1, 0x5]
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DE3CA
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE350
-
-	thumb_func_start sub_80DE424
-sub_80DE424: @ 80DE424
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, =gBattle_BG1_X
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gBattle_BG1_Y
-	movs r0, 0xA0
-	strh r0, [r1]
-	movs r0, 0x62
-	movs r1, 0
-	bl PlaySE12WithPanning
-	ldr r1, =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, =sub_80DE464
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE424
-
-	thumb_func_start sub_80DE464
-sub_80DE464: @ 80DE464
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, =gBattle_BG1_Y
-	ldrh r0, [r1]
-	subs r0, 0x7
-	strh r0, [r1]
-	lsls r0, 16
-	cmp r0, 0
-	bge _080DE47C
-	movs r0, 0
-	strh r0, [r1]
-_080DE47C:
-	ldrh r2, [r1]
-	cmp r2, 0
-	bne _080DE496
-	ldr r0, =gTasks
-	lsls r1, r3, 2
-	adds r1, r3
-	lsls r1, 3
-	adds r1, r0
-	strh r2, [r1, 0x8]
-	strh r2, [r1, 0xA]
-	strh r2, [r1, 0xC]
-	ldr r0, =sub_80DE4A8
-	str r0, [r1]
-_080DE496:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE464
-
-	thumb_func_start sub_80DE4A8
-sub_80DE4A8: @ 80DE4A8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gTasks
-	lsls r3, r4, 2
-	adds r0, r3, r4
-	lsls r0, 3
-	adds r5, r0, r1
-	movs r0, 0x8
-	ldrsh r1, [r5, r0]
-	cmp r1, 0x1
-	beq _080DE52C
-	cmp r1, 0x1
-	bgt _080DE4D0
-	cmp r1, 0
-	beq _080DE4DA
-	b _080DE5B4
-	.pool
-_080DE4D0:
-	cmp r1, 0x2
-	beq _080DE58A
-	cmp r1, 0x3
-	beq _080DE5A4
-	b _080DE5B4
-_080DE4DA:
-	movs r2, 0
-	adds r6, r3, 0
-	ldr r5, =gContestResources
-	ldr r3, =gUnknown_02039F26
-_080DE4E2:
-	ldr r0, [r5]
-	ldr r1, [r0]
-	adds r1, 0x14
-	adds r1, r2
-	adds r0, r2, r3
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _080DE4E2
-	bl sub_80DBF90
-	bl sub_80DC864
-	bl sub_80DB69C
-	bl sub_80DD04C
-	movs r0, 0x1
-	bl sub_80DE008
-	bl sub_80DC44C
-	ldr r0, =gTasks
-	adds r1, r6, r4
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x1
-	strh r0, [r1, 0x8]
-	b _080DE5B4
-	.pool
-_080DE52C:
-	ldr r0, =gIsLinkContest
-	ldrb r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _080DE584
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x7]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2, 0x7]
-	bl sub_80DA8A4
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DE552
-	bl sub_80DBAA0
-_080DE552:
-	ldr r4, =sub_80FCC88
-	adds r0, r4, 0
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =sub_80DA110
-	adds r1, r4, 0
-	bl SetTaskFuncWithFollowupFunc
-	bl sub_80DBF68
-	movs r0, 0x2
-	strh r0, [r5, 0x8]
-	b _080DE5B4
-	.pool
-_080DE584:
-	bl sub_80DBAA0
-	b _080DE59A
-_080DE58A:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	bne _080DE5B4
-_080DE59A:
-	movs r0, 0x3
-	strh r0, [r5, 0x8]
-	b _080DE5B4
-	.pool
-_080DE5A4:
-	bl sub_80DB884
-	bl sub_80DB2BC
-	movs r0, 0
-	strh r0, [r5, 0x8]
-	ldr r0, =sub_80DE5F4
-	str r0, [r5]
-_080DE5B4:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE4A8
-
-	thumb_func_start sub_80DE5C0
-sub_80DE5C0: @ 80DE5C0
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r1, =gBattle_BG1_Y
-	ldrh r0, [r1]
-	adds r0, 0x7
-	strh r0, [r1]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA0
-	ble _080DE5E4
-	ldr r0, =gTasks
-	lsls r1, r2, 2
-	adds r1, r2
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =sub_80DA4F4
-	str r0, [r1]
-_080DE5E4:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE5C0
-
-	thumb_func_start sub_80DE5F4
-sub_80DE5F4: @ 80DE5F4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldrh r2, [r1, 0xC]
-	movs r3, 0xC
-	ldrsh r0, [r1, r3]
-	cmp r0, 0x9
-	bgt _080DE618
-	adds r0, r2, 0x1
-	strh r0, [r1, 0xC]
-	b _080DE654
-	.pool
-_080DE618:
-	ldrh r3, [r1, 0xA]
-	movs r4, 0xA
-	ldrsh r0, [r1, r4]
-	cmp r0, 0
-	bne _080DE636
-	ldrh r2, [r1, 0x8]
-	movs r4, 0x8
-	ldrsh r0, [r1, r4]
-	cmp r0, 0x10
-	bne _080DE632
-	adds r0, r3, 0x1
-	strh r0, [r1, 0xA]
-	b _080DE654
-_080DE632:
-	adds r0, r2, 0x1
-	b _080DE652
-_080DE636:
-	ldrh r0, [r1, 0x8]
-	movs r3, 0x8
-	ldrsh r2, [r1, r3]
-	cmp r2, 0
-	bne _080DE650
-	strh r2, [r1, 0xA]
-	strh r2, [r1, 0xC]
-	ldr r0, =sub_80DE65C
-	str r0, [r1]
-	b _080DE654
-	.pool
-_080DE650:
-	subs r0, 0x1
-_080DE652:
-	strh r0, [r1, 0x8]
-_080DE654:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DE5F4
-
-	thumb_func_start sub_80DE65C
-sub_80DE65C: @ 80DE65C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-	ldrh r1, [r4, 0xC]
-	movs r2, 0xC
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x9
-	bgt _080DE680
-	adds r0, r1, 0x1
-	strh r0, [r4, 0xC]
-	b _080DE690
-	.pool
-_080DE680:
-	movs r0, 0
-	strh r0, [r4, 0xC]
-	movs r0, 0x61
-	movs r1, 0
-	bl PlaySE12WithPanning
-	ldr r0, =sub_80DE5C0
-	str r0, [r4]
-_080DE690:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE65C
-
-	thumb_func_start sub_80DE69C
-sub_80DE69C: @ 80DE69C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	movs r7, 0
-	ldr r6, =gSprites
-	ldr r5, =gContestResources
-_080DE6AE:
-	bl AllocOamMatrix
-	ldr r1, [r5]
-	ldr r1, [r1, 0x14]
-	lsls r4, r7, 2
-	adds r1, r4, r1
-	ldrb r1, [r1]
-	lsls r3, r1, 4
-	adds r3, r1
-	lsls r3, 2
-	adds r3, r6
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1F
-	ands r0, r1
-	lsls r0, 1
-	ldrb r1, [r3, 0x3]
-	movs r2, 0x3F
-	negs r2, r2
-	mov r12, r2
-	mov r2, r12
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r3, 0x3]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x14]
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r2, [r0, 0x1]
-	movs r3, 0x4
-	negs r3, r3
-	adds r1, r3, 0
-	ands r2, r1
-	movs r1, 0x1
-	orrs r2, r1
-	strb r2, [r0, 0x1]
-	ldr r0, [r5]
-	ldr r0, [r0, 0x14]
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	mov r1, r8
-	bl StartSpriteAffineAnim
-	mov r0, r8
-	cmp r0, 0x2
-	bne _080DE74C
-	ldr r0, [r5]
-	ldr r0, [r0, 0x14]
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	bl AnimateSprite
-	ldr r0, [r5]
-	ldr r0, [r0, 0x14]
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r3, 0x5
-	negs r3, r3
-	adds r2, r3, 0
-	ands r1, r2
-	strb r1, [r0]
-_080DE74C:
-	adds r7, 0x1
-	cmp r7, 0x3
-	ble _080DE6AE
-	ldr r0, =sub_80DE794
-	movs r1, 0x5
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	mov r0, r8
-	strh r0, [r1, 0x8]
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x7]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r2, 0x7]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE69C
-
-	thumb_func_start sub_80DE794
-sub_80DE794: @ 80DE794
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r2, =gSprites
-	ldr r3, =gContestResources
-	ldr r0, [r3]
-	ldr r0, [r0, 0x14]
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3F
-	ldrb r0, [r0]
-	lsls r0, 26
-	cmp r0, 0
-	bge _080DE822
-	ldr r0, =gTasks
-	lsls r1, r6, 2
-	adds r1, r6
-	lsls r1, 3
-	adds r1, r0
-	ldrb r0, [r1, 0x8]
-	cmp r0, 0x1
-	bne _080DE7EC
-	movs r4, 0
-	adds r5, r2, 0
-	movs r2, 0x4
-_080DE7CC:
-	ldr r0, [r3]
-	ldr r1, [r0, 0x14]
-	lsls r0, r4, 2
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	orrs r1, r2
-	strb r1, [r0]
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DE7CC
-_080DE7EC:
-	movs r4, 0
-_080DE7EE:
-	ldr r5, =gContestResources
-	ldr r0, [r5]
-	ldr r1, [r0, 0x14]
-	lsls r0, r4, 2
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl FreeSpriteOamMatrix
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DE7EE
-	ldr r0, [r5]
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x7]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x7]
-	adds r0, r6, 0
-	bl DestroyTask
-_080DE822:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE794
-
-	thumb_func_start sub_80DE834
-sub_80DE834: @ 80DE834
-	push {lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	movs r0, 0xB1
-	lsls r0, 1
-	cmp r1, r0
-	bls _080DE844
-	movs r1, 0x1
-_080DE844:
-	adds r0, r1, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DE834
-
-	thumb_func_start sub_80DE84C
-sub_80DE84C: @ 80DE84C
-	push {lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	ldr r0, =0x0000019b
-	cmp r1, r0
-	bls _080DE85A
-	movs r1, 0
-_080DE85A:
-	adds r0, r1, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DE84C
-
-	thumb_func_start sub_80DE864
-sub_80DE864: @ 80DE864
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r4, =gContestResources
-	ldr r0, [r4]
-	ldr r1, [r0, 0x4]
-	lsls r0, r7, 3
-	subs r0, r7
-	lsls r0, 2
-	adds r0, r1
-	ldrh r0, [r0, 0x6]
-	bl sub_80DE834
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldr r1, =gContestMons
-	lsls r0, r7, 6
-	adds r0, r1
-	ldrh r0, [r0]
-	bl sub_80DE84C
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldr r0, [r4]
-	ldr r0, [r0, 0x18]
-	movs r1, 0
-	movs r2, 0x14
-	bl memset
-	bl ClearBattleAnimationVars
-	ldr r1, =gBattleMonForms
-	movs r2, 0
-	adds r0, r1, 0x3
-_080DE8A8:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _080DE8A8
-	cmp r5, 0x90
-	beq _080DE920
-	cmp r5, 0x90
-	bgt _080DE8DE
-	cmp r5, 0x4C
-	beq _080DE978
-	cmp r5, 0x4C
-	bgt _080DE8D4
-	cmp r5, 0xD
-	beq _080DE978
-	b _080DE9A2
-	.pool
-_080DE8D4:
-	cmp r5, 0x82
-	beq _080DE978
-	cmp r5, 0x8F
-	beq _080DE978
-	b _080DE9A2
-_080DE8DE:
-	cmp r5, 0xD8
-	beq _080DE960
-	cmp r5, 0xD8
-	bgt _080DE8EC
-	cmp r5, 0xAE
-	beq _080DE8FA
-	b _080DE9A2
-_080DE8EC:
-	cmp r5, 0xDA
-	beq _080DE96C
-	movs r0, 0x88
-	lsls r0, 1
-	cmp r5, r0
-	beq _080DE920
-	b _080DE9A2
-_080DE8FA:
-	ldr r0, =gBaseStats
-	lsls r1, r6, 3
-	subs r1, r6
-	lsls r1, 2
-	adds r1, r0
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0x7
-	beq _080DE910
-	ldrb r0, [r1, 0x7]
-	cmp r0, 0x7
-	bne _080DE99C
-_080DE910:
-	ldr r1, =gAnimMoveTurn
-	movs r0, 0
-	b _080DE9A0
-	.pool
-_080DE920:
-	ldr r6, =gContestResources
-	ldr r0, [r6]
-	ldr r1, [r0, 0x4]
-	lsls r0, r7, 3
-	subs r0, r7
-	lsls r0, 2
-	adds r0, r1
-	ldrb r4, [r0, 0x1B]
-	ldr r5, =gContestMons
-	lsls r4, 6
-	adds r0, r4, r5
-	ldrh r0, [r0]
-	bl sub_80DE84C
-	ldr r2, [r6]
-	ldr r1, [r2, 0x18]
-	strh r0, [r1, 0x2]
-	ldr r2, [r2, 0x18]
-	adds r5, 0x38
-	adds r4, r5
-	ldr r0, [r4]
-	str r0, [r2, 0x10]
-	ldrb r0, [r2, 0x4]
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2, 0x4]
-	b _080DE9A2
-	.pool
-_080DE960:
-	ldr r1, =gAnimFriendship
-	movs r0, 0xFF
-	b _080DE9A0
-	.pool
-_080DE96C:
-	ldr r1, =gAnimFriendship
-	movs r0, 0
-	b _080DE9A0
-	.pool
-_080DE978:
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0]
-	adds r2, r0, 0
-	adds r2, 0x5A
-	ldrb r1, [r2]
-	cmp r1, 0
-	bne _080DE99C
-	movs r0, 0x2
-	strb r0, [r2]
-	ldr r0, =gAnimMoveTurn
-	strb r1, [r0]
-	b _080DE9A2
-	.pool
-_080DE99C:
-	ldr r1, =gAnimMoveTurn
-	movs r0, 0x1
-_080DE9A0:
-	strb r0, [r1]
-_080DE9A2:
-	bl sub_80DEA5C
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE864
-
-	thumb_func_start sub_80DE9B0
-sub_80DE9B0: @ 80DE9B0
-	push {r4,lr}
-	ldr r4, =gContestResources
-	ldr r0, [r4]
-	ldr r0, [r0, 0x18]
-	movs r1, 0
-	movs r2, 0x14
-	bl memset
-	ldr r0, [r4]
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0x5A
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _080DE9D2
-	subs r0, 0x1
-	strb r0, [r1]
-_080DE9D2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE9B0
-
-	thumb_func_start sub_80DE9DC
-sub_80DE9DC: @ 80DE9DC
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r6, =gContestResources
-	ldr r0, [r6]
-	ldr r0, [r0, 0x18]
-	strb r4, [r0, 0x5]
-	ldr r5, =gContestMons
-	lsls r4, 6
-	adds r0, r4, r5
-	ldrh r0, [r0]
-	bl sub_80DE84C
-	ldr r2, [r6]
-	ldr r1, [r2, 0x18]
-	strh r0, [r1]
-	ldr r1, [r2, 0x18]
-	adds r0, r5, 0
-	adds r0, 0x38
-	adds r0, r4, r0
-	ldr r0, [r0]
-	str r0, [r1, 0x8]
-	adds r5, 0x3C
-	adds r4, r5
-	ldr r0, [r4]
-	str r0, [r1, 0xC]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DE9DC
-
-	thumb_func_start sub_80DEA20
-sub_80DEA20: @ 80DEA20
-	push {lr}
-	ldr r0, =SpriteCallbackDummy
-	bl CreateInvisibleSpriteWithCallback
-	ldr r1, =gBattlerSpriteIds
-	strb r0, [r1, 0x3]
-	ldr r0, =gBattlerTarget
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl InitSpriteAffineAnim
-	bl sub_80DEA5C
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DEA20
-
-	thumb_func_start sub_80DEA5C
-sub_80DEA5C: @ 80DEA5C
-	push {r4,lr}
-	ldr r0, =gBattlerSpriteIds
-	ldrb r0, [r0, 0x3]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	movs r0, 0
-	strh r0, [r4, 0x24]
-	strh r0, [r4, 0x26]
-	movs r0, 0x3
-	movs r1, 0
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x20]
-	movs r0, 0x3
-	movs r1, 0x1
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x22]
-	adds r4, 0x3E
-	ldrb r0, [r4]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DEA5C
-
-	thumb_func_start sub_80DEAA8
-sub_80DEAA8: @ 80DEAA8
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r2, =gBattleMoves
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0x20
-	bhi _080DEB60
-	lsls r0, 2
-	ldr r1, =_080DEAD0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080DEAD0:
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB54
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB54
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-	.4byte _080DEB60
-_080DEB54:
-	ldr r1, =gBattlerTarget
-	movs r0, 0x2
-	b _080DEB64
-	.pool
-_080DEB60:
-	ldr r1, =gBattlerTarget
-	movs r0, 0x3
-_080DEB64:
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DEAA8
-
-	thumb_func_start Contest_PrintTextToBg0WindowStd
-Contest_PrintTextToBg0WindowStd: @ 80DEB70
-	push {r4,lr}
-	sub sp, 0x10
-	adds r4, r0, 0
-	str r1, [sp]
-	mov r0, sp
-	movs r2, 0
-	strb r4, [r0, 0x4]
-	movs r1, 0x1
-	strb r1, [r0, 0x5]
-	strb r2, [r0, 0x6]
-	strb r1, [r0, 0x7]
-	strb r2, [r0, 0x8]
-	strb r1, [r0, 0x9]
-	strb r2, [r0, 0xA]
-	strb r2, [r0, 0xB]
-	mov r3, sp
-	ldrb r2, [r3, 0xC]
-	subs r1, 0x11
-	adds r0, r1, 0
-	ands r0, r2
-	strb r0, [r3, 0xC]
-	mov r2, sp
-	movs r0, 0xF0
-	strb r0, [r2, 0xC]
-	ldrb r0, [r2, 0xD]
-	ands r1, r0
-	strb r1, [r2, 0xD]
-	mov r1, sp
-	movs r0, 0x80
-	strb r0, [r1, 0xD]
-	mov r0, sp
-	movs r1, 0
-	movs r2, 0
-	bl AddTextPrinter
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl PutWindowTilemap
-	movs r0, 0
-	bl Contest_SetBgCopyFlags
-	add sp, 0x10
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end Contest_PrintTextToBg0WindowStd
-
-	thumb_func_start Contest_PrintTextToBg0WindowAt
-Contest_PrintTextToBg0WindowAt: @ 80DEBD0
-	push {r4,r5,lr}
-	sub sp, 0x10
-	adds r5, r0, 0
-	ldr r4, [sp, 0x1C]
-	str r1, [sp]
-	mov r0, sp
-	movs r1, 0
-	strb r5, [r0, 0x4]
-	strb r4, [r0, 0x5]
-	strb r2, [r0, 0x6]
-	strb r3, [r0, 0x7]
-	strb r2, [r0, 0x8]
-	strb r3, [r0, 0x9]
-	strb r1, [r0, 0xA]
-	strb r1, [r0, 0xB]
-	mov r3, sp
-	ldrb r2, [r3, 0xC]
-	subs r1, 0x10
-	adds r0, r1, 0
-	ands r0, r2
-	strb r0, [r3, 0xC]
-	mov r2, sp
-	movs r0, 0xF0
-	strb r0, [r2, 0xC]
-	ldrb r0, [r2, 0xD]
-	ands r1, r0
-	strb r1, [r2, 0xD]
-	mov r1, sp
-	movs r0, 0x80
-	strb r0, [r1, 0xD]
-	mov r0, sp
-	movs r1, 0
-	movs r2, 0
-	bl AddTextPrinter
-	lsls r5, 24
-	lsrs r5, 24
-	adds r0, r5, 0
-	bl PutWindowTilemap
-	movs r0, 0
-	bl Contest_SetBgCopyFlags
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end Contest_PrintTextToBg0WindowAt
-
-	thumb_func_start Contest_StartTextPrinter
-Contest_StartTextPrinter: @ 80DEC30
-	push {r4,r5,lr}
-	sub sp, 0x10
-	str r0, [sp]
-	mov r2, sp
-	movs r3, 0
-	movs r0, 0x4
-	strb r0, [r2, 0x4]
-	mov r0, sp
-	movs r5, 0x1
-	strb r5, [r0, 0x5]
-	strb r3, [r0, 0x6]
-	strb r5, [r0, 0x7]
-	strb r3, [r0, 0x8]
-	strb r5, [r0, 0x9]
-	strb r3, [r0, 0xA]
-	strb r3, [r0, 0xB]
-	mov r4, sp
-	ldrb r3, [r4, 0xC]
-	movs r2, 0x10
-	negs r2, r2
-	adds r0, r2, 0
-	ands r0, r3
-	strb r0, [r4, 0xC]
-	mov r3, sp
-	movs r0, 0x10
-	strb r0, [r3, 0xC]
-	ldrb r0, [r3, 0xD]
-	ands r2, r0
-	strb r2, [r3, 0xD]
-	mov r2, sp
-	movs r0, 0x80
-	strb r0, [r2, 0xD]
-	cmp r1, 0
-	bne _080DEC80
-	mov r0, sp
-	movs r1, 0
-	movs r2, 0
-	bl AddTextPrinter
-	b _080DECA4
-_080DEC80:
-	ldr r0, =gIsLinkContest
-	ldrb r1, [r0]
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080DEC94
-	movs r1, 0x4
-	b _080DEC9C
-	.pool
-_080DEC94:
-	bl GetPlayerTextSpeedDelay
-	lsls r0, 24
-	lsrs r1, r0, 24
-_080DEC9C:
-	mov r0, sp
-	movs r2, 0
-	bl AddTextPrinter
-_080DECA4:
-	movs r0, 0x4
-	bl PutWindowTilemap
-	movs r0, 0
-	bl Contest_SetBgCopyFlags
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end Contest_StartTextPrinter
-
-	thumb_func_start ContestBG_FillBoxWithIncrementingTile
-ContestBG_FillBoxWithIncrementingTile: @ 80DECB8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x10
-	mov r8, r0
-	ldr r0, [sp, 0x28]
-	ldr r4, [sp, 0x2C]
-	ldr r5, [sp, 0x30]
-	ldr r6, [sp, 0x34]
-	mov r7, r8
-	lsls r7, 24
-	lsrs r7, 24
-	mov r8, r7
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	lsrs r5, 24
-	str r0, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	lsls r6, 16
-	asrs r6, 16
-	str r6, [sp, 0xC]
-	mov r0, r8
-	bl WriteSequenceToBgTilemapBuffer
-	mov r0, r8
-	bl Contest_SetBgCopyFlags
-	add sp, 0x10
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end ContestBG_FillBoxWithIncrementingTile
-
-	thumb_func_start ContestBG_FillBoxWithTile
-ContestBG_FillBoxWithTile: @ 80DED10
-	push {r4-r6,lr}
-	sub sp, 0x10
-	ldr r4, [sp, 0x20]
-	ldr r5, [sp, 0x24]
-	ldr r6, [sp, 0x28]
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r6, 24
-	lsrs r6, 24
-	str r4, [sp]
-	str r5, [sp, 0x4]
-	str r6, [sp, 0x8]
-	movs r4, 0
-	str r4, [sp, 0xC]
-	bl ContestBG_FillBoxWithIncrementingTile
-	add sp, 0x10
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end ContestBG_FillBoxWithTile
-
-	thumb_func_start Contest_RunTextPrinters
-Contest_RunTextPrinters: @ 80DED4C
-	push {lr}
-	bl RunTextPrinters
-	movs r0, 0x4
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r1}
-	bx r1
-	thumb_func_end Contest_RunTextPrinters
-
-	thumb_func_start Contest_SetBgCopyFlags
-Contest_SetBgCopyFlags: @ 80DED60
-	ldr r2, =sContestBgCopyFlags
-	movs r1, 0x1
-	lsls r1, r0
-	ldrb r0, [r2]
-	orrs r1, r0
-	strb r1, [r2]
-	bx lr
-	.pool
-	thumb_func_end Contest_SetBgCopyFlags
-
-	thumb_func_start ResetContestLinkResults
-ResetContestLinkResults: @ 80DED74
-	push {r4-r6,lr}
-	movs r0, 0
-	ldr r6, =gSaveBlock2Ptr
-	ldr r5, =0x00000624
-	movs r4, 0
-_080DED7E:
-	adds r3, r0, 0x1
-	lsls r1, r0, 3
-	movs r2, 0x3
-_080DED84:
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r1
-	strh r4, [r0]
-	adds r1, 0x2
-	subs r2, 0x1
-	cmp r2, 0
-	bge _080DED84
-	adds r0, r3, 0
-	cmp r0, 0x4
-	ble _080DED7E
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ResetContestLinkResults
-
-	thumb_func_start sub_80DEDA8
-sub_80DEDA8: @ 80DEDA8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	movs r5, 0
-	ldr r1, =gContestFinalStandings
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _080DEDE6
-_080DEDD8:
-	adds r5, 0x1
-	cmp r5, 0x2
-	bgt _080DEDE6
-	adds r0, r5, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DEDD8
-_080DEDE6:
-	ldr r0, [sp]
-	cmp r0, 0xFF
-	bne _080DEE00
-	ldr r0, =gContestPlayerMonIndex
-	ldrb r0, [r0]
-	cmp r5, r0
-	beq _080DEE00
-	movs r0, 0
-	b _080DEF90
-	.pool
-_080DEE00:
-	ldr r0, =gSpecialVar_ContestCategory
-	ldrh r0, [r0]
-	cmp r0, 0x4
-	bhi _080DEE4C
-	lsls r0, 2
-	ldr r1, =_080DEE1C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080DEE1C:
-	.4byte _080DEE4C
-	.4byte _080DEE30
-	.4byte _080DEE36
-	.4byte _080DEE3C
-	.4byte _080DEE42
-_080DEE30:
-	mov r0, r8
-	adds r0, 0x3
-	b _080DEE46
-_080DEE36:
-	mov r0, r8
-	adds r0, 0x6
-	b _080DEE46
-_080DEE3C:
-	mov r0, r8
-	adds r0, 0x9
-	b _080DEE46
-_080DEE42:
-	mov r0, r8
-	adds r0, 0xC
-_080DEE46:
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-_080DEE4C:
-	ldr r1, [sp]
-	cmp r1, 0xFE
-	bne _080DEE54
-	b _080DEF50
-_080DEE54:
-	adds r0, r1, 0
-	movs r1, 0x1
-	bl sub_80DEFA8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	ldr r2, =gSaveBlock1Ptr
-	mov r10, r2
-	ldr r0, [r2]
-	mov r3, r9
-	lsls r7, r3, 5
-	ldr r6, =0x00002e90
-	adds r2, r0, r6
-	adds r2, r7
-	ldr r4, =gContestMons
-	lsls r5, 6
-	adds r1, r4, 0
-	adds r1, 0x38
-	adds r1, r5, r1
-	ldr r1, [r1]
-	str r1, [r2]
-	adds r1, r0, r7
-	adds r2, r5, r4
-	ldrh r2, [r2]
-	ldr r3, =0x00002e98
-	adds r1, r3
-	strh r2, [r1]
-	ldr r1, =0x00002e94
-	adds r2, r0, r1
-	adds r2, r7
-	adds r1, r4, 0
-	adds r1, 0x3C
-	adds r1, r5, r1
-	ldr r1, [r1]
-	str r1, [r2]
-	adds r6, r7, r6
-	adds r0, r6
-	adds r0, 0xB
-	adds r1, r4, 0x2
-	adds r1, r5, r1
-	bl StringCopy
-	mov r2, r10
-	ldr r0, [r2]
-	adds r0, r6
-	adds r0, 0x16
-	adds r4, 0xD
-	adds r5, r4
-	adds r1, r5, 0
-	bl StringCopy
-	ldr r0, =gIsLinkContest
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080DEEF4
-	mov r3, r10
-	ldr r0, [r3]
-	adds r0, r7
-	ldr r1, =0x00002eae
-	adds r0, r1
-	movs r1, 0x4
-	b _080DEF02
-	.pool
-_080DEEF4:
-	mov r2, r10
-	ldr r0, [r2]
-	adds r0, r7
-	ldr r1, =gSpecialVar_ContestRank
-	ldrh r1, [r1]
-	ldr r3, =0x00002eae
-	adds r0, r3
-_080DEF02:
-	strb r1, [r0]
-	ldr r0, [sp]
-	cmp r0, 0xFF
-	beq _080DEF34
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	mov r2, r9
-	lsls r1, r2, 5
-	adds r0, r1
-	ldr r1, =gSpecialVar_ContestCategory
-	ldrh r1, [r1]
-	ldr r3, =0x00002e9a
-	adds r0, r3
-	strb r1, [r0]
-	b _080DEF8E
-	.pool
-_080DEF34:
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	mov r2, r9
-	lsls r1, r2, 5
-	adds r0, r1
-	ldr r3, =0x00002e9a
-	adds r0, r3
-	mov r1, r8
-	strb r1, [r0]
-	b _080DEF8E
-	.pool
-_080DEF50:
-	ldr r6, =gUnknown_02039F3C
-	ldr r4, =gContestMons
-	lsls r5, 6
-	adds r0, r4, 0
-	adds r0, 0x38
-	adds r0, r5, r0
-	ldr r0, [r0]
-	str r0, [r6]
-	adds r0, r4, 0
-	adds r0, 0x3C
-	adds r0, r5, r0
-	ldr r0, [r0]
-	str r0, [r6, 0x4]
-	adds r0, r5, r4
-	ldrh r0, [r0]
-	strh r0, [r6, 0x8]
-	adds r0, r6, 0
-	adds r0, 0xB
-	adds r1, r4, 0x2
-	adds r1, r5, r1
-	bl StringCopy
-	adds r0, r6, 0
-	adds r0, 0x16
-	adds r4, 0xD
-	adds r5, r4
-	adds r1, r5, 0
-	bl StringCopy
-	mov r2, r8
-	strb r2, [r6, 0xA]
-_080DEF8E:
-	movs r0, 0x1
-_080DEF90:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80DEDA8
-
-	thumb_func_start sub_80DEFA8
-sub_80DEFA8: @ 80DEFA8
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	cmp r0, 0x3
-	bgt _080DEFF8
-	cmp r0, 0
-	blt _080DEFF8
-	cmp r1, 0
-	beq _080DEFE6
-	movs r2, 0x5
-	ldr r0, =gSaveBlock1Ptr
-	mov r12, r0
-	ldr r4, =0x00002e90
-	ldr r3, =0x00002e70
-_080DEFC8:
-	mov r1, r12
-	ldr r0, [r1]
-	lsls r1, r2, 5
-	adds r1, r0
-	adds r0, r1, r4
-	adds r1, r3
-	ldm r1!, {r5-r7}
-	stm r0!, {r5-r7}
-	ldm r1!, {r5-r7}
-	stm r0!, {r5-r7}
-	ldm r1!, {r5,r6}
-	stm r0!, {r5,r6}
-	subs r2, 0x1
-	cmp r2, 0
-	bgt _080DEFC8
-_080DEFE6:
-	movs r0, 0
-	b _080DF03A
-	.pool
-_080DEFF8:
-	ldr r0, =gSpecialVar_ContestCategory
-	ldrh r0, [r0]
-	cmp r0, 0x4
-	bhi _080DF038
-	lsls r0, 2
-	ldr r1, =_080DF014
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080DF014:
-	.4byte _080DF028
-	.4byte _080DF02C
-	.4byte _080DF030
-	.4byte _080DF034
-	.4byte _080DF038
-_080DF028:
-	movs r0, 0x8
-	b _080DF03A
-_080DF02C:
-	movs r0, 0x9
-	b _080DF03A
-_080DF030:
-	movs r0, 0xA
-	b _080DF03A
-_080DF034:
-	movs r0, 0xB
-	b _080DF03A
-_080DF038:
-	movs r0, 0xC
-_080DF03A:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DEFA8
-
-	thumb_func_start ClearContestWinnerPicsInContestHall
-ClearContestWinnerPicsInContestHall: @ 80DF040
-	push {r4-r7,lr}
-	movs r2, 0
-	ldr r0, =gSaveBlock1Ptr
-	mov r12, r0
-	ldr r4, =0x00002e90
-	ldr r3, =gUnknown_08587FA4
-_080DF04C:
-	mov r1, r12
-	ldr r0, [r1]
-	lsls r1, r2, 5
-	adds r0, r1
-	adds r0, r4
-	adds r1, r3, 0
-	ldm r1!, {r5-r7}
-	stm r0!, {r5-r7}
-	ldm r1!, {r5-r7}
-	stm r0!, {r5-r7}
-	ldm r1!, {r5,r6}
-	stm r0!, {r5,r6}
-	adds r3, 0x20
-	adds r2, 0x1
-	cmp r2, 0x7
-	ble _080DF04C
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearContestWinnerPicsInContestHall
-
-	thumb_func_start sub_80DF080
-sub_80DF080: @ 80DF080
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r2, =gContestResources
-	ldr r3, [r2]
-	ldr r5, [r3, 0x10]
-	ldrb r1, [r5, 0x1]
-	movs r7, 0x1
-	adds r0, r7, 0
-	ands r0, r1
-	adds r6, r2, 0
-	cmp r0, 0
-	bne _080DF0D2
-	movs r0, 0
-	ldrsb r0, [r5, r0]
-	cmp r0, 0
-	ble _080DF0D2
-	ldr r1, [r3, 0x4]
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x15]
-	adds r0, r7, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080DF0D2
-	ldr r1, [r3, 0x1C]
-	lsls r2, r4, 4
-	adds r1, r2, r1
-	ldrb r3, [r1, 0xC]
-	movs r0, 0x1
-	orrs r0, r3
-	strb r0, [r1, 0xC]
-	ldr r0, [r6]
-	ldr r0, [r0, 0x1C]
-	adds r2, r0
-	ldrb r0, [r2, 0xE]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r2, 0xE]
-_080DF0D2:
-	ldr r3, [r6]
-	ldr r1, [r3, 0x4]
-	lsls r2, r4, 3
-	subs r0, r2, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0xC]
-	movs r5, 0x1
-	adds r0, r5, 0
-	ands r0, r1
-	adds r7, r2, 0
-	cmp r0, 0
-	beq _080DF0FA
-	ldr r0, [r3, 0x1C]
-	lsls r1, r4, 4
-	adds r1, r0
-	ldrb r2, [r1, 0xC]
-	movs r0, 0x2
-	orrs r0, r2
-	strb r0, [r1, 0xC]
-_080DF0FA:
-	ldr r3, [r6]
-	ldr r2, [r3, 0x10]
-	ldrb r1, [r2, 0x1]
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080DF126
-	movs r0, 0
-	ldrsb r0, [r2, r0]
-	cmp r0, 0
-	beq _080DF126
-	movs r0, 0x2
-	ldrsb r0, [r2, r0]
-	cmp r0, 0x3C
-	bne _080DF126
-	ldr r0, [r3, 0x1C]
-	lsls r1, r4, 4
-	adds r1, r0
-	ldrb r2, [r1, 0xC]
-	movs r0, 0x4
-	orrs r0, r2
-	strb r0, [r1, 0xC]
-_080DF126:
-	ldr r3, [r6]
-	ldr r1, [r3, 0x4]
-	subs r0, r7, r4
-	lsls r0, 2
-	adds r2, r0, r1
-	ldrb r1, [r2, 0x15]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _080DF14E
-	ldrb r0, [r2, 0x16]
-	cmp r0, 0
-	beq _080DF14E
-	ldr r0, [r3, 0x1C]
-	lsls r1, r4, 4
-	adds r1, r0
-	ldrb r2, [r1, 0xC]
-	movs r0, 0x8
-	orrs r0, r2
-	strb r0, [r1, 0xC]
-_080DF14E:
-	movs r3, 0
-	movs r5, 0
-_080DF152:
-	cmp r3, r4
-	beq _080DF180
-	ldr r1, [r6]
-	ldr r0, [r1, 0x4]
-	adds r0, r5, r0
-	ldrb r0, [r0, 0xE]
-	cmp r0, 0
-	beq _080DF180
-	ldr r0, [r1, 0x1C]
-	lsls r2, r4, 4
-	adds r2, r0
-	ldrb r0, [r2, 0xC]
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r2, 0xC]
-	ldr r0, [r6]
-	ldr r0, [r0, 0x1C]
-	lsls r2, r3, 4
-	adds r2, r0
-	ldrb r0, [r2, 0xC]
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r2, 0xC]
-_080DF180:
-	adds r5, 0x1C
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _080DF152
-	ldr r2, [r6]
-	ldr r1, [r2, 0x4]
-	subs r0, r7, r4
-	lsls r5, r0, 2
-	adds r1, r5, r1
-	ldrb r3, [r1, 0xC]
-	movs r0, 0x6
-	ands r0, r3
-	cmp r0, 0
-	bne _080DF1A6
-	ldrb r1, [r1, 0xB]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _080DF1BC
-_080DF1A6:
-	ldr r0, [r2, 0x1C]
-	lsls r1, r4, 4
-	adds r1, r0
-	ldrb r2, [r1, 0xC]
-	movs r0, 0x20
-	orrs r0, r2
-	strb r0, [r1, 0xC]
-	b _080DF1F6
-	.pool
-_080DF1BC:
-	movs r0, 0x1
-	ands r0, r3
-	cmp r0, 0
-	bne _080DF1F6
-	ldr r2, [r2, 0x1C]
-	lsls r3, r4, 4
-	adds r2, r3, r2
-	ldrb r0, [r2, 0xC]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0xC]
-	ldr r0, [r6]
-	ldr r1, [r0, 0x1C]
-	adds r1, r3, r1
-	ldrb r0, [r1, 0xE]
-	movs r2, 0x1
-	orrs r0, r2
-	strb r0, [r1, 0xE]
-	ldr r1, [r6]
-	ldr r0, [r1, 0x1C]
-	adds r3, r0
-	ldr r0, [r1]
-	ldrb r0, [r0, 0x1]
-	lsls r0, 1
-	adds r3, r0
-	ldr r0, [r1, 0x4]
-	adds r0, r5, r0
-	ldrh r0, [r0, 0x6]
-	strh r0, [r3]
-_080DF1F6:
-	ldr r2, [r6]
-	ldr r1, [r2, 0x4]
-	subs r0, r7, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x15]
-	movs r5, 0x1
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080DF21A
-	ldr r0, [r2, 0x1C]
-	lsls r1, r4, 4
-	adds r1, r0
-	ldrb r2, [r1, 0xD]
-	movs r0, 0x2
-	orrs r0, r2
-	strb r0, [r1, 0xD]
-_080DF21A:
-	ldr r2, [r6]
-	ldr r0, [r2]
-	ldrb r0, [r0, 0x13]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0x4
-	bne _080DF24A
-	ldr r3, [r2, 0x10]
-	ldrb r1, [r3, 0x1]
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080DF24A
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	cmp r0, 0
-	bge _080DF24A
-	ldr r0, [r2, 0x1C]
-	lsls r1, r4, 4
-	adds r1, r0
-	ldrb r2, [r1, 0xD]
-	movs r0, 0x20
-	orrs r0, r2
-	strb r0, [r1, 0xD]
-_080DF24A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DF080
-
-	thumb_func_start sub_80DF250
-sub_80DF250: @ 80DF250
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x38
-	movs r1, 0
-	movs r0, 0
-	str r0, [sp, 0x20]
-	movs r4, 0
-	ldr r6, =gContestResources
-	mov r2, sp
-	adds r2, 0xC
-	str r2, [sp, 0x28]
-	mov r3, sp
-	adds r3, 0x14
-	str r3, [sp, 0x2C]
-	mov r7, sp
-	adds r7, 0x2
-	str r7, [sp, 0x24]
-	ldr r5, =gContestFinalStandings
-	movs r2, 0
-	movs r3, 0x80
-	lsls r3, 17
-_080DF280:
-	adds r0, r4, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DF298
-	lsrs r0, r2, 24
-	str r0, [sp, 0x20]
-	b _080DF29E
-	.pool
-_080DF298:
-	cmp r0, 0x3
-	bne _080DF29E
-	lsrs r1, r2, 24
-_080DF29E:
-	adds r2, r3
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _080DF280
-	ldr r0, [r6]
-	ldr r0, [r0, 0x1C]
-	lsls r1, 4
-	adds r1, r0
-	ldrb r2, [r1, 0xD]
-	movs r0, 0x1
-	orrs r0, r2
-	strb r0, [r1, 0xD]
-	movs r4, 0
-	ldr r1, [sp, 0x20]
-	lsls r1, 4
-	str r1, [sp, 0x30]
-	mov r9, r4
-	mov r10, r4
-_080DF2C2:
-	ldr r2, [sp, 0x20]
-	cmp r4, r2
-	beq _080DF2EE
-	ldr r1, =gUnknown_02039F08
-	lsls r0, r2, 1
-	adds r0, r1
-	movs r3, 0
-	ldrsh r2, [r0, r3]
-	add r1, r10
-	movs r6, 0
-	ldrsh r0, [r1, r6]
-	subs r2, r0
-	cmp r2, 0x32
-	bgt _080DF2EE
-	ldr r7, =gContestResources
-	ldr r0, [r7]
-	ldr r2, [r0, 0x1C]
-	add r2, r9
-	ldrb r0, [r2, 0xD]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2, 0xD]
-_080DF2EE:
-	ldr r1, =gContestResources
-	ldr r0, [r1]
-	ldr r0, [r0, 0x1C]
-	mov r3, r9
-	adds r2, r3, r0
-	ldrb r1, [r2, 0xE]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _080DF30A
-	ldrb r0, [r2, 0xD]
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r2, 0xD]
-_080DF30A:
-	movs r5, 0
-	ldr r2, =gContestMonConditions
-	add r2, r10
-	movs r6, 0
-	ldrsh r1, [r2, r6]
-	ldr r7, =gContestMonConditions
-	movs r3, 0
-	ldrsh r0, [r7, r3]
-	cmp r1, r0
-	blt _080DF336
-	adds r3, r2, 0
-	adds r2, r7, 0
-_080DF322:
-	adds r2, 0x2
-	adds r5, 0x1
-	cmp r5, 0x3
-	bgt _080DF336
-	movs r6, 0
-	ldrsh r1, [r3, r6]
-	movs r7, 0
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	bge _080DF322
-_080DF336:
-	cmp r5, 0x4
-	bne _080DF354
-	ldr r1, =gContestFinalStandings
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080DF354
-	ldr r2, =gContestResources
-	ldr r0, [r2]
-	ldr r2, [r0, 0x1C]
-	add r2, r9
-	ldrb r0, [r2, 0xD]
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r2, 0xD]
-_080DF354:
-	movs r3, 0
-	mov r12, r3
-	mov r8, r3
-	movs r5, 0
-	ldr r0, =gContestMonConditions
-	add r0, r10
-	movs r7, 0
-	ldrsh r6, [r0, r7]
-	str r6, [sp, 0x34]
-	ldr r2, =gContestMonConditions
-	ldr r0, =gUnknown_02039F18
-	mov r1, r10
-	adds r6, r1, r0
-	adds r3, r0, 0
-_080DF370:
-	movs r7, 0
-	ldrsh r0, [r2, r7]
-	ldr r1, [sp, 0x34]
-	cmp r1, r0
-	ble _080DF37E
-	movs r7, 0x1
-	mov r12, r7
-_080DF37E:
-	movs r0, 0
-	ldrsh r1, [r6, r0]
-	movs r7, 0
-	ldrsh r0, [r3, r7]
-	cmp r1, r0
-	ble _080DF38E
-	movs r0, 0x1
-	mov r8, r0
-_080DF38E:
-	adds r2, 0x2
-	adds r3, 0x2
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _080DF370
-	mov r1, r12
-	cmp r1, 0
-	bne _080DF3B4
-	mov r2, r8
-	cmp r2, 0
-	bne _080DF3B4
-	ldr r3, =gContestResources
-	ldr r0, [r3]
-	ldr r2, [r0, 0x1C]
-	add r2, r9
-	ldrb r0, [r2, 0xD]
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r2, 0xD]
-_080DF3B4:
-	ldr r6, =gContestResources
-	ldr r0, [r6]
-	ldr r0, [r0, 0x1C]
-	mov r7, r9
-	adds r2, r7, r0
-	ldrb r1, [r2, 0xE]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _080DF3D0
-	ldrb r0, [r2, 0xD]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0xD]
-_080DF3D0:
-	movs r0, 0x10
-	add r9, r0
-	movs r1, 0x2
-	add r10, r1
-	adds r4, 0x1
-	cmp r4, 0x3
-	bgt _080DF3E0
-	b _080DF2C2
-_080DF3E0:
-	movs r4, 0
-	movs r5, 0
-	movs r3, 0
-	ldr r2, [sp, 0x28]
-	mov r1, sp
-_080DF3EA:
-	strh r3, [r1]
-	adds r0, r2, r4
-	strb r5, [r0]
-	adds r1, 0x2
-	adds r4, 0x1
-	cmp r4, 0x4
-	ble _080DF3EA
-	mov r1, sp
-	ldr r0, =0x0000ffff
-	strh r0, [r1, 0xA]
-	movs r0, 0
-	ldr r2, [sp, 0x28]
-	strb r0, [r2, 0x5]
-	movs r4, 0
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	mov r8, r0
-	ldr r7, [sp, 0x30]
-_080DF40E:
-	mov r3, r8
-	ldr r0, [r3, 0x1C]
-	adds r0, r7, r0
-	lsls r1, r4, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	adds r4, 0x1
-	mov r12, r4
-	cmp r0, 0
-	beq _080DF450
-	ldr r0, =gContestResources
-	ldr r6, [r0]
-	ldr r3, [sp, 0x28]
-	mov r4, sp
-	movs r5, 0x4
-_080DF42C:
-	ldr r0, [r6, 0x1C]
-	adds r0, r7, r0
-	adds r0, r1
-	ldrh r0, [r0]
-	ldrh r2, [r4]
-	cmp r0, r2
-	beq _080DF440
-	cmp r2, 0
-	bne _080DF446
-	strh r0, [r4]
-_080DF440:
-	ldrb r0, [r3]
-	adds r0, 0x1
-	strb r0, [r3]
-_080DF446:
-	adds r3, 0x1
-	adds r4, 0x2
-	subs r5, 0x1
-	cmp r5, 0
-	bge _080DF42C
-_080DF450:
-	mov r4, r12
-	cmp r4, 0x4
-	ble _080DF40E
-	mov r0, sp
-	ldrh r0, [r0]
-	ldr r6, [sp, 0x2C]
-	strh r0, [r6]
-	ldr r7, [sp, 0x28]
-	ldrb r3, [r7]
-	movs r6, 0
-	movs r4, 0x1
-	ldr r1, [sp, 0x24]
-	ldrh r0, [r1]
-	ldr r1, =0x0000ffff
-	cmp r0, r1
-	beq _080DF4C0
-	ldr r5, [sp, 0x2C]
-	adds r7, r1, 0
-	mov r2, sp
-	adds r2, 0x2
-_080DF478:
-	ldr r0, [sp, 0x28]
-	adds r1, r0, r4
-	ldrb r0, [r1]
-	cmp r3, r0
-	bcs _080DF4A4
-	ldrh r0, [r2]
-	strh r0, [r5]
-	ldrb r3, [r1]
-	movs r6, 0x1
-	b _080DF4B6
-	.pool
-_080DF4A4:
-	cmp r3, r0
-	bne _080DF4B6
-	lsls r0, r6, 1
-	adds r0, r5, r0
-	ldrh r1, [r2]
-	strh r1, [r0]
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-_080DF4B6:
-	adds r2, 0x2
-	adds r4, 0x1
-	ldrh r0, [r2]
-	cmp r0, r7
-	bne _080DF478
-_080DF4C0:
-	bl Random
-	ldr r1, =gContestResources
-	ldr r1, [r1]
-	ldr r4, [r1, 0x1C]
-	ldr r1, [sp, 0x30]
-	adds r4, r1, r4
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r6, 0
-	bl __modsi3
-	lsls r0, 1
-	ldr r2, [sp, 0x2C]
-	adds r0, r2, r0
-	ldrh r0, [r0]
-	strh r0, [r4, 0xA]
-	add sp, 0x38
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DF250
-
-	thumb_func_start sub_80DF4F8
-sub_80DF4F8: @ 80DF4F8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	ldr r1, =gContestFinalStandings
-	ldr r0, =gContestPlayerMonIndex
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080DF514
-	b _080DF6EE
-_080DF514:
-	movs r7, 0
-	movs r3, 0
-	ldr r0, =gContestResources
-	mov r12, r0
-_080DF51C:
-	adds r0, r3, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DF528
-	lsls r0, r3, 24
-	lsrs r7, r0, 24
-_080DF528:
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _080DF51C
-	movs r1, 0
-	mov r9, r1
-	mov r10, r1
-	movs r3, 0
-	lsls r2, r7, 1
-	lsls r4, r7, 4
-	mov r8, r4
-	ldr r1, =gContestMonConditions
-	adds r0, r2, r1
-	movs r6, 0
-	ldrsh r5, [r0, r6]
-	str r5, [sp, 0x8]
-	adds r5, r1, 0
-	ldr r0, =gUnknown_02039F18
-	adds r2, r0
-	adds r4, r0, 0
-_080DF54E:
-	movs r1, 0
-	ldrsh r0, [r5, r1]
-	ldr r6, [sp, 0x8]
-	cmp r6, r0
-	bge _080DF562
-	mov r0, r9
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-_080DF562:
-	movs r0, 0
-	ldrsh r1, [r2, r0]
-	movs r6, 0
-	ldrsh r0, [r4, r6]
-	cmp r1, r0
-	bge _080DF578
-	mov r0, r10
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-_080DF578:
-	adds r5, 0x2
-	adds r4, 0x2
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _080DF54E
-	mov r1, r12
-	ldr r0, [r1]
-	ldr r0, [r0, 0x1C]
-	add r0, r8
-	ldrb r1, [r0, 0xC]
-	movs r4, 0
-	movs r2, 0x1
-	movs r3, 0x7
-_080DF592:
-	adds r0, r1, 0
-	ands r0, r2
-	cmp r0, 0
-	beq _080DF5A0
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-_080DF5A0:
-	lsrs r1, 1
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080DF592
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r4, 0
-	bl __modsi3
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x1C]
-	add r0, r8
-	ldrb r1, [r0, 0xC]
-	movs r4, 0
-	movs r2, 0
-	movs r3, 0
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080DF5DC
-	cmp r5, 0
-	beq _080DF5F6
-_080DF5D6:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-_080DF5DC:
-	lsrs r1, 1
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r3, 0x1
-	cmp r3, 0x7
-	bgt _080DF5F6
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080DF5DC
-	cmp r5, r4
-	bne _080DF5D6
-_080DF5F6:
-	movs r1, 0x1
-	adds r0, r1, 0
-	lsls r0, r2
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r7, 0
-	bne _080DF628
-	mov r0, sp
-	strb r1, [r0]
-	ldr r1, =gContestResources
-	ldr r0, [r1]
-	ldr r0, [r0, 0x1C]
-	ldrb r4, [r0, 0x1D]
-	movs r3, 0x2
-	b _080DF638
-	.pool
-_080DF628:
-	mov r1, sp
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, =gContestResources
-	ldr r0, [r1]
-	ldr r0, [r0, 0x1C]
-	ldrb r4, [r0, 0xD]
-	movs r3, 0x1
-_080DF638:
-	mov r12, r1
-	movs r5, 0x1
-	lsls r2, 24
-	str r2, [sp, 0x4]
-	cmp r3, 0x3
-	bgt _080DF682
-_080DF644:
-	cmp r3, r7
-	beq _080DF67C
-	mov r6, r12
-	ldr r2, [r6]
-	ldr r0, [r2, 0x1C]
-	lsls r1, r3, 4
-	adds r0, r1, r0
-	ldrb r0, [r0, 0xD]
-	cmp r4, r0
-	bcs _080DF66C
-	mov r0, sp
-	strb r3, [r0]
-	ldr r0, [r2, 0x1C]
-	adds r0, r1, r0
-	ldrb r4, [r0, 0xD]
-	movs r5, 0x1
-	b _080DF67C
-	.pool
-_080DF66C:
-	cmp r4, r0
-	bne _080DF67C
-	mov r1, sp
-	adds r0, r1, r5
-	strb r3, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_080DF67C:
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _080DF644
-_080DF682:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r5, 0
-	bl __modsi3
-	add r0, sp
-	ldrb r6, [r0]
-	movs r2, 0x80
-	movs r3, 0
-	ldr r5, =gContestResources
-	ldr r0, [r5]
-	ldr r0, [r0, 0x1C]
-	lsls r1, r6, 4
-	adds r0, r1, r0
-	ldrb r0, [r0, 0xD]
-	ands r0, r2
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080DF6C4
-_080DF6AE:
-	lsrs r2, 1
-	adds r3, 0x1
-	cmp r3, 0x7
-	bgt _080DF6C4
-	ldr r0, [r5]
-	ldr r0, [r0, 0x1C]
-	adds r0, r1, r0
-	ldrb r4, [r0, 0xD]
-	ands r4, r2
-	cmp r4, 0
-	beq _080DF6AE
-_080DF6C4:
-	mov r0, r9
-	bl ContestLiveUpdates_BeforeInterview_1
-	mov r0, r10
-	bl ContestLiveUpdates_BeforeInterview_2
-	ldr r5, [sp, 0x4]
-	lsrs r0, r5, 24
-	bl ContestLiveUpdates_BeforeInterview_3
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x1C]
-	add r0, r8
-	ldrh r0, [r0, 0xA]
-	bl ContestLiveUpdates_BeforeInterview_4
-	adds r0, r4, 0
-	adds r1, r6, 0
-	bl ContestLiveUpdates_BeforeInterview_5
-_080DF6EE:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DF4F8
-
-	thumb_func_start sub_80DF704
-sub_80DF704: @ 80DF704
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r0, =gHeap
-	movs r1, 0xD0
-	lsls r1, 9
-	adds r2, r0, r1
-	ldrb r1, [r2]
-	adds r4, r0, 0
-	cmp r1, 0
-	bne _080DF72C
-	cmp r3, 0
-	bne _080DF728
-	movs r0, 0x2
-	b _080DF72E
-	.pool
-_080DF728:
-	movs r0, 0x3
-	b _080DF72E
-_080DF72C:
-	movs r0, 0
-_080DF72E:
-	strb r0, [r2]
-	movs r1, 0xD0
-	lsls r1, 9
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DF746
-	bl sub_80DAEA4
-	bl sub_80DB2BC
-	b _080DF74A
-_080DF746:
-	bl sub_80DF750
-_080DF74A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DF704
-
-	thumb_func_start sub_80DF750
-sub_80DF750: @ 80DF750
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x34
-	ldr r0, =gUnknown_020322D5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080DF766
-	b _080DF924
-_080DF766:
-	ldr r0, =gHeap
-	movs r1, 0xD0
-	lsls r1, 9
-	adds r0, r1
-	ldrb r0, [r0]
-	subs r0, 0x2
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _080DF77C
-	b _080DF924
-_080DF77C:
-	movs r7, 0
-	mov r2, sp
-	adds r2, 0x18
-	str r2, [sp, 0x30]
-_080DF784:
-	adds r0, r7, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0x3
-	bls _080DF784
-	ldr r0, =gHeap
-	movs r1, 0xD0
-	lsls r1, 9
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _080DF874
-	movs r7, 0
-	movs r2, 0x7
-	mov r10, r2
-	ldr r0, [sp, 0x30]
-	mov r9, r0
-_080DF7AE:
-	add r0, sp, 0x4
-	ldr r1, =gText_CDot
-	bl StringCopy
-	adds r5, r0, 0
-	ldr r0, =gUnknown_02039F26
-	adds r0, r7, r0
-	ldrb r0, [r0]
-	mov r1, r10
-	str r1, [sp]
-	add r1, sp, 0x4
-	movs r2, 0x5
-	movs r3, 0x1
-	bl Contest_PrintTextToBg0WindowAt
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x1C]
-	lsls r0, r7, 4
-	adds r0, r1
-	ldrb r4, [r0, 0xC]
-	movs r6, 0x7
-	adds r2, r7, 0x1
-	mov r8, r2
-_080DF7DE:
-	movs r1, 0x1
-	ands r1, r4
-	adds r0, r5, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl ConvertIntToDecimalStringN
-	adds r5, r0, 0
-	lsrs r4, 1
-	lsls r0, r6, 24
-	movs r1, 0xFF
-	lsls r1, 24
-	adds r0, r1
-	lsrs r6, r0, 24
-	asrs r0, 24
-	movs r2, 0x1
-	negs r2, r2
-	cmp r0, r2
-	bgt _080DF7DE
-	movs r6, 0
-	ldr r4, =gUnknown_02039F26
-	ldr r3, [sp, 0x30]
-_080DF80A:
-	lsls r0, r6, 24
-	asrs r0, 24
-	adds r2, r3, r0
-	mov r1, sp
-	adds r1, r0
-	adds r1, 0x4
-	ldrb r1, [r1]
-	strb r1, [r2]
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	asrs r5, r0, 24
-	cmp r5, 0x4
-	ble _080DF80A
-	mov r0, r9
-	adds r1, r0, r5
-	movs r0, 0xFF
-	strb r0, [r1]
-	adds r4, r7, r4
-	ldrb r0, [r4]
-	mov r1, r10
-	str r1, [sp]
-	mov r1, r9
-	movs r2, 0x5
-	movs r3, 0x1
-	bl Contest_PrintTextToBg0WindowAt
-	ldrb r0, [r4]
-	mov r1, sp
-	adds r1, r5
-	adds r1, 0x4
-	mov r2, r10
-	str r2, [sp]
-	movs r2, 0x37
-	movs r3, 0x1
-	bl Contest_PrintTextToBg0WindowAt
-	mov r1, r8
-	lsls r0, r1, 24
-	lsrs r7, r0, 24
-	cmp r7, 0x3
-	bls _080DF7AE
-	b _080DF920
-	.pool
-_080DF874:
-	movs r7, 0
-	mov r2, sp
-	adds r2, 0x6
-	str r2, [sp, 0x2C]
-	ldr r0, [sp, 0x30]
-	mov r9, r0
-	movs r1, 0x7
-	mov r10, r1
-_080DF884:
-	add r0, sp, 0x4
-	ldr r1, =gText_BDot
-	bl StringCopy
-	ldr r0, =gContestResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x1C]
-	lsls r0, r7, 4
-	adds r0, r1
-	ldrb r4, [r0, 0xD]
-	ldr r5, [sp, 0x2C]
-	movs r6, 0x7
-	adds r2, r7, 0x1
-	mov r8, r2
-_080DF8A0:
-	movs r1, 0x1
-	ands r1, r4
-	adds r0, r5, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl ConvertIntToDecimalStringN
-	adds r5, r0, 0
-	lsrs r4, 1
-	lsls r0, r6, 24
-	movs r1, 0xFF
-	lsls r1, 24
-	adds r0, r1
-	lsrs r6, r0, 24
-	asrs r0, 24
-	movs r2, 0x1
-	negs r2, r2
-	cmp r0, r2
-	bgt _080DF8A0
-	movs r6, 0
-	ldr r4, =gUnknown_02039F26
-	ldr r3, [sp, 0x30]
-_080DF8CC:
-	lsls r0, r6, 24
-	asrs r0, 24
-	adds r2, r3, r0
-	mov r1, sp
-	adds r1, r0
-	adds r1, 0x4
-	ldrb r1, [r1]
-	strb r1, [r2]
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	asrs r5, r0, 24
-	cmp r5, 0x4
-	ble _080DF8CC
-	mov r0, r9
-	adds r1, r0, r5
-	movs r0, 0xFF
-	strb r0, [r1]
-	adds r4, r7, r4
-	ldrb r0, [r4]
-	mov r1, r10
-	str r1, [sp]
-	mov r1, r9
-	movs r2, 0x5
-	movs r3, 0x1
-	bl Contest_PrintTextToBg0WindowAt
-	ldrb r0, [r4]
-	mov r1, sp
-	adds r1, r5
-	adds r1, 0x4
-	mov r2, r10
-	str r2, [sp]
-	movs r2, 0x37
-	movs r3, 0x1
-	bl Contest_PrintTextToBg0WindowAt
-	mov r1, r8
-	lsls r0, r1, 24
-	lsrs r7, r0, 24
-	cmp r7, 0x3
-	bls _080DF884
-_080DF920:
-	bl sub_80DB2BC
-_080DF924:
-	add sp, 0x34
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80DF750
-
-	thumb_func_start sub_80DF940
-sub_80DF940: @ 80DF940
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r5, 0x2
-	ldrb r0, [r4]
-	cmp r0, 0xFC
-	bne _080DF956
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0x15
-	bne _080DF956
-	movs r0, 0x2
-	b _080DF9CC
-_080DF956:
-	adds r0, r4, 0
-	bl StringLength
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x5
-	bhi _080DF9CA
-	ldrb r0, [r4]
-	cmp r0, 0xFF
-	beq _080DF9CA
-_080DF96A:
-	ldrb r1, [r4]
-	adds r0, r1, 0
-	adds r0, 0x45
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x33
-	bls _080DF9BE
-	adds r0, r1, 0
-	adds r0, 0x5F
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x9
-	bls _080DF9BE
-	adds r0, r1, 0
-	cmp r0, 0
-	beq _080DF9BE
-	cmp r0, 0xAD
-	beq _080DF9BE
-	cmp r0, 0xB8
-	beq _080DF9BE
-	cmp r0, 0xAB
-	beq _080DF9BE
-	cmp r0, 0xAC
-	beq _080DF9BE
-	cmp r0, 0xB5
-	beq _080DF9BE
-	cmp r0, 0xB6
-	beq _080DF9BE
-	cmp r0, 0xBA
-	beq _080DF9BE
-	cmp r0, 0xAE
-	beq _080DF9BE
-	cmp r0, 0xB0
-	beq _080DF9BE
-	cmp r0, 0xB1
-	beq _080DF9BE
-	cmp r0, 0xB2
-	beq _080DF9BE
-	cmp r0, 0xB3
-	beq _080DF9BE
-	cmp r0, 0xB1
-	bne _080DF9C8
-_080DF9BE:
-	adds r4, 0x1
-	ldrb r0, [r4]
-	cmp r0, 0xFF
-	bne _080DF96A
-	b _080DF9CA
-_080DF9C8:
-	movs r5, 0x1
-_080DF9CA:
-	adds r0, r5, 0
-_080DF9CC:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80DF940
-
-	thumb_func_start sub_80DF9D4
-sub_80DF9D4: @ 80DF9D4
-	ldrb r2, [r0, 0x5]
-	movs r1, 0xFF
-	strb r1, [r0, 0x5]
-	strb r2, [r0, 0x7]
-	bx lr
-	thumb_func_end sub_80DF9D4
-
-	thumb_func_start sub_80DF9E0
-sub_80DF9E0: @ 80DF9E0
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	bl StripExtCtrlCodes
-	cmp r4, 0x1
-	bne _080DF9F8
-	movs r0, 0xFF
-	strb r0, [r5, 0x5]
-	movs r0, 0xFC
-	strb r0, [r5, 0xA]
-	b _080DFA00
-_080DF9F8:
-	ldrb r1, [r5, 0x5]
-	movs r0, 0xFF
-	strb r0, [r5, 0x5]
-	strb r1, [r5, 0xA]
-_080DFA00:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DF9E0
-
-	thumb_func_start sub_80DFA08
-sub_80DFA08: @ 80DFA08
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	adds r4, r5, 0x2
-	cmp r6, 0x1
-	bne _080DFA28
-	adds r0, r4, 0
-	bl sub_80DF940
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl ConvertInternationalString
-	b _080DFA3E
-_080DFA28:
-	ldrb r0, [r4, 0xA]
-	cmp r0, 0xFC
-	bne _080DFA38
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl ConvertInternationalString
-	b _080DFA3E
-_080DFA38:
-	strb r0, [r4, 0x5]
-	movs r0, 0xFF
-	strb r0, [r4, 0xA]
-_080DFA3E:
-	adds r4, r5, 0
-	adds r4, 0xD
-	cmp r6, 0x1
-	bne _080DFA68
-	movs r0, 0xFF
-	strb r0, [r4, 0x7]
-	ldrb r0, [r4, 0x4]
-	strb r0, [r4, 0x6]
-	ldrb r0, [r4, 0x3]
-	strb r0, [r4, 0x5]
-	ldrb r0, [r4, 0x2]
-	strb r0, [r4, 0x4]
-	ldrb r0, [r4, 0x1]
-	strb r0, [r4, 0x3]
-	ldrb r0, [r5, 0xD]
-	strb r0, [r4, 0x2]
-	movs r0, 0x15
-	strb r0, [r4, 0x1]
-	movs r0, 0xFC
-	strb r0, [r5, 0xD]
-	b _080DFA70
-_080DFA68:
-	ldrb r0, [r4, 0x7]
-	strb r0, [r4, 0x5]
-	movs r0, 0xFF
-	strb r0, [r4, 0x7]
-_080DFA70:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DFA08
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/m4a_3.s b/asm/m4a_3.s
deleted file mode 100644
index a842ae925..000000000
--- a/asm/m4a_3.s
+++ /dev/null
@@ -1,574 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/gba_constants.inc"
-	.include "constants/m4a_constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start CgbSound
-CgbSound: @ 81DEA70
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x1C
-	ldr r0, =SOUND_INFO_PTR
-	ldr r0, [r0]
-	str r0, [sp, 0x4]
-	ldrb r0, [r0, 0xA]
-	cmp r0, 0
-	beq _081DEA94
-	subs r0, 0x1
-	ldr r1, [sp, 0x4]
-	strb r0, [r1, 0xA]
-	b _081DEA9A
-	.pool
-_081DEA94:
-	movs r0, 0xE
-	ldr r2, [sp, 0x4]
-	strb r0, [r2, 0xA]
-_081DEA9A:
-	movs r6, 0x1
-	ldr r0, [sp, 0x4]
-	ldr r4, [r0, 0x1C]
-_081DEAA0:
-	ldrb r1, [r4]
-	movs r0, 0xC7
-	ands r0, r1
-	adds r2, r6, 0x1
-	mov r10, r2
-	movs r2, 0x40
-	adds r2, r4
-	mov r9, r2
-	cmp r0, 0
-	bne _081DEAB6
-	b _081DEEA0
-_081DEAB6:
-	cmp r6, 0x2
-	beq _081DEAE8
-	cmp r6, 0x2
-	bgt _081DEAC4
-	cmp r6, 0x1
-	beq _081DEACA
-	b _081DEB20
-_081DEAC4:
-	cmp r6, 0x3
-	beq _081DEB00
-	b _081DEB20
-_081DEACA:
-	ldr r0, =REG_NR10
-	str r0, [sp, 0x8]
-	ldr r7, =REG_NR11
-	ldr r2, =REG_NR12
-	str r2, [sp, 0xC]
-	adds r0, 0x4
-	str r0, [sp, 0x10]
-	adds r2, 0x2
-	b _081DEB30
-	.pool
-_081DEAE8:
-	ldr r0, =REG_NR10 + 1
-	str r0, [sp, 0x8]
-	ldr r7, =REG_NR21
-	ldr r2, =REG_NR22
-	b _081DEB28
-	.pool
-_081DEB00:
-	ldr r0, =REG_NR30
-	str r0, [sp, 0x8]
-	ldr r7, =REG_NR31
-	ldr r2, =REG_NR32
-	str r2, [sp, 0xC]
-	adds r0, 0x4
-	str r0, [sp, 0x10]
-	adds r2, 0x2
-	b _081DEB30
-	.pool
-_081DEB20:
-	ldr r0, =REG_NR30 + 1
-	str r0, [sp, 0x8]
-	ldr r7, =REG_NR41
-	ldr r2, =REG_NR42
-_081DEB28:
-	str r2, [sp, 0xC]
-	adds r0, 0xB
-	str r0, [sp, 0x10]
-	adds r2, 0x4
-_081DEB30:
-	str r2, [sp, 0x14]
-	ldr r0, [sp, 0x4]
-	ldrb r0, [r0, 0xA]
-	str r0, [sp]
-	ldr r2, [sp, 0xC]
-	ldrb r0, [r2]
-	mov r8, r0
-	adds r2, r1, 0
-	movs r0, 0x80
-	ands r0, r2
-	cmp r0, 0
-	beq _081DEC26
-	movs r3, 0x40
-	adds r0, r3, 0
-	ands r0, r2
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r6, 0x1
-	mov r10, r0
-	movs r1, 0x40
-	adds r1, r4
-	mov r9, r1
-	cmp r5, 0
-	bne _081DEC4A
-	movs r0, 0x3
-	strb r0, [r4]
-	strb r0, [r4, 0x1D]
-	adds r0, r4, 0
-	str r3, [sp, 0x18]
-	bl CgbModVol
-	ldr r3, [sp, 0x18]
-	cmp r6, 0x2
-	beq _081DEB98
-	cmp r6, 0x2
-	bgt _081DEB8C
-	cmp r6, 0x1
-	beq _081DEB92
-	b _081DEBEC
-	.pool
-_081DEB8C:
-	cmp r6, 0x3
-	beq _081DEBA4
-	b _081DEBEC
-_081DEB92:
-	ldrb r0, [r4, 0x1F]
-	ldr r2, [sp, 0x8]
-	strb r0, [r2]
-_081DEB98:
-	ldr r0, [r4, 0x24]
-	lsls r0, 6
-	ldrb r1, [r4, 0x1E]
-	adds r0, r1, r0
-	strb r0, [r7]
-	b _081DEBF8
-_081DEBA4:
-	ldr r1, [r4, 0x24]
-	ldr r0, [r4, 0x28]
-	cmp r1, r0
-	beq _081DEBCC
-	ldr r2, [sp, 0x8]
-	strb r3, [r2]
-	ldr r1, =REG_WAVE_RAM
-	ldr r2, [r4, 0x24]
-	ldr r0, [r2]
-	str r0, [r1]
-	adds r1, 0x4
-	ldr r0, [r2, 0x4]
-	str r0, [r1]
-	adds r1, 0x4
-	ldr r0, [r2, 0x8]
-	str r0, [r1]
-	adds r1, 0x4
-	ldr r0, [r2, 0xC]
-	str r0, [r1]
-	str r2, [r4, 0x28]
-_081DEBCC:
-	ldr r0, [sp, 0x8]
-	strb r5, [r0]
-	ldrb r0, [r4, 0x1E]
-	strb r0, [r7]
-	ldrb r0, [r4, 0x1E]
-	cmp r0, 0
-	beq _081DEBE4
-	movs r0, 0xC0
-	b _081DEC06
-	.pool
-_081DEBE4:
-	movs r1, 0x80
-	negs r1, r1
-	strb r1, [r4, 0x1A]
-	b _081DEC08
-_081DEBEC:
-	ldrb r0, [r4, 0x1E]
-	strb r0, [r7]
-	ldr r0, [r4, 0x24]
-	lsls r0, 3
-	ldr r2, [sp, 0x10]
-	strb r0, [r2]
-_081DEBF8:
-	ldrb r0, [r4, 0x4]
-	adds r0, 0x8
-	mov r8, r0
-	ldrb r0, [r4, 0x1E]
-	cmp r0, 0
-	beq _081DEC06
-	movs r0, 0x40
-_081DEC06:
-	strb r0, [r4, 0x1A]
-_081DEC08:
-	ldrb r1, [r4, 0x4]
-	movs r2, 0
-	strb r1, [r4, 0xB]
-	movs r0, 0xFF
-	ands r0, r1
-	adds r1, r6, 0x1
-	mov r10, r1
-	movs r1, 0x40
-	adds r1, r4
-	mov r9, r1
-	cmp r0, 0
-	bne _081DEC22
-	b _081DED5E
-_081DEC22:
-	strb r2, [r4, 0x9]
-	b _081DED8C
-_081DEC26:
-	movs r0, 0x4
-	ands r0, r2
-	cmp r0, 0
-	beq _081DEC58
-	ldrb r0, [r4, 0xD]
-	subs r0, 0x1
-	strb r0, [r4, 0xD]
-	movs r2, 0xFF
-	ands r0, r2
-	lsls r0, 24
-	adds r1, r6, 0x1
-	mov r10, r1
-	movs r2, 0x40
-	adds r2, r4
-	mov r9, r2
-	cmp r0, 0
-	ble _081DEC4A
-	b _081DED9E
-_081DEC4A:
-	lsls r0, r6, 24
-	lsrs r0, 24
-	bl CgbOscOff
-	movs r0, 0
-	strb r0, [r4]
-	b _081DEE9C
-_081DEC58:
-	movs r0, 0x40
-	ands r0, r1
-	adds r2, r6, 0x1
-	mov r10, r2
-	movs r2, 0x40
-	adds r2, r4
-	mov r9, r2
-	cmp r0, 0
-	beq _081DEC98
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	beq _081DEC98
-	movs r0, 0xFC
-	ands r0, r1
-	movs r2, 0
-	strb r0, [r4]
-	ldrb r1, [r4, 0x7]
-	strb r1, [r4, 0xB]
-	movs r0, 0xFF
-	ands r0, r1
-	cmp r0, 0
-	beq _081DECCA
-	movs r0, 0x1
-	ldrb r1, [r4, 0x1D]
-	orrs r0, r1
-	strb r0, [r4, 0x1D]
-	cmp r6, 0x3
-	beq _081DED8C
-	ldrb r2, [r4, 0x7]
-	mov r8, r2
-	b _081DED8C
-_081DEC98:
-	ldrb r0, [r4, 0xB]
-	cmp r0, 0
-	bne _081DED8C
-	cmp r6, 0x3
-	bne _081DECAA
-	movs r0, 0x1
-	ldrb r1, [r4, 0x1D]
-	orrs r0, r1
-	strb r0, [r4, 0x1D]
-_081DECAA:
-	adds r0, r4, 0
-	bl CgbModVol
-	movs r0, 0x3
-	ldrb r2, [r4]
-	ands r0, r2
-	cmp r0, 0
-	bne _081DECFE
-	ldrb r0, [r4, 0x9]
-	subs r0, 0x1
-	strb r0, [r4, 0x9]
-	movs r1, 0xFF
-	ands r0, r1
-	lsls r0, 24
-	cmp r0, 0
-	bgt _081DECFA
-_081DECCA:
-	ldrb r2, [r4, 0xC]
-	ldrb r1, [r4, 0xA]
-	adds r0, r2, 0
-	muls r0, r1
-	adds r0, 0xFF
-	asrs r0, 8
-	movs r1, 0
-	strb r0, [r4, 0x9]
-	lsls r0, 24
-	cmp r0, 0
-	beq _081DEC4A
-	movs r0, 0x4
-	ldrb r2, [r4]
-	orrs r0, r2
-	strb r0, [r4]
-	movs r0, 0x1
-	ldrb r1, [r4, 0x1D]
-	orrs r0, r1
-	strb r0, [r4, 0x1D]
-	cmp r6, 0x3
-	beq _081DED9E
-	movs r2, 0x8
-	mov r8, r2
-	b _081DED9E
-_081DECFA:
-	ldrb r0, [r4, 0x7]
-	b _081DED8A
-_081DECFE:
-	cmp r0, 0x1
-	bne _081DED0A
-_081DED02:
-	ldrb r0, [r4, 0x19]
-	strb r0, [r4, 0x9]
-	movs r0, 0x7
-	b _081DED8A
-_081DED0A:
-	cmp r0, 0x2
-	bne _081DED4E
-	ldrb r0, [r4, 0x9]
-	subs r0, 0x1
-	strb r0, [r4, 0x9]
-	movs r1, 0xFF
-	ands r0, r1
-	lsls r0, 24
-	ldrb r2, [r4, 0x19]
-	lsls r1, r2, 24
-	cmp r0, r1
-	bgt _081DED4A
-_081DED22:
-	ldrb r0, [r4, 0x6]
-	cmp r0, 0
-	bne _081DED32
-	movs r0, 0xFC
-	ldrb r1, [r4]
-	ands r0, r1
-	strb r0, [r4]
-	b _081DECCA
-_081DED32:
-	ldrb r0, [r4]
-	subs r0, 0x1
-	strb r0, [r4]
-	movs r0, 0x1
-	ldrb r2, [r4, 0x1D]
-	orrs r0, r2
-	strb r0, [r4, 0x1D]
-	cmp r6, 0x3
-	beq _081DED02
-	movs r0, 0x8
-	mov r8, r0
-	b _081DED02
-_081DED4A:
-	ldrb r0, [r4, 0x5]
-	b _081DED8A
-_081DED4E:
-	ldrb r0, [r4, 0x9]
-	adds r0, 0x1
-	strb r0, [r4, 0x9]
-	movs r1, 0xFF
-	ands r0, r1
-	ldrb r2, [r4, 0xA]
-	cmp r0, r2
-	bcc _081DED88
-_081DED5E:
-	ldrb r0, [r4]
-	subs r0, 0x1
-	movs r2, 0
-	strb r0, [r4]
-	ldrb r1, [r4, 0x5]
-	strb r1, [r4, 0xB]
-	movs r0, 0xFF
-	ands r0, r1
-	cmp r0, 0
-	beq _081DED22
-	movs r0, 0x1
-	ldrb r1, [r4, 0x1D]
-	orrs r0, r1
-	strb r0, [r4, 0x1D]
-	ldrb r0, [r4, 0xA]
-	strb r0, [r4, 0x9]
-	cmp r6, 0x3
-	beq _081DED8C
-	ldrb r2, [r4, 0x5]
-	mov r8, r2
-	b _081DED8C
-_081DED88:
-	ldrb r0, [r4, 0x4]
-_081DED8A:
-	strb r0, [r4, 0xB]
-_081DED8C:
-	ldrb r0, [r4, 0xB]
-	subs r0, 0x1
-	strb r0, [r4, 0xB]
-	ldr r0, [sp]
-	cmp r0, 0
-	bne _081DED9E
-	subs r0, 0x1
-	str r0, [sp]
-	b _081DEC98
-_081DED9E:
-	movs r0, 0x2
-	ldrb r1, [r4, 0x1D]
-	ands r0, r1
-	cmp r0, 0
-	beq _081DEE16
-	cmp r6, 0x3
-	bgt _081DEDDE
-	movs r0, 0x8
-	ldrb r2, [r4, 0x1]
-	ands r0, r2
-	cmp r0, 0
-	beq _081DEDDE
-	ldr r0, =REG_SOUNDBIAS + 1
-	ldrb r0, [r0]
-	cmp r0, 0x3F
-	bgt _081DEDD0
-	ldr r0, [r4, 0x20]
-	adds r0, 0x2
-	ldr r1, =0x000007fc
-	b _081DEDDA
-	.pool
-_081DEDD0:
-	cmp r0, 0x7F
-	bgt _081DEDDE
-	ldr r0, [r4, 0x20]
-	adds r0, 0x1
-	ldr r1, =0x000007fe
-_081DEDDA:
-	ands r0, r1
-	str r0, [r4, 0x20]
-_081DEDDE:
-	cmp r6, 0x4
-	beq _081DEDF0
-	ldr r0, [r4, 0x20]
-	ldr r1, [sp, 0x10]
-	strb r0, [r1]
-	b _081DEDFE
-	.pool
-_081DEDF0:
-	ldr r2, [sp, 0x10]
-	ldrb r0, [r2]
-	movs r1, 0x8
-	ands r1, r0
-	ldr r0, [r4, 0x20]
-	orrs r0, r1
-	strb r0, [r2]
-_081DEDFE:
-	movs r0, 0xC0
-	ldrb r1, [r4, 0x1A]
-	ands r0, r1
-	adds r1, r4, 0
-	adds r1, 0x21
-	ldrb r1, [r1]
-	adds r0, r1, r0
-	strb r0, [r4, 0x1A]
-	movs r2, 0xFF
-	ands r0, r2
-	ldr r1, [sp, 0x14]
-	strb r0, [r1]
-_081DEE16:
-	movs r0, 0x1
-	ldrb r2, [r4, 0x1D]
-	ands r0, r2
-	cmp r0, 0
-	beq _081DEE9C
-	ldr r1, =REG_NR51
-	ldrb r0, [r1]
-	ldrb r2, [r4, 0x1C]
-	bics r0, r2
-	ldrb r2, [r4, 0x1B]
-	orrs r0, r2
-	strb r0, [r1]
-	cmp r6, 0x3
-	bne _081DEE68
-	ldr r0, =gCgb3Vol
-	ldrb r1, [r4, 0x9]
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	ldr r2, [sp, 0xC]
-	strb r0, [r2]
-	movs r1, 0x80
-	adds r0, r1, 0
-	ldrb r2, [r4, 0x1A]
-	ands r0, r2
-	cmp r0, 0
-	beq _081DEE9C
-	ldr r0, [sp, 0x8]
-	strb r1, [r0]
-	ldrb r0, [r4, 0x1A]
-	ldr r1, [sp, 0x14]
-	strb r0, [r1]
-	movs r0, 0x7F
-	ldrb r2, [r4, 0x1A]
-	ands r0, r2
-	strb r0, [r4, 0x1A]
-	b _081DEE9C
-	.pool
-_081DEE68:
-	movs r0, 0xF
-	mov r1, r8
-	ands r1, r0
-	mov r8, r1
-	ldrb r2, [r4, 0x9]
-	lsls r0, r2, 4
-	add r0, r8
-	ldr r1, [sp, 0xC]
-	strb r0, [r1]
-	movs r2, 0x80
-	ldrb r0, [r4, 0x1A]
-	orrs r0, r2
-	ldr r1, [sp, 0x14]
-	strb r0, [r1]
-	cmp r6, 0x1
-	bne _081DEE9C
-	ldr r0, [sp, 0x8]
-	ldrb r1, [r0]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	bne _081DEE9C
-	ldrb r0, [r4, 0x1A]
-	orrs r0, r2
-	ldr r1, [sp, 0x14]
-	strb r0, [r1]
-_081DEE9C:
-	movs r0, 0
-	strb r0, [r4, 0x1D]
-_081DEEA0:
-	mov r6, r10
-	mov r4, r9
-	cmp r6, 0x4
-	bgt _081DEEAA
-	b _081DEAA0
-_081DEEAA:
-	add sp, 0x1C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end CgbSound
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index 64c021001..af7fdbf3d 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -731,7 +731,7 @@ _080171DC:
 _08017228:
 	mov r3, r9
 	ldrb r0, [r3]
-	bl ListMenuHandleInputGetItemId
+	bl ListMenu_ProcessInput
 	mov r8, r0
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -847,7 +847,7 @@ _08017314:
 _0801731C:
 	mov r3, r10
 	ldrb r0, [r3]
-	bl ListMenuHandleInputGetItemId
+	bl ListMenu_ProcessInput
 	adds r1, r0, 0
 	ldr r0, =gMain
 	ldrh r2, [r0, 0x2E]
diff --git a/build_tools.sh b/build_tools.sh
index d9eebf05c..429a9cef0 100755
--- a/build_tools.sh
+++ b/build_tools.sh
@@ -8,3 +8,4 @@ make -C tools/aif2pcm CXX=${1:-g++}
 make -C tools/ramscrgen CXX=${1:-g++}
 make -C tools/gbafix CXX=${1:-g++}
 make -C tools/mid2agb CXX=${1:-g++}
+make -C tools/mapjson CXX=${1:-g++}
diff --git a/common_syms/contest_painting.txt b/common_syms/contest_painting.txt
new file mode 100644
index 000000000..1fba37a59
--- /dev/null
+++ b/common_syms/contest_painting.txt
@@ -0,0 +1,4 @@
+gUnknown_03006190
+gUnknown_030061A0
+gUnknown_030061C0
+gContestPaintingMonPalette
diff --git a/common_syms/contest_painting_effects.txt b/common_syms/contest_painting_effects.txt
new file mode 100644
index 000000000..2f3d79219
--- /dev/null
+++ b/common_syms/contest_painting_effects.txt
@@ -0,0 +1,10 @@
+gUnknown_03006164
+gUnknown_03006168
+gUnknown_0300616C
+gUnknown_03006170
+gUnknown_03006174
+gUnknown_03006178
+gUnknown_0300617C
+gUnknown_03006180
+gUnknown_03006184
+gUnknown_03006188
diff --git a/common_syms/evolution_scene.txt b/common_syms/evolution_scene.txt
new file mode 100644
index 000000000..137cd3e05
--- /dev/null
+++ b/common_syms/evolution_scene.txt
@@ -0,0 +1 @@
+gCB2_AfterEvolution
diff --git a/common_syms/m4a_2.txt b/common_syms/m4a.txt
index 0d6b13a79..0d6b13a79 100644
--- a/common_syms/m4a_2.txt
+++ b/common_syms/m4a.txt
diff --git a/common_syms/party_menu.txt b/common_syms/party_menu.txt
new file mode 100644
index 000000000..53e72fa53
--- /dev/null
+++ b/common_syms/party_menu.txt
@@ -0,0 +1 @@
+gUnknown_03006328
diff --git a/common_syms/pokedex_cry_screen.txt b/common_syms/pokedex_cry_screen.txt
new file mode 100644
index 000000000..d16ec36d6
--- /dev/null
+++ b/common_syms/pokedex_cry_screen.txt
@@ -0,0 +1 @@
+gDexCryScreenState
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/contest.s b/data/contest.s
index eaf3f8c95..48bfa1080 100644
--- a/data/contest.s
+++ b/data/contest.s
@@ -406,7 +406,7 @@ gSpriteTemplate_858998C:: @ 858998C
 	spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
 
 	.align 2
-gUnknown_085899EC:: @ 85899EC
+gContestExcitementTable:: @ 85899EC
 	.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000
 
 
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1da2a016f..fbee3987c 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -2,10 +2,12 @@
 #include "constants/battle_frontier.h"
 #include "constants/battle_setup.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/maps.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
@@ -60,11 +62,7 @@ gStdScripts:: @ 81DC2A0
 	.4byte Std_RegisteredInMatchCall
 	.4byte Std_9
 	.4byte Std_10
-
 gStdScripts_End:: @ 81DC2CC
-	map_script 3, PetalburgCity_MapScript1_1DC2D7
-	map_script 2, PetalburgCity_MapScript2_1DC31C
-	.byte 0
 
 	.include "data/maps/PetalburgCity/scripts.inc"
 	.include "data/maps/SlateportCity/scripts.inc"
@@ -638,17 +636,17 @@ 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/LinkContestRoom2/scripts.inc"
-	.include "data/maps/LinkContestRoom3/scripts.inc"
-	.include "data/maps/LinkContestRoom4/scripts.inc"
-	.include "data/maps/LinkContestRoom5/scripts.inc"
-	.include "data/maps/LinkContestRoom6/scripts.inc"
 	.include "data/maps/UnknownMap_25_29/scripts.inc"
 	.include "data/maps/UnknownMap_25_30/scripts.inc"
 	.include "data/maps/UnknownMap_25_31/scripts.inc"
 	.include "data/maps/UnknownMap_25_32/scripts.inc"
 	.include "data/maps/UnknownMap_25_33/scripts.inc"
 	.include "data/maps/UnknownMap_25_34/scripts.inc"
+	.include "data/maps/LinkContestRoom2/scripts.inc"
+	.include "data/maps/LinkContestRoom3/scripts.inc"
+	.include "data/maps/LinkContestRoom4/scripts.inc"
+	.include "data/maps/LinkContestRoom5/scripts.inc"
+	.include "data/maps/LinkContestRoom6/scripts.inc"
 	.include "data/maps/InsideOfTruck/scripts.inc"
 	.include "data/maps/SSTidalCorridor/scripts.inc"
 	.include "data/maps/SSTidalLowerDeck/scripts.inc"
diff --git a/data/fanfares.s b/data/fanfares.s
deleted file mode 100644
index 2a0c2576a..000000000
--- a/data/fanfares.s
+++ /dev/null
@@ -1,26 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-sFanfares:: @ 85248BC
-@ song number, duration
-	.2byte 0x016f, 0x0050
-	.2byte 0x0172, 0x00a0
-	.2byte 0x0173, 0x00dc
-	.2byte 0x0174, 0x00dc
-	.2byte 0x0170, 0x00a0
-	.2byte 0x0171, 0x0154
-	.2byte 0x017a, 0x00b4
-	.2byte 0x0183, 0x0078
-	.2byte 0x0184, 0x02c6
-	.2byte 0x0185, 0x00fa
-	.2byte 0x0186, 0x0096
-	.2byte 0x0187, 0x00a0
-	.2byte 0x0226, 0x01c2
-	.2byte 0x0212, 0x00aa
-	.2byte 0x0211, 0x00c4
-	.2byte 0x01cb, 0x0139
-	.2byte 0x01d2, 0x013e
-	.2byte 0x01cc, 0x0087
diff --git a/data/field_weather.s b/data/field_weather.s
deleted file mode 100644
index 2121ecf23..000000000
--- a/data/field_weather.s
+++ /dev/null
@@ -1,103 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_0854014C:: @ 854014C
-	.incbin "graphics/misc/sunny_day/0.gbapal"
-	.incbin "graphics/misc/sunny_day/1.gbapal"
-	.incbin "graphics/misc/sunny_day/2.gbapal"
-	.incbin "graphics/misc/sunny_day/3.gbapal"
-	.incbin "graphics/misc/sunny_day/4.gbapal"
-	.incbin "graphics/misc/sunny_day/5.gbapal"
-	.incbin "graphics/misc/sunny_day/6.gbapal"
-	.incbin "graphics/misc/sunny_day/7.gbapal"
-	.incbin "graphics/misc/sunny_day/8.gbapal"
-	.incbin "graphics/misc/sunny_day/9.gbapal"
-	.incbin "graphics/misc/sunny_day/10.gbapal"
-	.incbin "graphics/misc/sunny_day/11.gbapal"
-	.incbin "graphics/misc/sunny_day/12.gbapal"
-	.incbin "graphics/misc/sunny_day/13.gbapal"
-	.incbin "graphics/misc/sunny_day/14.gbapal"
-	.incbin "graphics/misc/sunny_day/15.gbapal"
-	.incbin "graphics/misc/sunny_day/16.gbapal"
-	.incbin "graphics/misc/sunny_day/17.gbapal"
-	.incbin "graphics/misc/sunny_day/18.gbapal"
-	.incbin "graphics/misc/sunny_day/19.gbapal"
-	.incbin "graphics/misc/sunny_day/20.gbapal"
-	.incbin "graphics/misc/sunny_day/21.gbapal"
-	.incbin "graphics/misc/sunny_day/22.gbapal"
-	.incbin "graphics/misc/sunny_day/23.gbapal"
-	.incbin "graphics/misc/sunny_day/24.gbapal"
-	.incbin "graphics/misc/sunny_day/25.gbapal"
-	.incbin "graphics/misc/sunny_day/26.gbapal"
-	.incbin "graphics/misc/sunny_day/27.gbapal"
-	.incbin "graphics/misc/sunny_day/28.gbapal"
-	.incbin "graphics/misc/sunny_day/29.gbapal"
-	.incbin "graphics/misc/sunny_day/30.gbapal"
-	.incbin "graphics/misc/sunny_day/31.gbapal"
-	.incbin "graphics/misc/sunny_day/32.gbapal"
-	.incbin "graphics/misc/sunny_day/33.gbapal"
-	.incbin "graphics/misc/sunny_day/34.gbapal"
-	.incbin "graphics/misc/sunny_day/35.gbapal"
-	.incbin "graphics/misc/sunny_day/36.gbapal"
-	.incbin "graphics/misc/sunny_day/37.gbapal"
-	.incbin "graphics/misc/sunny_day/38.gbapal"
-	.incbin "graphics/misc/sunny_day/39.gbapal"
-	.incbin "graphics/misc/sunny_day/40.gbapal"
-	.incbin "graphics/misc/sunny_day/41.gbapal"
-	.incbin "graphics/misc/sunny_day/42.gbapal"
-	.incbin "graphics/misc/sunny_day/43.gbapal"
-	.incbin "graphics/misc/sunny_day/44.gbapal"
-	.incbin "graphics/misc/sunny_day/45.gbapal"
-	.incbin "graphics/misc/sunny_day/46.gbapal"
-	.incbin "graphics/misc/sunny_day/47.gbapal"
-	.incbin "graphics/misc/sunny_day/48.gbapal"
-	.incbin "graphics/misc/sunny_day/49.gbapal"
-	.incbin "graphics/misc/sunny_day/50.gbapal"
-	.incbin "graphics/misc/sunny_day/51.gbapal"
-	.incbin "graphics/misc/sunny_day/52.gbapal"
-	.incbin "graphics/misc/sunny_day/53.gbapal"
-	.incbin "graphics/misc/sunny_day/54.gbapal"
-	.incbin "graphics/misc/sunny_day/55.gbapal"
-	.incbin "graphics/misc/sunny_day/56.gbapal"
-	.incbin "graphics/misc/sunny_day/57.gbapal"
-	.incbin "graphics/misc/sunny_day/58.gbapal"
-	.incbin "graphics/misc/sunny_day/59.gbapal"
-	.incbin "graphics/misc/sunny_day/60.gbapal"
-	.incbin "graphics/misc/sunny_day/61.gbapal"
-	.incbin "graphics/misc/sunny_day/62.gbapal"
-	.incbin "graphics/misc/sunny_day/63.gbapal"
-	.incbin "graphics/misc/sunny_day/64.gbapal"
-	.incbin "graphics/misc/sunny_day/65.gbapal"
-	.incbin "graphics/misc/sunny_day/66.gbapal"
-	.incbin "graphics/misc/sunny_day/67.gbapal"
-	.incbin "graphics/misc/sunny_day/68.gbapal"
-	.incbin "graphics/misc/sunny_day/69.gbapal"
-	.incbin "graphics/misc/sunny_day/70.gbapal"
-	.incbin "graphics/misc/sunny_day/71.gbapal"
-	.incbin "graphics/misc/sunny_day/72.gbapal"
-	.incbin "graphics/misc/sunny_day/73.gbapal"
-	.incbin "graphics/misc/sunny_day/74.gbapal"
-	.incbin "graphics/misc/sunny_day/75.gbapal"
-	.incbin "graphics/misc/sunny_day/76.gbapal"
-	.incbin "graphics/misc/sunny_day/77.gbapal"
-	.incbin "graphics/misc/sunny_day/78.gbapal"
-	.incbin "graphics/misc/sunny_day/79.gbapal"
-	.incbin "graphics/misc/sunny_day/80.gbapal"
-	.incbin "graphics/misc/sunny_day/81.gbapal"
-	.incbin "graphics/misc/sunny_day/82.gbapal"
-	.incbin "graphics/misc/sunny_day/83.gbapal"
-	.incbin "graphics/misc/sunny_day/84.gbapal"
-	.incbin "graphics/misc/sunny_day/85.gbapal"
-	.incbin "graphics/misc/sunny_day/86.gbapal"
-	.incbin "graphics/misc/sunny_day/87.gbapal"
-	.incbin "graphics/misc/sunny_day/88.gbapal"
-	.incbin "graphics/misc/sunny_day/89.gbapal"
-	.incbin "graphics/misc/sunny_day/90.gbapal"
-	.incbin "graphics/misc/sunny_day/91.gbapal"
-	.incbin "graphics/misc/sunny_day/92.gbapal"
-	.incbin "graphics/misc/sunny_day/93.gbapal"
-	.incbin "graphics/misc/sunny_day/94.gbapal"
-	.incbin "graphics/misc/sunny_day/95.gbapal"
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/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/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/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/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 b1b90daee..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_Layouts::
-	.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/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/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/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/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/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/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/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/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/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_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/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..b6e31981d
--- /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_UNKNOWN_MAP_08417FC4",
+      "name": "UnknownMap_08417FC4_Layout",
+      "width": 80,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/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_MAP_08428450",
+      "name": "UnknownMap_08428450_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_08428450/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_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_MAP_084294C4",
+      "name": "UnknownMap_084294C4_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_084294E8",
+      "name": "UnknownMap_084294E8_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_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_MAP_0843E6C0",
+      "name": "UnknownMap_0843E6C0_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E6E4",
+      "name": "UnknownMap_0843E6E4_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E708",
+      "name": "UnknownMap_0843E708_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E72C",
+      "name": "UnknownMap_0843E72C_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E750",
+      "name": "UnknownMap_0843E750_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E774",
+      "name": "UnknownMap_0843E774_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E798",
+      "name": "UnknownMap_0843E798_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E7BC",
+      "name": "UnknownMap_0843E7BC_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E7E0",
+      "name": "UnknownMap_0843E7E0_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E804",
+      "name": "UnknownMap_0843E804_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E828",
+      "name": "UnknownMap_0843E828_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E84C",
+      "name": "UnknownMap_0843E84C_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E870",
+      "name": "UnknownMap_0843E870_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0843E894",
+      "name": "UnknownMap_0843E894_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_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_MAP_25_29",
+      "name": "UnknownMap_25_29_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_25_29/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_25_30",
+      "name": "UnknownMap_25_30_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_25_30/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_25_31",
+      "name": "UnknownMap_25_31_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_25_31/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_25_32",
+      "name": "UnknownMap_25_32_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_25_32/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_25_33",
+      "name": "UnknownMap_25_33_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_25_33/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_25_34",
+      "name": "UnknownMap_25_34_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Contest",
+      "border_filepath": "data/layouts/UnknownMap_25_34/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_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_MAP_08447028",
+      "name": "UnknownMap_08447028_Layout",
+      "width": 58,
+      "height": 26,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "0",
+      "border_filepath": "data/layouts/UnknownMap_08447028/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_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_UNKNOWN_MAP_0845A394",
+      "name": "UnknownMap_0845A394_Layout",
+      "width": 19,
+      "height": 19,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0845A394/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_UNKNOWN_MAP_0845D470",
+      "name": "UnknownMap_0845D470_Layout",
+      "width": 60,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0845D470/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_UNKNOWN_MAP_0845ECB4",
+      "name": "UnknownMap_0845ECB4_Layout",
+      "width": 27,
+      "height": 46,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/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_UNKNOWN_MAP_08469200",
+      "name": "UnknownMap_08469200_Layout",
+      "width": 60,
+      "height": 60,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Sootopolis",
+      "border_filepath": "data/layouts/UnknownMap_08469200/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_08469200/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_MAP_084693AC",
+      "name": "UnknownMap_084693AC_Layout",
+      "width": 1,
+      "height": 1,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BattlePike",
+      "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_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_UNKNOWN_MAP_08480DAC",
+      "name": "UnknownMap_08480DAC_Layout",
+      "width": 13,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
+      "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_08480F54",
+      "name": "UnknownMap_08480F54_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_084810FC",
+      "name": "UnknownMap_084810FC_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_084812A4",
+      "name": "UnknownMap_084812A4_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_0848144C",
+      "name": "UnknownMap_0848144C_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_084815F4",
+      "name": "UnknownMap_084815F4_Layout",
+      "width": 14,
+      "height": 14,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin"
+    },
+    {
+      "id": "LAYOUT_UNKNOWN_MAP_08481B24",
+      "name": "UnknownMap_08481B24_Layout",
+      "width": 27,
+      "height": 24,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Pacifidlog",
+      "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_08481B24/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_UNKNOWN_MAP_08481DBC",
+      "name": "UnknownMap_08481DBC_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_MysteryEventsHouse",
+      "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/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 ab5578438..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_Layouts
-	.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 1d4813b73..c6f88d305 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -12,522 +12,5 @@
 
 	.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/LinkContestRoom2/events.inc"
-	.include "data/maps/LinkContestRoom3/events.inc"
-	.include "data/maps/LinkContestRoom4/events.inc"
-	.include "data/maps/LinkContestRoom5/events.inc"
-	.include "data/maps/LinkContestRoom6/events.inc"
-	.include "data/maps/UnknownMap_25_29/events.inc"
-	.include "data/maps/UnknownMap_25_30/events.inc"
-	.include "data/maps/UnknownMap_25_31/events.inc"
-	.include "data/maps/UnknownMap_25_32/events.inc"
-	.include "data/maps/UnknownMap_25_33/events.inc"
-	.include "data/maps/UnknownMap_25_34/events.inc"
-	.include "data/maps/InsideOfTruck/events.inc"
-	.include "data/maps/SSTidalCorridor/events.inc"
-	.include "data/maps/SSTidalLowerDeck/events.inc"
-	.include "data/maps/SSTidalRooms/events.inc"
-	.include "data/maps/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..3334fd103 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,3 +1,4 @@
+#include "constants/layouts.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/weather.h"
@@ -9,8 +10,8 @@
 
 	.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..69a8b31cb
--- /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..d2f65aee4
--- /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..7e27751b1
--- /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_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_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_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..51fc0f260
--- /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_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..f762b08f9
--- /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..84ccb93dc
--- /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..2e8256331
--- /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..789b4edb5
--- /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..224b25165
--- /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_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_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/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/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..327e7eded
--- /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/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..278bc5894
--- /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..80c4af8ef
--- /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_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..56bbaab30
--- /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_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..a0792d733
--- /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..d47609dc8
--- /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/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..5b1a51ad5
--- /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_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..2cacf6621
--- /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_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..fc8e5bd37
--- /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_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..e897866d4
--- /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 d92c6cbf4..7dbeee042 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -968,7 +968,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
 	compare VAR_TEMP_D, 0
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
 	setobjectxyperm 6, 2, 0
-	setobjectmovementtype 6, 10
+	setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
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..3f7dc3bda
--- /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_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..c94d1e1c7
--- /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_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..0e96decdf
--- /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_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..de1cdd2ff
--- /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_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..87ad1077a
--- /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_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..4d9d792f7
--- /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_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..b0405cff0
--- /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_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..34378700e
--- /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_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..ccdbe327a
--- /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_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..e35831a6d
--- /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_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..938e4da3f
--- /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_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..9ed644d79
--- /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_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..437e7fcfd
--- /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_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..60aeee81c
--- /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_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..e2d0645cb
--- /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_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..2184971eb
--- /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..aab03982f
--- /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": "65535",
+  "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_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..7ffd80dcf
--- /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_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..09fe56ef1
--- /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": "65535",
+  "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_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..736fd55c8
--- /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_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..60d7bc73a
--- /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_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..c99dcac09
--- /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_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..a15882e77
--- /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_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..6af03f7f9
--- /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_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..4773d78ed
--- /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_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..2a9726fc0
--- /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_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..3f6b1681e
--- /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..bade81462
--- /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..592f65a7b
--- /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_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..9165d21fb
--- /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..500b0fb71
--- /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..0b48dbbcf
--- /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..28fd390f7
--- /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..13cf5e254
--- /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..3d4faf383
--- /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..068a46b72
--- /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_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..700c24aff
--- /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": "BattleFrontier_OutsideEast_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideEast_EventScript_271E73"
+    }
+  ]
+}
\ No newline at end of file
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..43298e663
--- /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": "BattleFrontier_OutsideWest_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 53,
+      "y": 51,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_OutsideWest_EventScript_271E6A"
+    }
+  ]
+}
\ No newline at end of file
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..4a78ec120
--- /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_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..1f3babd48
--- /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_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..64fa727d7
--- /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..ffde653f7
--- /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_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..aa6003a86
--- /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/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..38320ece6
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..0dc6f713a
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..4e446e24b
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..67dfdaa11
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..ac8bd5d7d
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..d9fa40ccd
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..a097f60ba
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..6939b8a7e
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..56380e991
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..33534391b
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..f22855aa2
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..d8e0d45a9
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..880178e0e
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..423346532
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..12b1f4cb8
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..65fa0a361
--- /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": "65535",
+  "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "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..43ffc5d44
--- /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": "65535",
+  "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_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..f55cf8e93
--- /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": "65535",
+  "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/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_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..f8c584845
--- /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": "65535",
+  "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_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_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_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_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/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..439611a39
--- /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/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..3a16f2c5d
--- /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/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..64e70fe7f
--- /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": "DewfordTown_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 3,
+      "y": 10,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "DewfordTown_EventScript_271E73"
+    },
+    {
+      "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_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..e42e4ffe8
--- /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_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..f6a8dac7b
--- /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_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..fbc3e02ed
--- /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..742fde706
--- /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..137b9f5e9
--- /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_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..e4f298d73
--- /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/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..c0cd88761
--- /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": "gUnknown_08277388"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_082773BE"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_082773A3"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_082773D9"
+    }
+  ],
+  "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..4812461f7
--- /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": "EverGrandeCity_EventScript_271E73"
+    },
+    {
+      "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": "EverGrandeCity_EventScript_271E73"
+    }
+  ]
+}
\ No newline at end of file
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..0281bebc5
--- /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_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..92e1651e5
--- /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_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..774489415
--- /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_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_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_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_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_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_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..c7440cf98
--- /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_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..36bf11a13
--- /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_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..7263f67cb
--- /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_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..195197b56
--- /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_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..5fe580001
--- /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_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..43d777f35
--- /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_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..2eceb30ae
--- /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/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..e2519f880
--- /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": "FallarborTown_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "FallarborTown_EventScript_271E73"
+    },
+    {
+      "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": "FallarborTown_EventScript_271E73"
+    },
+    {
+      "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": "FallarborTown_EventScript_271E6A"
+    },
+    {
+      "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_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..53a280196
--- /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_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..51d69dc93
--- /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_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..5c36cf3d9
--- /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_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..fb66ad1de
--- /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_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..2b5ea5214
--- /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_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..9416efe01
--- /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..a432b8a1a
--- /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_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..be694d257
--- /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/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..683010e12
--- /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_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..d6531d043
--- /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/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..26c609e05
--- /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/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..0aec65572
--- /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": "FortreeCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 5,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "FortreeCity_EventScript_271E6A"
+    },
+    {
+      "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": "FortreeCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "FortreeCity_EventScript_271E6A"
+    }
+  ]
+}
\ No newline at end of file
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..6a8d9fdab
--- /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..ad6b7c6b9
--- /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_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..8f349e640
--- /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..7b9a67ab6
--- /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_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..d886e0cdb
--- /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..11fd05bf5
--- /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_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..37e23502b
--- /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..3b7e0723b
--- /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..f51926d3b
--- /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_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..4984b7692
--- /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/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..3f720a569
--- /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..6e3a14403
--- /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_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..18b5ca9d4
--- /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..22a6207c2
--- /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..4978d841c
--- /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": "65535",
+  "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_0x4092",
+      "var_value": 0,
+      "script": "InsideOfTruck_EventScript_23BF04"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "var": "VAR_0x4092",
+      "var_value": 0,
+      "script": "InsideOfTruck_EventScript_23BF04"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 3,
+      "elevation": 3,
+      "var": "VAR_0x4092",
+      "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/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..c6365025b
--- /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/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..748fc9914
--- /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_0x40C8",
+      "var_value": 1,
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 20,
+      "elevation": 3,
+      "var": "VAR_0x40C8",
+      "var_value": 1,
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 21,
+      "y": 20,
+      "elevation": 3,
+      "var": "VAR_0x40C8",
+      "var_value": 1,
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x40C8",
+      "var_value": 1,
+      "script": "JaggedPass_EventScript_2306BB"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x40C8",
+      "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/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..6bf3162c8
--- /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": "LavaridgeTown_EventScript_271E6A"
+    },
+    {
+      "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": "LavaridgeTown_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "LavaridgeTown_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "LavaridgeTown_EventScript_271E73"
+    },
+    {
+      "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 82a3b8469..899df4d2c 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -28,7 +28,7 @@ LavaridgeTown_EventScript_1EA518:: @ 81EA518
 LavaridgeTown_EventScript_1EA529:: @ 81EA529
 	setobjectxyperm 8, 11, 9
 	setobjectxyperm 7, 9, 8
-	setobjectmovementtype 7, 7
+	setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP
 	clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
 	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..dac9467f0
--- /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 06ea54a98..bf48225ec 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -38,22 +38,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756
 LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757
 	checktrainerflag TRAINER_COLE
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764
-	setobjectmovementtype 2, 63
+	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764
 	checktrainerflag TRAINER_GERALD
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771
-	setobjectmovementtype 3, 63
+	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771
 	checktrainerflag TRAINER_AXLE
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E
-	setobjectmovementtype 4, 63
+	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E
 	checktrainerflag TRAINER_DANIELLE
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B
-	setobjectmovementtype 5, 63
+	setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B
 	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..c81e42dc2
--- /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 222f36810..a8a6eaa54 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
@@ -37,22 +37,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB
 LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC
 	checktrainerflag TRAINER_KEEGAN
 	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9
-	setobjectmovementtype 2, 63
+	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9
 	checktrainerflag TRAINER_JACE
 	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6
-	setobjectmovementtype 1, 63
+	setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6
 	checktrainerflag TRAINER_JEFF
 	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903
-	setobjectmovementtype 3, 63
+	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903
 	checktrainerflag TRAINER_ELI
 	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910
-	setobjectmovementtype 4, 63
+	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
 
 LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910
 	return
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..c8091527c
--- /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_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..5465c81f8
--- /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..1208d3e53
--- /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..18980fb3c
--- /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_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..a8c2ef9a3
--- /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/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..d10f00260
--- /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": "LilycoveCity_EventScript_271E73"
+    },
+    {
+      "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": "LilycoveCity_EventScript_271E73"
+    },
+    {
+      "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_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..644ec55ee
--- /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_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..65571d71c
--- /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_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..f00b407c7
--- /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_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..94ae04069
--- /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_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..2c22272ac
--- /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_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..784660e36
--- /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_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..58e400ff4
--- /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_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..b3fd03f00
--- /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..e9d5785e6
--- /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..b41eecd31
--- /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..6ea8bbbf2
--- /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_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..1eb68641a
--- /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_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..b8d59e953
--- /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..87f5a52d9
--- /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_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..78dffc5f0
--- /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_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..72cd396f0
--- /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..72f376e23
--- /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_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..ab2ae56fb
--- /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_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..d200fad22
--- /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_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..b58418edd
--- /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_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..346a91173
--- /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_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..b48876cce
--- /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_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 5c1a3b9f4..000000000
--- a/data/maps/LinkContestRoom1/events.inc
+++ /dev/null
@@ -1,18 +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
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..538b0af69
--- /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 5276adcd8..e756c2bc6 100644
--- a/data/maps/LinkContestRoom1/scripts.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
@@ -1 +1,458 @@
 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
+	.byte 0
+
+LinkContestRoom1_MapScript1_23B79B: @ 823B79B
+	special sub_80F8B94
+	end
+
+LinkContestRoom1_MapScript1_23B79F: @ 823B79F
+	call LinkContestRoom1_EventScript_23B7AF
+	setvar VAR_TEMP_0, 1
+	call LinkContestRoom1_EventScript_23B842
+	end
+
+LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
+	call LinkContestRoom1_EventScript_27A133
+	special ScriptGetMultiplayerId
+	compare VAR_RESULT, 0
+	call_if_eq LinkContestRoom1_EventScript_23B7EF
+	compare VAR_RESULT, 1
+	call_if_eq LinkContestRoom1_EventScript_23B7F3
+	compare VAR_RESULT, 2
+	call_if_eq LinkContestRoom1_EventScript_23B7F7
+	compare VAR_RESULT, 3
+	call_if_eq LinkContestRoom1_EventScript_23B7FB
+	compare VAR_RESULT, 4
+	call_if_eq LinkContestRoom1_EventScript_23B7FF
+	return
+
+LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF
+	savebgm MUS_TEST1
+	return
+
+LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3
+	savebgm MUS_TEST2
+	return
+
+LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7
+	savebgm MUS_TEST3
+	return
+
+LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB
+	savebgm MUS_TEST4
+	return
+
+LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF
+	savebgm MUS_CONTEST0
+	return
+
+LinkContestRoom1_MapScript1_23B803: @ 823B803
+	compare VAR_TEMP_9, 1
+	call_if_eq LinkContestRoom1_EventScript_23B80F
+	end
+
+LinkContestRoom1_EventScript_23B80F:: @ 823B80F
+	call LinkContestRoom1_EventScript_23BB2B
+	return
+
+LinkContestRoom1_MapScript2_23B815: @ 823B815
+	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829
+	.2byte 0
+
+LinkContestRoom1_MapScript2_23B81F: @ 823B81F
+	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834
+	.2byte 0
+
+LinkContestRoom1_EventScript_23B829:: @ 823B829
+	call LinkContestRoom1_EventScript_279F97
+	call LinkContestRoom1_EventScript_23BE44
+	end
+
+LinkContestRoom1_EventScript_23B834:: @ 823B834
+	special sub_80F8B94
+	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
+	call LinkContestRoom1_EventScript_23BB2B
+	end
+
+LinkContestRoom1_EventScript_23B842:: @ 823B842
+	call LinkContestRoom1_EventScript_23B8F8
+	call LinkContestRoom1_EventScript_23B858
+	compare VAR_TEMP_0, 8
+	goto_if_lt LinkContestRoom1_EventScript_23B842
+	return
+
+LinkContestRoom1_EventScript_23B858:: @ 823B858
+	switch VAR_TEMP_0
+	case 1, LinkContestRoom1_EventScript_23B8AB
+	case 2, LinkContestRoom1_EventScript_23B8B6
+	case 3, LinkContestRoom1_EventScript_23B8C1
+	case 4, LinkContestRoom1_EventScript_23B8CC
+	case 5, LinkContestRoom1_EventScript_23B8D7
+	case 6, LinkContestRoom1_EventScript_23B8E2
+	case 7, LinkContestRoom1_EventScript_23B8ED
+	end
+
+LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB
+	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6
+	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1
+	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC
+	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7
+	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2
+	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
+	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
+	setvar VAR_RESULT, 32
+	special ScriptRandom
+	addvar VAR_RESULT, 1
+	switch VAR_RESULT
+	case 1, LinkContestRoom1_EventScript_23BA6B
+	case 2, LinkContestRoom1_EventScript_23BA71
+	case 3, LinkContestRoom1_EventScript_23BA77
+	case 4, LinkContestRoom1_EventScript_23BA7D
+	case 5, LinkContestRoom1_EventScript_23BA83
+	case 6, LinkContestRoom1_EventScript_23BA89
+	case 7, LinkContestRoom1_EventScript_23BA8F
+	case 8, LinkContestRoom1_EventScript_23BA95
+	case 9, LinkContestRoom1_EventScript_23BA9B
+	case 10, LinkContestRoom1_EventScript_23BAA1
+	case 11, LinkContestRoom1_EventScript_23BAA7
+	case 12, LinkContestRoom1_EventScript_23BAAD
+	case 13, LinkContestRoom1_EventScript_23BAB3
+	case 14, LinkContestRoom1_EventScript_23BAB9
+	case 15, LinkContestRoom1_EventScript_23BABF
+	case 16, LinkContestRoom1_EventScript_23BAC5
+	case 17, LinkContestRoom1_EventScript_23BACB
+	case 18, LinkContestRoom1_EventScript_23BAD1
+	case 19, LinkContestRoom1_EventScript_23BAD7
+	case 20, LinkContestRoom1_EventScript_23BADD
+	case 21, LinkContestRoom1_EventScript_23BAE3
+	case 22, LinkContestRoom1_EventScript_23BAE9
+	case 23, LinkContestRoom1_EventScript_23BAEF
+	case 24, LinkContestRoom1_EventScript_23BAF5
+	case 25, LinkContestRoom1_EventScript_23BAFB
+	case 26, LinkContestRoom1_EventScript_23BB01
+	case 27, LinkContestRoom1_EventScript_23BB07
+	case 28, LinkContestRoom1_EventScript_23BB0D
+	case 29, LinkContestRoom1_EventScript_23BB13
+	case 30, LinkContestRoom1_EventScript_23BB19
+	case 31, LinkContestRoom1_EventScript_23BB1F
+	case 32, LinkContestRoom1_EventScript_23BB25
+	end
+
+LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
+	setvar VAR_TEMP_1, 5
+	return
+
+LinkContestRoom1_EventScript_23BA71:: @ 823BA71
+	setvar VAR_TEMP_1, 6
+	return
+
+LinkContestRoom1_EventScript_23BA77:: @ 823BA77
+	setvar VAR_TEMP_1, 7
+	return
+
+LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
+	setvar VAR_TEMP_1, 8
+	return
+
+LinkContestRoom1_EventScript_23BA83:: @ 823BA83
+	setvar VAR_TEMP_1, 10
+	return
+
+LinkContestRoom1_EventScript_23BA89:: @ 823BA89
+	setvar VAR_TEMP_1, 11
+	return
+
+LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
+	setvar VAR_TEMP_1, 12
+	return
+
+LinkContestRoom1_EventScript_23BA95:: @ 823BA95
+	setvar VAR_TEMP_1, 13
+	return
+
+LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
+	setvar VAR_TEMP_1, 14
+	return
+
+LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
+	setvar VAR_TEMP_1, 15
+	return
+
+LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
+	setvar VAR_TEMP_1, 17
+	return
+
+LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
+	setvar VAR_TEMP_1, 18
+	return
+
+LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
+	setvar VAR_TEMP_1, 19
+	return
+
+LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
+	setvar VAR_TEMP_1, 20
+	return
+
+LinkContestRoom1_EventScript_23BABF:: @ 823BABF
+	setvar VAR_TEMP_1, 21
+	return
+
+LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
+	setvar VAR_TEMP_1, 22
+	return
+
+LinkContestRoom1_EventScript_23BACB:: @ 823BACB
+	setvar VAR_TEMP_1, 25
+	return
+
+LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
+	setvar VAR_TEMP_1, 26
+	return
+
+LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
+	setvar VAR_TEMP_1, 27
+	return
+
+LinkContestRoom1_EventScript_23BADD:: @ 823BADD
+	setvar VAR_TEMP_1, 47
+	return
+
+LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
+	setvar VAR_TEMP_1, 30
+	return
+
+LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
+	setvar VAR_TEMP_1, 31
+	return
+
+LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
+	setvar VAR_TEMP_1, 32
+	return
+
+LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
+	setvar VAR_TEMP_1, 33
+	return
+
+LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
+	setvar VAR_TEMP_1, 34
+	return
+
+LinkContestRoom1_EventScript_23BB01:: @ 823BB01
+	setvar VAR_TEMP_1, 35
+	return
+
+LinkContestRoom1_EventScript_23BB07:: @ 823BB07
+	setvar VAR_TEMP_1, 36
+	return
+
+LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
+	setvar VAR_TEMP_1, 37
+	return
+
+LinkContestRoom1_EventScript_23BB13:: @ 823BB13
+	setvar VAR_TEMP_1, 38
+	return
+
+LinkContestRoom1_EventScript_23BB19:: @ 823BB19
+	setvar VAR_TEMP_1, 44
+	return
+
+LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
+	setvar VAR_TEMP_1, 45
+	return
+
+LinkContestRoom1_EventScript_23BB25:: @ 823BB25
+	setvar VAR_TEMP_1, 46
+	return
+
+LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
+	specialvar VAR_RESULT, sub_80F9160
+	compare VAR_RESULT, 1
+	goto_if_eq LinkContestRoom1_EventScript_23BD86
+	switch VAR_0x4088
+	case 1, LinkContestRoom1_EventScript_23BB78
+	case 2, LinkContestRoom1_EventScript_23BB8B
+	case 3, LinkContestRoom1_EventScript_23BBE6
+	case 4, LinkContestRoom1_EventScript_23BC92
+	case 5, LinkContestRoom1_EventScript_23BC92
+	return
+
+LinkContestRoom1_EventScript_23BB78:: @ 823BB78
+	createvobject 5, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 46, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 12, 13, 12, 8, 3, 3
+	createvobject 47, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 48, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 22, 20, 3, 2, 3, 1
+	createvobject 23, 20, 6, 2, 3, 1
+	createvobject 34, 20, 7, 2, 3, 1
+	createvobject 46, 24, 8, 2, 3, 1
+	createvobject 48, 24, 11, 2, 3, 1
+	createvobject 11, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 17, 27, 5, 9, 3, 2
+	createvobject 40, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_23BC92:: @ 823BC92
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 12, 3, 2, 8, 3, 4
+	createvobject 39, 4, 1, 3, 3, 4
+	createvobject 34, 6, 1, 5, 3, 4
+	createvobject 26, 7, 1, 6, 3, 4
+	createvobject 48, 9, 1, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 50, 14, 13, 3, 3, 3
+	createvobject 52, 15, 13, 4, 3, 3
+	createvobject 65, 17, 13, 6, 3, 3
+	createvobject 83, 18, 13, 7, 3, 3
+	createvobject 116, 19, 13, 8, 3, 3
+	createvobject 25, 20, 3, 2, 3, 1
+	createvobject 31, 21, 6, 2, 3, 1
+	createvobject 33, 22, 7, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	createvobject 49, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 48, 27, 5, 9, 3, 2
+	createvobject 40, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_23BD86:: @ 823BD86
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 12, 3, 2, 8, 3, 4
+	createvobject 39, 4, 1, 3, 3, 4
+	createvobject 34, 6, 1, 5, 3, 4
+	createvobject 26, 7, 1, 6, 3, 4
+	createvobject 48, 9, 1, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 50, 14, 13, 3, 3, 3
+	createvobject 52, 15, 13, 4, 3, 3
+	createvobject 65, 17, 13, 6, 3, 3
+	createvobject 83, 18, 13, 7, 3, 3
+	createvobject 116, 19, 13, 8, 3, 3
+	createvobject 25, 20, 3, 2, 3, 1
+	createvobject 31, 21, 6, 2, 3, 1
+	createvobject 33, 22, 7, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_23BE44:: @ 823BE44
+	special sub_80F9154
+	switch VAR_0x4088
+	case 1, LinkContestRoom1_EventScript_23BE84
+	case 2, LinkContestRoom1_EventScript_23BE8E
+	case 3, LinkContestRoom1_EventScript_23BE98
+	case 4, LinkContestRoom1_EventScript_23BEA2
+	case 5, LinkContestRoom1_EventScript_23BEAC
+	return
+
+LinkContestRoom1_EventScript_23BE84:: @ 823BE84
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BE98:: @ 823BE98
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
+	waitstate
+	end
+
+LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE
+	compare VAR_RESULT, FEMALE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4
+	return
+
+LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
+
diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc
deleted file mode 100644
index 89cb251d5..000000000
--- a/data/maps/LinkContestRoom2/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-LinkContestRoom2_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
deleted file mode 100644
index f9274e58b..000000000
--- a/data/maps/LinkContestRoom2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom2: @ 8484E64
-	.4byte LinkContestRoom2_Layout
-	.4byte LinkContestRoom2_MapEvents
-	.4byte LinkContestRoom2_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/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc
index ff85310f7..8b1378917 100644
--- a/data/maps/LinkContestRoom2/scripts.inc
+++ b/data/maps/LinkContestRoom2/scripts.inc
@@ -1 +1 @@
-LinkContestRoom2_MapScripts:: @ 823B781
+
diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc
deleted file mode 100644
index 1e1b194c6..000000000
--- a/data/maps/LinkContestRoom3/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-LinkContestRoom3_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
deleted file mode 100644
index 1b445db4b..000000000
--- a/data/maps/LinkContestRoom3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom3: @ 8484E80
-	.4byte LinkContestRoom3_Layout
-	.4byte LinkContestRoom3_MapEvents
-	.4byte LinkContestRoom3_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/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc
index c3a5c95fb..8b1378917 100644
--- a/data/maps/LinkContestRoom3/scripts.inc
+++ b/data/maps/LinkContestRoom3/scripts.inc
@@ -1 +1 @@
-LinkContestRoom3_MapScripts:: @ 823B781
+
diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc
deleted file mode 100644
index 56e608f20..000000000
--- a/data/maps/LinkContestRoom4/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-LinkContestRoom4_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
deleted file mode 100644
index 20720be06..000000000
--- a/data/maps/LinkContestRoom4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom4: @ 8484E9C
-	.4byte LinkContestRoom4_Layout
-	.4byte LinkContestRoom4_MapEvents
-	.4byte LinkContestRoom4_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/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc
index 9a544e6f3..8b1378917 100644
--- a/data/maps/LinkContestRoom4/scripts.inc
+++ b/data/maps/LinkContestRoom4/scripts.inc
@@ -1 +1 @@
-LinkContestRoom4_MapScripts:: @ 823B781
+
diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc
deleted file mode 100644
index 90644518e..000000000
--- a/data/maps/LinkContestRoom5/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-LinkContestRoom5_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
deleted file mode 100644
index f2e9c6c55..000000000
--- a/data/maps/LinkContestRoom5/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom5: @ 8484EB8
-	.4byte LinkContestRoom5_Layout
-	.4byte LinkContestRoom5_MapEvents
-	.4byte LinkContestRoom5_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/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc
index f7ea72996..8b1378917 100644
--- a/data/maps/LinkContestRoom5/scripts.inc
+++ b/data/maps/LinkContestRoom5/scripts.inc
@@ -1 +1 @@
-LinkContestRoom5_MapScripts:: @ 823B781
+
diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc
deleted file mode 100644
index 802987a1d..000000000
--- a/data/maps/LinkContestRoom6/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-LinkContestRoom6_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
deleted file mode 100644
index 225a99e46..000000000
--- a/data/maps/LinkContestRoom6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom6: @ 8484ED4
-	.4byte LinkContestRoom6_Layout
-	.4byte LinkContestRoom6_MapEvents
-	.4byte LinkContestRoom6_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/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc
index bea65ea48..8b1378917 100644
--- a/data/maps/LinkContestRoom6/scripts.inc
+++ b/data/maps/LinkContestRoom6/scripts.inc
@@ -1 +1 @@
-LinkContestRoom6_MapScripts:: @ 823B781
+
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..28decfc87
--- /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 b7067f451..5d9161cb4 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -56,17 +56,17 @@ LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F
 	compare VAR_0x4050, 0
 	goto_if_eq LittlerootTown_EventScript_1E7E86
 	setobjectxyperm 1, 10, 1
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_EventScript_1E7E86:: @ 81E7E86
 	setobjectxyperm 1, 7, 2
-	setobjectmovementtype 1, 8
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 LittlerootTown_EventScript_1E7E92:: @ 81E7E92
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
-	setobjectmovementtype 4, 8
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq LittlerootTown_EventScript_1E7EB1
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..79f3c75a8
--- /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_0x4092",
+      "var_value": 4,
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_0x408D",
+      "var_value": 2,
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "var": "VAR_0x408D",
+      "var_value": 2,
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_0x408D",
+      "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 8fa7adbca..42cfe308b 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -36,17 +36,17 @@ LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6
 	setobjectxyperm 1, 8, 4
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2
 	setobjectxyperm 1, 4, 5
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE
 	setobjectxyperm 1, 9, 8
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA
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..4adc28388
--- /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 8bd4b43b9..ea00693a8 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -27,7 +27,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
 	compare VAR_0x40D3, 2
 	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309
 	setobjectxyperm 1, 0, 2
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456
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..817def8b2
--- /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_0x4092",
+      "var_value": 4,
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C"
+    },
+    {
+      "type": "trigger",
+      "x": 1,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_0x408D",
+      "var_value": 2,
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67"
+    },
+    {
+      "type": "trigger",
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "var": "VAR_0x408D",
+      "var_value": 2,
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 3,
+      "elevation": 0,
+      "var": "VAR_0x408D",
+      "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 25ebc1bbd..36bda7e03 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -36,17 +36,17 @@ LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
 
 LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916
 	setobjectxyperm 1, 2, 4
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922
 	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E
 	setobjectxyperm 1, 1, 8
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A
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..be1329fbd
--- /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 ffc4a6519..353437ad4 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -27,7 +27,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
 	compare VAR_0x40D3, 2
 	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
 	setobjectxyperm 1, 8, 2
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309
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..2b29f99c1
--- /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 1f65beda3..b47df74b8 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -19,7 +19,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
 	specialvar VAR_RESULT, HasAllHoennMons
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
-	setobjectmovementtype 3, 3
+	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm 3, 5, 10
 	end
 
@@ -28,12 +28,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
-	setmaplayoutindex 432
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
-	setmaplayoutindex 432
-	setobjectmovementtype 3, 3
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC
+	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm 3, 5, 10
 	end
 
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..2d07a723a
--- /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_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..75db41221
--- /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..af80ea8ff
--- /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..ec61d2759
--- /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..23e8d0b8c
--- /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..40921b8ca
--- /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..dcec4fdb9
--- /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/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..017adcc9a
--- /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_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/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..4ee667f2b
--- /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": "MauvilleCity_EventScript_271E73"
+    },
+    {
+      "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": "MauvilleCity_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 25,
+      "y": 14,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MauvilleCity_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 24,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MauvilleCity_EventScript_271E73"
+    },
+    {
+      "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_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..c774718f0
--- /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..696694a6b
--- /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_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..2ae4cb474
--- /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_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..ec2d63cf9
--- /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..f29a2a34c
--- /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_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..23b451ae2
--- /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..3e63670ab
--- /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_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..956868d68
--- /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/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..c7611f2fd
--- /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_0x40BF",
+      "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_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..f1e47c986
--- /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..527813efb
--- /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..b3d696c8e
--- /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/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_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_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..7ba9772da
--- /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_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..a39ed14a9
--- /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/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..66d426780
--- /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_0x405D",
+      "var_value": 1,
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 41,
+      "y": 22,
+      "elevation": 5,
+      "var": "VAR_0x405D",
+      "var_value": 1,
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 41,
+      "y": 23,
+      "elevation": 5,
+      "var": "VAR_0x405D",
+      "var_value": 1,
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 41,
+      "y": 24,
+      "elevation": 5,
+      "var": "VAR_0x405D",
+      "var_value": 1,
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 40,
+      "y": 25,
+      "elevation": 5,
+      "var": "VAR_0x405D",
+      "var_value": 1,
+      "script": "MossdeepCity_EventScript_1E4B41"
+    },
+    {
+      "type": "trigger",
+      "x": 40,
+      "y": 26,
+      "elevation": 5,
+      "var": "VAR_0x405D",
+      "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": "MossdeepCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 38,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MossdeepCity_EventScript_271E6A"
+    },
+    {
+      "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": "MossdeepCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 39,
+      "y": 18,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "MossdeepCity_EventScript_271E6A"
+    },
+    {
+      "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_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..ffb52896e
--- /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_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..4469b2642
--- /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..37c41435b
--- /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_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..55e573f69
--- /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..7f2121b7f
--- /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..1f28d4d22
--- /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..9f9f01ebd
--- /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..6b739a2d2
--- /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..6f1f3f774
--- /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_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..7aa2e7ccb
--- /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_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..f53950394
--- /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 91eda813c..e875be96f 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -10,14 +10,14 @@ MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C
 
 MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
 	setobjectxyperm 3, 1, 9
-	setobjectmovementtype 3, 10
+	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectxyperm 5, 0, 8
-	setobjectmovementtype 5, 10
+	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectxyperm 4, 1, 6
-	setobjectmovementtype 4, 10
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectxyperm 1, 3, 4
-	setobjectmovementtype 1, 10
-	setobjectmovementtype 2, 10
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
+	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
 	compare VAR_0x409E, 1
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA
 	compare VAR_0x409E, 2
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..a40f6ca9d
--- /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 163f7045f..0602c9dad 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -13,11 +13,11 @@ MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
 MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
 	clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
 	setobjectxyperm 3, 5, 3
-	setobjectmovementtype 3, 10
+	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectxyperm 1, 3, 2
-	setobjectmovementtype 1, 10
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectxyperm 2, 1, 3
-	setobjectmovementtype 2, 10
+	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F
@@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	removeobject 3
 	setobjectxyperm 3, 5, 6
-	setobjectmovementtype 3, 2
+	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND
 	addobject 3
 	fadescreen 0
 	end
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..beedbd75a
--- /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 d2bd91694..51f1ac16e 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -19,7 +19,7 @@ MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
 
 MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
 	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
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..b8dd7bb09
--- /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_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..155686bbb
--- /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 8e52438c9..6c389e2ad 100644
--- a/data/maps/MtChimney_CableCarStation/scripts.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -10,7 +10,7 @@ MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
 
 MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
 	setobjectxyperm 1, 5, 4
-	setobjectmovementtype 1, 10
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
@@ -24,7 +24,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
 	waitmovement 0
 	setvar VAR_0x40A3, 0
 	setobjectxyperm 1, 6, 7
-	setobjectmovementtype 1, 8
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	releaseall
 	end
 
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..1969ba9cd
--- /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_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..07b20b3b3
--- /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_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..a1b39048e
--- /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..a7bf954e7
--- /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..b27d426ac
--- /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..a169953f2
--- /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..2075fed62
--- /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_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..cc9efce09
--- /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_0x40B9",
+      "var_value": 0,
+      "script": "MtPyre_Summit_EventScript_232018"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x40B9",
+      "var_value": 0,
+      "script": "MtPyre_Summit_EventScript_232024"
+    },
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x40B9",
+      "var_value": 0,
+      "script": "MtPyre_Summit_EventScript_232030"
+    },
+    {
+      "type": "trigger",
+      "x": 22,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x40B9",
+      "var_value": 2,
+      "script": "MtPyre_Summit_EventScript_2321EC"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x40B9",
+      "var_value": 2,
+      "script": "MtPyre_Summit_EventScript_2321F8"
+    },
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x40B9",
+      "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/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..e4fb5a2fe
--- /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_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_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..39c8d9f0f
--- /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_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..cc2070e7e
--- /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_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..bfc15c8a0
--- /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_0x40BA",
+      "var_value": 0,
+      "script": "NewMauville_Entrance_EventScript_2372FF"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
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..223faec2d
--- /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_0x40BA",
+      "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/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..378d108e2
--- /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_0x4051",
+      "var_value": 0,
+      "script": "OldaleTown_EventScript_1E903F"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_0x40C7",
+      "var_value": 1,
+      "script": "OldaleTown_EventScript_1E9086"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_0x40C7",
+      "var_value": 1,
+      "script": "OldaleTown_EventScript_1E90A6"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_0x40C7",
+      "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": "OldaleTown_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 15,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "OldaleTown_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 8,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "OldaleTown_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 16,
+      "y": 6,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "OldaleTown_EventScript_271E6A"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index c8a598da9..7431cbf2a 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -16,12 +16,12 @@ OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
 
 OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
 	setobjectxyperm 3, 1, 11
-	setobjectmovementtype 3, 9
+	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 OldaleTown_EventScript_1E8EDE:: @ 81E8EDE
 	setobjectxyperm 2, 13, 14
-	setobjectmovementtype 2, 8
+	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 OldaleTown_EventScript_1E8EEA:: @ 81E8EEA
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..fe0ac7b6a
--- /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..2de7632fd
--- /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..1226dd17f
--- /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..94cbe1627
--- /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_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..7a899e4a9
--- /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/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..1219eabad
--- /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": "PacifidlogTown_EventScript_271E73"
+    },
+    {
+      "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": "PacifidlogTown_EventScript_271E73"
+    }
+  ]
+}
\ No newline at end of file
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..19f592374
--- /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..370b37d73
--- /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_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..578824525
--- /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..2db52fe9b
--- /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..b8c4a0352
--- /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..1f141dec5
--- /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_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..2b6a43ce0
--- /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/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 6a4f82bfa..000000000
--- a/data/maps/PetalburgCity/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity: @ 84824B8
-	.4byte PetalburgCity_Layout
-	.4byte PetalburgCity_MapEvents
-	.4byte gStdScripts_End
-	.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..e62590b81
--- /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_0x4057",
+      "var_value": 0,
+      "script": "PetalburgCity_EventScript_1DC49A"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4057",
+      "var_value": 0,
+      "script": "PetalburgCity_EventScript_1DC4A6"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x4057",
+      "var_value": 0,
+      "script": "PetalburgCity_EventScript_1DC4B2"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x4057",
+      "var_value": 0,
+      "script": "PetalburgCity_EventScript_1DC4BE"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_0x40C9",
+      "var_value": 0,
+      "script": "PetalburgCity_EventScript_1DC691"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x40C9",
+      "var_value": 0,
+      "script": "PetalburgCity_EventScript_1DC6A7"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x40C9",
+      "var_value": 0,
+      "script": "PetalburgCity_EventScript_1DC6BD"
+    },
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x40C9",
+      "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": "PetalburgCity_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 21,
+      "y": 16,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "PetalburgCity_EventScript_271E73"
+    },
+    {
+      "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": "PetalburgCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 27,
+      "y": 12,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "PetalburgCity_EventScript_271E6A"
+    },
+    {
+      "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 137731ae2..f69eb3a3a 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -1,3 +1,8 @@
+PetalburgCity_MapScripts::
+	map_script 3, PetalburgCity_MapScript1_1DC2D7
+	map_script 2, PetalburgCity_MapScript2_1DC31C
+	.byte 0
+
 PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
 	setflag FLAG_VISITED_PETALBURG_CITY
 	compare VAR_0x4057, 0
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..6f133a979
--- /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_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..1345f8d6b
--- /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..cc193445e
--- /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..c811ece3c
--- /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..a82cbb85a
--- /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_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..49f2942b3
--- /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_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..b6a152be2
--- /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/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..9a5f051b3
--- /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_0x4098",
+      "var_value": 0,
+      "script": "PetalburgWoods_EventScript_22DFD7"
+    },
+    {
+      "type": "trigger",
+      "x": 27,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_0x4098",
+      "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/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..98bcc0201
--- /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": "gUnknown_0827741D"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_08277447"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_08277432"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_0827745C"
+    }
+  ],
+  "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..673db80ea
--- /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_0x4060",
+      "var_value": 1,
+      "script": "Route101_EventScript_1EBCDE"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 19,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 1,
+      "script": "Route101_EventScript_1EBCDE"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 2,
+      "script": "Route101_EventScript_1EBD4E"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 2,
+      "script": "Route101_EventScript_1EBD4E"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 16,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 2,
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 2,
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 17,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 2,
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 18,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "var_value": 2,
+      "script": "Route101_EventScript_1EBD64"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x4060",
+      "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/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..e6418c42c
--- /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..516c4ed8f
--- /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/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..733ad4989
--- /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_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..bdd2361e0
--- /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 ba1afc428..17ed47206 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -15,9 +15,9 @@ Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
 
 Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
 	setobjectxyperm 1, 9, 3
-	setobjectmovementtype 1, 50
+	setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
 	setobjectxyperm 2, 9, 6
-	setobjectmovementtype 2, 51
+	setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
 	return
 
 Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67
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..cd00d18e1
--- /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_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..937582aff
--- /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/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..fd86567e9
--- /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..dcb17ed8c
--- /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..daa9dab75
--- /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..b3bd9f507
--- /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_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..e30fcc078
--- /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/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..1891b89f7
--- /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_0x4069",
+      "var_value": 0,
+      "script": "Route110_EventScript_1EF74D"
+    },
+    {
+      "type": "trigger",
+      "x": 34,
+      "y": 56,
+      "elevation": 3,
+      "var": "VAR_0x4069",
+      "var_value": 0,
+      "script": "Route110_EventScript_1EF758"
+    },
+    {
+      "type": "trigger",
+      "x": 35,
+      "y": 56,
+      "elevation": 3,
+      "var": "VAR_0x4069",
+      "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 0455ebb1f..7c98cc603 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -484,8 +484,8 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC
 	call_if_eq Route110_EventScript_1EF998
 	compare VAR_0x8008, 3
 	call_if_eq Route110_EventScript_1EF9A0
-	setobjectmovementtype 28, 10
-	setobjectmovementtype 29, 10
+	setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT
+	setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT
 	removeobject 28
 	addobject 29
 	delay 45
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..119d5b55c
--- /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..c5c63def1
--- /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_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_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..dafcec8a6
--- /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_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..2f85d66c5
--- /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_0x40A5",
+      "var_value": 0,
+      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+    },
+    {
+      "type": "trigger",
+      "x": 5,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x40A5",
+      "var_value": 0,
+      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x40A5",
+      "var_value": 0,
+      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x40A5",
+      "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_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..283e86793
--- /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_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..0c49c00f2
--- /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_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..8a60428d2
--- /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_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..03a953310
--- /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_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..6f995d5e9
--- /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_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..b468e59be
--- /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_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..e21657b67
--- /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_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..023223740
--- /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/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..6e2bdf18a
--- /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..75de7dce7 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -97,7 +97,7 @@ Route111_EventScript_1F0E26:: @ 81F0E26
 	end
 
 Route111_EventScript_1F0E3C:: @ 81F0E3C
-	setmaplayoutindex 392
+	setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER
 	return
 
 Route111_EventScript_1F0E40:: @ 81F0E40
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..d4e77fdda
--- /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_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..d41cc1214
--- /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/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..937719abf
--- /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_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..8552ec139
--- /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 037d7ca05..a430a497e 100644
--- a/data/maps/Route112_CableCarStation/scripts.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -11,7 +11,7 @@ Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9
 
 Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
 	setobjectxyperm 1, 7, 4
-	setobjectmovementtype 1, 9
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
@@ -25,7 +25,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
 	waitmovement 0
 	setvar VAR_0x40A3, 0
 	setobjectxyperm 1, 6, 7
-	setobjectmovementtype 1, 8
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	releaseall
 	end
 
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..7dc18e572
--- /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_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..185461fdb
--- /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/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..75f975eb6
--- /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_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..c3c29bdd9
--- /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_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..48b3ca7f4
--- /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_0x40CC",
+      "var_value": 1,
+      "script": "Route114_FossilManiacsTunnel_EventScript_22AF66"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x40CC",
+      "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 b98fd3321..96d591d2d 100644
--- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
@@ -9,7 +9,7 @@ Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33
 
 Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D
 	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 8
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49
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..5dbe09a09
--- /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/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..58e5a602b
--- /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/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..7e76a9e63
--- /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_0x406F",
+      "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_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..0301a32ee
--- /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/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..ab9aa7b24
--- /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_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..a62485c74
--- /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/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..135e7eb74
--- /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_0x4071",
+      "var_value": 0,
+      "script": "Route118_EventScript_1F3E8E"
+    },
+    {
+      "type": "trigger",
+      "x": 44,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4071",
+      "var_value": 0,
+      "script": "Route118_EventScript_1F3EAE"
+    },
+    {
+      "type": "trigger",
+      "x": 45,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x4071",
+      "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/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..fd6c836b7
--- /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_0x4072",
+      "var_value": 0,
+      "script": "Route119_EventScript_1F4472"
+    },
+    {
+      "type": "trigger",
+      "x": 26,
+      "y": 31,
+      "elevation": 0,
+      "var": "VAR_0x4072",
+      "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_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..fdfd19f78
--- /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..9101e2495
--- /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 8dada27e8..ae0fea259 100644
--- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
@@ -9,7 +9,7 @@ Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C
 
 Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98
 	setobjectxyperm 5, 0, 5
-	setobjectmovementtype 5, 10
+	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4
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..a8a1ebf62
--- /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 e7d2cb03d..bbee65df8 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -12,17 +12,17 @@ Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
 
 Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44
 	setobjectxyperm 5, 1, 6
-	setobjectmovementtype 5, 10
+	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50
 	setobjectxyperm 5, 4, 6
-	setobjectmovementtype 5, 10
+	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C
 	setobjectxyperm 5, 2, 2
-	setobjectmovementtype 5, 7
+	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP
 	return
 
 Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68
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..db93042de
--- /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 5a601678d..cd864e1dc 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -57,7 +57,7 @@ Route120_EventScript_1F54A3:: @ 81F54A3
 	return
 
 Route120_EventScript_1F54C8:: @ 81F54C8
-	setobjectmovementtype 36, 10
+	setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 Route120_MapScript1_1F54CD: @ 81F54CD
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..82b7139a3
--- /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_0x4074",
+      "var_value": 0,
+      "script": "Route121_EventScript_1F5E18"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_0x4074",
+      "var_value": 0,
+      "script": "Route121_EventScript_1F5E18"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x4074",
+      "var_value": 0,
+      "script": "Route121_EventScript_1F5E18"
+    },
+    {
+      "type": "trigger",
+      "x": 25,
+      "y": 8,
+      "elevation": 3,
+      "var": "VAR_0x4074",
+      "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_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..878798477
--- /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/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..d5a99b75c
--- /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_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..47ad26314
--- /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/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..1f3ef4f6c
--- /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_6",
+  "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_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..ed159e565
--- /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/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..55f9b692d
--- /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_6",
+  "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/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..8ccd3c365
--- /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_6",
+  "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/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..06fd540d2
--- /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_6",
+  "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/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..b1d63ef63
--- /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_6",
+  "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/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..310a3e06a
--- /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_6",
+  "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/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..d9797e5cc
--- /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_6",
+  "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..819d9e4f3 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -23,11 +23,11 @@ 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_UNKNOWN_MAP_08417FC4
 	end
 
 Route130_EventScript_1F73B5:: @ 81F73B5
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..f8d56cc35
--- /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_6",
+  "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..700ac25f6 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A
 	end
 
 Route131_EventScript_1F741B:: @ 81F741B
-	setmaplayoutindex 319
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470
 	return
 
 Route131_EventScript_1F741F:: @ 81F741F
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..719863d2b
--- /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_6",
+  "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..36e7380f7
--- /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_6",
+  "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..350db1e05
--- /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_6",
+  "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/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..7d09f0cdc
--- /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_0x405A",
+      "var_value": 1,
+      "script": "RustboroCity_EventScript_1E095A"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 21,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 1,
+      "script": "RustboroCity_EventScript_1E0971"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 22,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 1,
+      "script": "RustboroCity_EventScript_1E0988"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 23,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 1,
+      "script": "RustboroCity_EventScript_1E099F"
+    },
+    {
+      "type": "trigger",
+      "x": 23,
+      "y": 24,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 1,
+      "script": "RustboroCity_EventScript_1E09B6"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 2,
+      "script": "RustboroCity_EventScript_1E0AFE"
+    },
+    {
+      "type": "trigger",
+      "x": 29,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 2,
+      "script": "RustboroCity_EventScript_1E0B0A"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 2,
+      "script": "RustboroCity_EventScript_1E0B16"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 2,
+      "script": "RustboroCity_EventScript_1E0B22"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 4,
+      "script": "RustboroCity_EventScript_1E0C2B"
+    },
+    {
+      "type": "trigger",
+      "x": 31,
+      "y": 10,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 4,
+      "script": "RustboroCity_EventScript_1E0C37"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 4,
+      "script": "RustboroCity_EventScript_1E0C43"
+    },
+    {
+      "type": "trigger",
+      "x": 30,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 4,
+      "script": "RustboroCity_EventScript_1E0C4F"
+    },
+    {
+      "type": "trigger",
+      "x": 12,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 7,
+      "script": "RustboroCity_EventScript_1E0DF3"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 7,
+      "script": "RustboroCity_EventScript_1E0E33"
+    },
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 7,
+      "script": "RustboroCity_EventScript_1E0E73"
+    },
+    {
+      "type": "trigger",
+      "x": 15,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 7,
+      "script": "RustboroCity_EventScript_1E0EB3"
+    },
+    {
+      "type": "trigger",
+      "x": 16,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 7,
+      "script": "RustboroCity_EventScript_1E0EF3"
+    },
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 7,
+      "script": "RustboroCity_EventScript_1E0F33"
+    },
+    {
+      "type": "trigger",
+      "x": 18,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "var_value": 7,
+      "script": "RustboroCity_EventScript_1E0F73"
+    },
+    {
+      "type": "trigger",
+      "x": 19,
+      "y": 53,
+      "elevation": 3,
+      "var": "VAR_0x405A",
+      "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": "RustboroCity_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 38,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "RustboroCity_EventScript_271E73"
+    },
+    {
+      "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": "RustboroCity_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 17,
+      "y": 38,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "RustboroCity_EventScript_271E73"
+    },
+    {
+      "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 7c1e14118..8ffbf8373 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -245,7 +245,7 @@ RustboroCity_EventScript_1E094E:: @ 81E094E
 RustboroCity_EventScript_1E095A:: @ 81E095A
 	lockall
 	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
+	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 0
 	goto RustboroCity_EventScript_1E09CD
 	end
@@ -253,7 +253,7 @@ RustboroCity_EventScript_1E095A:: @ 81E095A
 RustboroCity_EventScript_1E0971:: @ 81E0971
 	lockall
 	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
+	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 1
 	goto RustboroCity_EventScript_1E09CD
 	end
@@ -261,7 +261,7 @@ RustboroCity_EventScript_1E0971:: @ 81E0971
 RustboroCity_EventScript_1E0988:: @ 81E0988
 	lockall
 	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
+	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 2
 	goto RustboroCity_EventScript_1E09CD
 	end
@@ -269,7 +269,7 @@ RustboroCity_EventScript_1E0988:: @ 81E0988
 RustboroCity_EventScript_1E099F:: @ 81E099F
 	lockall
 	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
+	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 3
 	goto RustboroCity_EventScript_1E09CD
 	end
@@ -277,7 +277,7 @@ RustboroCity_EventScript_1E099F:: @ 81E099F
 RustboroCity_EventScript_1E09B6:: @ 81E09B6
 	lockall
 	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
+	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 4
 	goto RustboroCity_EventScript_1E09CD
 	end
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..f2490588a
--- /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..8bb9a2e2f
--- /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 157947c2d..a7a84335b 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
@@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B
 
 RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255
 	setobjectxyperm 2, 14, 2
-	setobjectmovementtype 2, 8
+	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261
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..01da7a938
--- /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_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..91e8e53fc
--- /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 da78ccb4b..9d5fbe58b 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -11,7 +11,7 @@ RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D
 
 RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
 	setobjectxyperm 2, 3, 2
-	setobjectmovementtype 2, 9
+	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
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..d0a4e5615
--- /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..0f2de8d53
--- /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_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..9fab521c7
--- /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..20ed3c9d4
--- /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_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..8ad260511
--- /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..ace68d057
--- /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_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..598429b22
--- /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 1de4f0e36..000000000
--- a/data/maps/RustboroCity_House2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_House2: @ 8483494
-	.4byte RustboroCity_House_Layouts
-	.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..7533e995b
--- /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 c1a0312e3..000000000
--- a/data/maps/RustboroCity_House3/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_House3: @ 8483504
-	.4byte RustboroCity_House_Layouts
-	.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..c11aa89e3
--- /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..714edcd58
--- /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..aabe2785f
--- /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_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..9c63421e3
--- /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_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..fb6944f40
--- /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/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..424dd4789
--- /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/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..c8192aaa8
--- /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/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..1a7b1fde0
--- /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..935c5c33d
--- /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/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..e0202beb9
--- /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..6ce7c4d01
--- /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..910c7cf3c
--- /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..16acff6dd
--- /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..c958a1a94
--- /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_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..d2e3d7140
--- /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..41cce9e80
--- /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..f24aa0eba
--- /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/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..c1f45f1bf
--- /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_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..3976ff46a
--- /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..19b8b0573
--- /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..b7e46a87f
--- /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..02662f017
--- /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..cfdbd64ef
--- /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..f556c2333
--- /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..c2d8b8870
--- /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_0x40A2",
+      "var_value": 0,
+      "script": "SeafloorCavern_Room9_EventScript_234DC9"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
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/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..ee7806e57
--- /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..cdba6e817
--- /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..5dc78c891
--- /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..dfc9c67a8
--- /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..20411331f
--- /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..800149223
--- /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..08ccc8c32
--- /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..f6184cee2
--- /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..309dd3de0
--- /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..0c2162856
--- /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..ca5f00d6a
--- /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..6fe94e6bb
--- /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..7f7dedc1c
--- /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..0be1b06f1
--- /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..7104bf5a2
--- /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..15b39293d
--- /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..a03a38cde
--- /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..484096be1
--- /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..c1015dd9c
--- /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..297834653
--- /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..0cc46d97e
--- /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..9660114af
--- /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..fbc6d6217
--- /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..d91c2f9a3
--- /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/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..477c1c500
--- /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..6e0f4eddb 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
@@ -8,11 +8,11 @@ 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
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..fd2e72680
--- /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..a7c276aa4
--- /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..c54aa1d4f 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -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
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..5c399ed53
--- /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_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..e4ad65f52
--- /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/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..a2cc78b2f
--- /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": "gUnknown_08277374"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_0827737E"
+    }
+  ],
+  "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..2230dad8d 100644
--- a/data/maps/SkyPillar_1F/scripts.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B
 	end
 
 SkyPillar_1F_EventScript_239627:: @ 8239627
-	setmaplayoutindex 433
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54
 	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..fa89f3893 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B
 	end
 
 SkyPillar_2F_EventScript_23964C:: @ 823964C
-	setmaplayoutindex 434
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC
 	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..015d754eb 100644
--- a/data/maps/SkyPillar_3F/scripts.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661
 	end
 
 SkyPillar_3F_EventScript_23966D:: @ 823966D
-	setmaplayoutindex 435
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4
 	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..ccab2453c 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681
 	end
 
 SkyPillar_4F_EventScript_239692:: @ 8239692
-	setmaplayoutindex 436
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C
 	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..b3e3f6605 100644
--- a/data/maps/SkyPillar_5F/scripts.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8
 	return
 
 SkyPillar_5F_EventScript_2396B4:: @ 82396B4
-	setmaplayoutindex 437
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4
 	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_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..dd76c1d32
--- /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_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..0d53a80be
--- /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_0x40D7",
+      "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 c0bc2e4c1..f764ea79c 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -23,8 +23,8 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6
 	end
 
 SkyPillar_Top_EventScript_2396FD:: @ 82396FD
-	setmaplayoutindex 438
-	setobjectmovementtype 1, 8
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 SkyPillar_Top_EventScript_239705:: @ 8239705
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..52f2f6412
--- /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_0x40D2",
+      "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": "SlateportCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 21,
+      "y": 19,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SlateportCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 14,
+      "y": 26,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SlateportCity_EventScript_271E6A"
+    },
+    {
+      "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": "SlateportCity_EventScript_271E6A"
+    },
+    {
+      "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 7b19c84b8..2e7859fba 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -26,13 +26,13 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
 	setobjectxyperm 8, 28, 16
 	setobjectxyperm 1, 29, 16
 	setobjectxyperm 2, 31, 14
-	setobjectmovementtype 11, 8
-	setobjectmovementtype 7, 18
-	setobjectmovementtype 3, 16
-	setobjectmovementtype 6, 7
-	setobjectmovementtype 8, 7
-	setobjectmovementtype 1, 7
-	setobjectmovementtype 2, 9
+	setobjectmovementtype 11, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype 7, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+	setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
@@ -41,12 +41,12 @@ SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
 	compare VAR_0x8004, 30
 	goto_if_eq SlateportCity_EventScript_1DCD06
 	setobjectxyperm 35, 23, 27
-	setobjectmovementtype 35, 10
+	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 SlateportCity_EventScript_1DCD06:: @ 81DCD06
 	setobjectxyperm 35, 22, 27
-	setobjectmovementtype 35, 10
+	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 SlateportCity_MapScript2_1DCD12: @ 81DCD12
@@ -82,7 +82,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	waitmovement 0
 	removeobject 35
 	setobjectxyperm 35, 10, 12
-	setobjectmovementtype 35, 8
+	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
 	clearflag FLAG_SPECIAL_FLAG_0x4000
 	setvar VAR_0x40D2, 2
 	addvar VAR_0x40D1, 1
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..ed9a8866c
--- /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_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..d5e2d5e37
--- /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_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..07af8ad73
--- /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_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..a48b6a82f
--- /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_0x40A0",
+      "var_value": 1,
+      "script": "SlateportCity_Harbor_EventScript_20C9BB"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_0x40A0",
+      "var_value": 1,
+      "script": "SlateportCity_Harbor_EventScript_20C9C7"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_0x40A0",
+      "var_value": 1,
+      "script": "SlateportCity_Harbor_EventScript_20C9D3"
+    },
+    {
+      "type": "trigger",
+      "x": 8,
+      "y": 14,
+      "elevation": 3,
+      "var": "VAR_0x40A0",
+      "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 2f71a2dc9..24e139edf 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -17,7 +17,7 @@ SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5
 SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9
 	savebgm MUS_AQA_0
 	setobjectxyperm 4, 12, 13
-	setobjectmovementtype 4, 9
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT
 	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
 	return
 
@@ -78,7 +78,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
 	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
 	moveobjectoffscreen 4
-	setobjectmovementtype 4, 10
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT
 	releaseall
 	end
 
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..b1eed1027
--- /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_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..24ae6e67d
--- /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..cec96e59f
--- /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..7202fc35a
--- /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_0x40AA",
+      "var_value": 0,
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F"
+    },
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 7,
+      "elevation": 3,
+      "var": "VAR_0x40AA",
+      "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_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..dbb46dbfc
--- /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_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..eecc72248
--- /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_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..e12efc0f0
--- /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_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..e41bee0fd
--- /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_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..8497f4212
--- /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_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..025d97f9a
--- /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..88ca51ff7
--- /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": "SootopolisCity_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 44,
+      "y": 31,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SootopolisCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 45,
+      "y": 31,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SootopolisCity_EventScript_271E73"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 29,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "SootopolisCity_EventScript_271E6A"
+    },
+    {
+      "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 da5caab3f..5e212ddfe 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -70,10 +70,10 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
 	setobjectxyperm 5, 46, 32
 	setobjectxyperm 4, 48, 41
 	setobjectxyperm 8, 45, 43
-	setobjectmovementtype 3, 7
-	setobjectmovementtype 5, 9
-	setobjectmovementtype 4, 9
-	setobjectmovementtype 8, 9
+	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP
+	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_LEFT
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT
+	setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 SootopolisCity_EventScript_1E57B2:: @ 81E57B2
@@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800
 	return
 
 SootopolisCity_EventScript_1E5801:: @ 81E5801
-	setmaplayoutindex 357
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200
 	return
 
 SootopolisCity_EventScript_1E5805:: @ 81E5805
@@ -150,17 +150,17 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871
 
 SootopolisCity_EventScript_1E58AF:: @ 81E58AF
 	setobjectxyperm 18, 31, 33
-	setobjectmovementtype 18, 8
+	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 SootopolisCity_EventScript_1E58BB:: @ 81E58BB
 	setobjectxyperm 18, 32, 33
-	setobjectmovementtype 18, 8
+	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 SootopolisCity_EventScript_1E58C7:: @ 81E58C7
 	setobjectxyperm 18, 30, 33
-	setobjectmovementtype 18, 8
+	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 SootopolisCity_EventScript_1E58D3:: @ 81E58D3
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..6c1e4374d
--- /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_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..663d7db84
--- /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..b5ecf4e41
--- /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_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..ea9d58284
--- /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..765803e8a
--- /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..492aac134
--- /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..24cdafe8b
--- /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..d787c3e67
--- /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_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..de0464682
--- /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..5f8acc9bb
--- /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..bb031b2af
--- /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_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..b57eae35c
--- /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 18b573fbd..252bd1201 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -15,13 +15,13 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
 SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 3, 2
-	setobjectmovementtype 1, 8
-	setmaplayoutindex 441
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
 	setobjectxyperm 1, 2, 2
-	setobjectmovementtype 1, 10
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
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..fcc77a331
--- /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_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..bce2e52bd
--- /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_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..32e27dbdf
--- /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/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..a747a48b8
--- /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_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..6d099763a
--- /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/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..9b5ab9f32
--- /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_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/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..f7511a753
--- /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": "gUnknown_082773F5"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_082773FF"
+    }
+  ],
+  "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_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_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_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_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..731bcf44a
--- /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_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..32f6cee37
--- /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_0x40D6",
+      "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_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..d54779a8e
--- /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/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/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/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/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/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_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_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..5497a7ba3
--- /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_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_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/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..175ec3ad7
--- /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/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc
deleted file mode 100644
index 13ea1b8b9..000000000
--- a/data/maps/UnknownMap_25_29/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-UnknownMap_25_29_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
deleted file mode 100644
index a3777fd80..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 UnknownMap_25_29_MapEvents
-	.4byte UnknownMap_25_29_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_29/map.json b/data/maps/UnknownMap_25_29/map.json
new file mode 100644
index 000000000..8f7ac0226
--- /dev/null
+++ b/data/maps/UnknownMap_25_29/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_29",
+  "name": "UnknownMap_25_29",
+  "layout": "LAYOUT_UNKNOWN_MAP_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/UnknownMap_25_29/scripts.inc
index 575e7a898..8b1378917 100644
--- a/data/maps/UnknownMap_25_29/scripts.inc
+++ b/data/maps/UnknownMap_25_29/scripts.inc
@@ -1 +1 @@
-UnknownMap_25_29_MapScripts:: @ 823B781
+
diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc
deleted file mode 100644
index 0e221e240..000000000
--- a/data/maps/UnknownMap_25_30/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-UnknownMap_25_30_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
deleted file mode 100644
index a4184b85d..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 UnknownMap_25_30_MapEvents
-	.4byte UnknownMap_25_30_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_30/map.json b/data/maps/UnknownMap_25_30/map.json
new file mode 100644
index 000000000..5f321e6b5
--- /dev/null
+++ b/data/maps/UnknownMap_25_30/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_30",
+  "name": "UnknownMap_25_30",
+  "layout": "LAYOUT_UNKNOWN_MAP_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/UnknownMap_25_30/scripts.inc
index dbc73166d..8b1378917 100644
--- a/data/maps/UnknownMap_25_30/scripts.inc
+++ b/data/maps/UnknownMap_25_30/scripts.inc
@@ -1 +1 @@
-UnknownMap_25_30_MapScripts:: @ 823B781
+
diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc
deleted file mode 100644
index 99e450de5..000000000
--- a/data/maps/UnknownMap_25_31/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-UnknownMap_25_31_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
deleted file mode 100644
index ec4838bd5..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 UnknownMap_25_31_MapEvents
-	.4byte UnknownMap_25_31_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_31/map.json b/data/maps/UnknownMap_25_31/map.json
new file mode 100644
index 000000000..f7b06ac42
--- /dev/null
+++ b/data/maps/UnknownMap_25_31/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_31",
+  "name": "UnknownMap_25_31",
+  "layout": "LAYOUT_UNKNOWN_MAP_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/UnknownMap_25_31/scripts.inc
index cacda4d1f..8b1378917 100644
--- a/data/maps/UnknownMap_25_31/scripts.inc
+++ b/data/maps/UnknownMap_25_31/scripts.inc
@@ -1 +1 @@
-UnknownMap_25_31_MapScripts:: @ 823B781
+
diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc
deleted file mode 100644
index c48eedb17..000000000
--- a/data/maps/UnknownMap_25_32/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-UnknownMap_25_32_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
deleted file mode 100644
index 39e982093..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 UnknownMap_25_32_MapEvents
-	.4byte UnknownMap_25_32_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_32/map.json b/data/maps/UnknownMap_25_32/map.json
new file mode 100644
index 000000000..c963d0129
--- /dev/null
+++ b/data/maps/UnknownMap_25_32/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_32",
+  "name": "UnknownMap_25_32",
+  "layout": "LAYOUT_UNKNOWN_MAP_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/UnknownMap_25_32/scripts.inc
index e34f454e7..8b1378917 100644
--- a/data/maps/UnknownMap_25_32/scripts.inc
+++ b/data/maps/UnknownMap_25_32/scripts.inc
@@ -1 +1 @@
-UnknownMap_25_32_MapScripts:: @ 823B781
+
diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc
deleted file mode 100644
index 14f4571d2..000000000
--- a/data/maps/UnknownMap_25_33/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-UnknownMap_25_33_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
deleted file mode 100644
index 87f8b0c1e..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 UnknownMap_25_33_MapEvents
-	.4byte UnknownMap_25_33_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_33/map.json b/data/maps/UnknownMap_25_33/map.json
new file mode 100644
index 000000000..441f767b6
--- /dev/null
+++ b/data/maps/UnknownMap_25_33/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_33",
+  "name": "UnknownMap_25_33",
+  "layout": "LAYOUT_UNKNOWN_MAP_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/UnknownMap_25_33/scripts.inc
index 086d2d32c..8b1378917 100644
--- a/data/maps/UnknownMap_25_33/scripts.inc
+++ b/data/maps/UnknownMap_25_33/scripts.inc
@@ -1 +1 @@
-UnknownMap_25_33_MapScripts:: @ 823B781
+
diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc
deleted file mode 100644
index 975f08470..000000000
--- a/data/maps/UnknownMap_25_34/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-UnknownMap_25_34_MapEvents:: @ 853A064
-	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
deleted file mode 100644
index c053c5e19..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 UnknownMap_25_34_MapEvents
-	.4byte UnknownMap_25_34_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/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json
new file mode 100644
index 000000000..7bdf1d226
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNKNOWN_MAP_25_34",
+  "name": "UnknownMap_25_34",
+  "layout": "LAYOUT_UNKNOWN_MAP_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/UnknownMap_25_34/scripts.inc
index fe88972df..8b1378917 100644
--- a/data/maps/UnknownMap_25_34/scripts.inc
+++ b/data/maps/UnknownMap_25_34/scripts.inc
@@ -1,458 +1 @@
-UnknownMap_25_34_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
-	.byte 0
-
-LinkContestRoom1_MapScript1_23B79B: @ 823B79B
-	special sub_80F8B94
-	end
-
-LinkContestRoom1_MapScript1_23B79F: @ 823B79F
-	call LinkContestRoom1_EventScript_23B7AF
-	setvar VAR_TEMP_0, 1
-	call LinkContestRoom1_EventScript_23B842
-	end
-
-LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
-	call LinkContestRoom1_EventScript_27A133
-	special ScriptGetMultiplayerId
-	compare VAR_RESULT, 0
-	call_if_eq LinkContestRoom1_EventScript_23B7EF
-	compare VAR_RESULT, 1
-	call_if_eq LinkContestRoom1_EventScript_23B7F3
-	compare VAR_RESULT, 2
-	call_if_eq LinkContestRoom1_EventScript_23B7F7
-	compare VAR_RESULT, 3
-	call_if_eq LinkContestRoom1_EventScript_23B7FB
-	compare VAR_RESULT, 4
-	call_if_eq LinkContestRoom1_EventScript_23B7FF
-	return
-
-LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF
-	savebgm MUS_TEST1
-	return
-
-LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3
-	savebgm MUS_TEST2
-	return
-
-LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7
-	savebgm MUS_TEST3
-	return
-
-LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB
-	savebgm MUS_TEST4
-	return
-
-LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF
-	savebgm MUS_CONTEST0
-	return
-
-LinkContestRoom1_MapScript1_23B803: @ 823B803
-	compare VAR_TEMP_9, 1
-	call_if_eq LinkContestRoom1_EventScript_23B80F
-	end
-
-LinkContestRoom1_EventScript_23B80F:: @ 823B80F
-	call LinkContestRoom1_EventScript_23BB2B
-	return
-
-LinkContestRoom1_MapScript2_23B815: @ 823B815
-	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829
-	.2byte 0
-
-LinkContestRoom1_MapScript2_23B81F: @ 823B81F
-	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834
-	.2byte 0
-
-LinkContestRoom1_EventScript_23B829:: @ 823B829
-	call LinkContestRoom1_EventScript_279F97
-	call LinkContestRoom1_EventScript_23BE44
-	end
-
-LinkContestRoom1_EventScript_23B834:: @ 823B834
-	special sub_80F8B94
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
-	call LinkContestRoom1_EventScript_23BB2B
-	end
-
-LinkContestRoom1_EventScript_23B842:: @ 823B842
-	call LinkContestRoom1_EventScript_23B8F8
-	call LinkContestRoom1_EventScript_23B858
-	compare VAR_TEMP_0, 8
-	goto_if_lt LinkContestRoom1_EventScript_23B842
-	return
-
-LinkContestRoom1_EventScript_23B858:: @ 823B858
-	switch VAR_TEMP_0
-	case 1, LinkContestRoom1_EventScript_23B8AB
-	case 2, LinkContestRoom1_EventScript_23B8B6
-	case 3, LinkContestRoom1_EventScript_23B8C1
-	case 4, LinkContestRoom1_EventScript_23B8CC
-	case 5, LinkContestRoom1_EventScript_23B8D7
-	case 6, LinkContestRoom1_EventScript_23B8E2
-	case 7, LinkContestRoom1_EventScript_23B8ED
-	end
-
-LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB
-	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6
-	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1
-	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC
-	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7
-	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2
-	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
-	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
-	setvar VAR_RESULT, 32
-	special ScriptRandom
-	addvar VAR_RESULT, 1
-	switch VAR_RESULT
-	case 1, LinkContestRoom1_EventScript_23BA6B
-	case 2, LinkContestRoom1_EventScript_23BA71
-	case 3, LinkContestRoom1_EventScript_23BA77
-	case 4, LinkContestRoom1_EventScript_23BA7D
-	case 5, LinkContestRoom1_EventScript_23BA83
-	case 6, LinkContestRoom1_EventScript_23BA89
-	case 7, LinkContestRoom1_EventScript_23BA8F
-	case 8, LinkContestRoom1_EventScript_23BA95
-	case 9, LinkContestRoom1_EventScript_23BA9B
-	case 10, LinkContestRoom1_EventScript_23BAA1
-	case 11, LinkContestRoom1_EventScript_23BAA7
-	case 12, LinkContestRoom1_EventScript_23BAAD
-	case 13, LinkContestRoom1_EventScript_23BAB3
-	case 14, LinkContestRoom1_EventScript_23BAB9
-	case 15, LinkContestRoom1_EventScript_23BABF
-	case 16, LinkContestRoom1_EventScript_23BAC5
-	case 17, LinkContestRoom1_EventScript_23BACB
-	case 18, LinkContestRoom1_EventScript_23BAD1
-	case 19, LinkContestRoom1_EventScript_23BAD7
-	case 20, LinkContestRoom1_EventScript_23BADD
-	case 21, LinkContestRoom1_EventScript_23BAE3
-	case 22, LinkContestRoom1_EventScript_23BAE9
-	case 23, LinkContestRoom1_EventScript_23BAEF
-	case 24, LinkContestRoom1_EventScript_23BAF5
-	case 25, LinkContestRoom1_EventScript_23BAFB
-	case 26, LinkContestRoom1_EventScript_23BB01
-	case 27, LinkContestRoom1_EventScript_23BB07
-	case 28, LinkContestRoom1_EventScript_23BB0D
-	case 29, LinkContestRoom1_EventScript_23BB13
-	case 30, LinkContestRoom1_EventScript_23BB19
-	case 31, LinkContestRoom1_EventScript_23BB1F
-	case 32, LinkContestRoom1_EventScript_23BB25
-	end
-
-LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
-	setvar VAR_TEMP_1, 5
-	return
-
-LinkContestRoom1_EventScript_23BA71:: @ 823BA71
-	setvar VAR_TEMP_1, 6
-	return
-
-LinkContestRoom1_EventScript_23BA77:: @ 823BA77
-	setvar VAR_TEMP_1, 7
-	return
-
-LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
-	setvar VAR_TEMP_1, 8
-	return
-
-LinkContestRoom1_EventScript_23BA83:: @ 823BA83
-	setvar VAR_TEMP_1, 10
-	return
-
-LinkContestRoom1_EventScript_23BA89:: @ 823BA89
-	setvar VAR_TEMP_1, 11
-	return
-
-LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
-	setvar VAR_TEMP_1, 12
-	return
-
-LinkContestRoom1_EventScript_23BA95:: @ 823BA95
-	setvar VAR_TEMP_1, 13
-	return
-
-LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
-	setvar VAR_TEMP_1, 14
-	return
-
-LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
-	setvar VAR_TEMP_1, 15
-	return
-
-LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
-	setvar VAR_TEMP_1, 17
-	return
-
-LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
-	setvar VAR_TEMP_1, 18
-	return
-
-LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
-	setvar VAR_TEMP_1, 19
-	return
-
-LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
-	setvar VAR_TEMP_1, 20
-	return
-
-LinkContestRoom1_EventScript_23BABF:: @ 823BABF
-	setvar VAR_TEMP_1, 21
-	return
-
-LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
-	setvar VAR_TEMP_1, 22
-	return
-
-LinkContestRoom1_EventScript_23BACB:: @ 823BACB
-	setvar VAR_TEMP_1, 25
-	return
-
-LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
-	setvar VAR_TEMP_1, 26
-	return
-
-LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
-	setvar VAR_TEMP_1, 27
-	return
-
-LinkContestRoom1_EventScript_23BADD:: @ 823BADD
-	setvar VAR_TEMP_1, 47
-	return
-
-LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
-	setvar VAR_TEMP_1, 30
-	return
-
-LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
-	setvar VAR_TEMP_1, 31
-	return
-
-LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
-	setvar VAR_TEMP_1, 32
-	return
-
-LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
-	setvar VAR_TEMP_1, 33
-	return
-
-LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
-	setvar VAR_TEMP_1, 34
-	return
-
-LinkContestRoom1_EventScript_23BB01:: @ 823BB01
-	setvar VAR_TEMP_1, 35
-	return
-
-LinkContestRoom1_EventScript_23BB07:: @ 823BB07
-	setvar VAR_TEMP_1, 36
-	return
-
-LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
-	setvar VAR_TEMP_1, 37
-	return
-
-LinkContestRoom1_EventScript_23BB13:: @ 823BB13
-	setvar VAR_TEMP_1, 38
-	return
-
-LinkContestRoom1_EventScript_23BB19:: @ 823BB19
-	setvar VAR_TEMP_1, 44
-	return
-
-LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
-	setvar VAR_TEMP_1, 45
-	return
-
-LinkContestRoom1_EventScript_23BB25:: @ 823BB25
-	setvar VAR_TEMP_1, 46
-	return
-
-LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_23BD86
-	switch VAR_0x4088
-	case 1, LinkContestRoom1_EventScript_23BB78
-	case 2, LinkContestRoom1_EventScript_23BB8B
-	case 3, LinkContestRoom1_EventScript_23BBE6
-	case 4, LinkContestRoom1_EventScript_23BC92
-	case 5, LinkContestRoom1_EventScript_23BC92
-	return
-
-LinkContestRoom1_EventScript_23BB78:: @ 823BB78
-	createvobject 5, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 46, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 12, 13, 12, 8, 3, 3
-	createvobject 47, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 48, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 22, 20, 3, 2, 3, 1
-	createvobject 23, 20, 6, 2, 3, 1
-	createvobject 34, 20, 7, 2, 3, 1
-	createvobject 46, 24, 8, 2, 3, 1
-	createvobject 48, 24, 11, 2, 3, 1
-	createvobject 11, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 17, 27, 5, 9, 3, 2
-	createvobject 40, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_23BC92:: @ 823BC92
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	createvobject 49, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 48, 27, 5, 9, 3, 2
-	createvobject 40, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_23BD86:: @ 823BD86
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_23BE44:: @ 823BE44
-	special sub_80F9154
-	switch VAR_0x4088
-	case 1, LinkContestRoom1_EventScript_23BE84
-	case 2, LinkContestRoom1_EventScript_23BE8E
-	case 3, LinkContestRoom1_EventScript_23BE98
-	case 4, LinkContestRoom1_EventScript_23BEA2
-	case 5, LinkContestRoom1_EventScript_23BEAC
-	return
-
-LinkContestRoom1_EventScript_23BE84:: @ 823BE84
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE98:: @ 823BE98
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
-	waitstate
-	end
-
-LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
-	checkplayergender
-	compare VAR_RESULT, MALE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE
-	compare VAR_RESULT, FEMALE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
-	return
 
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..06e6cc959
--- /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": "VerdanturfTown_EventScript_271E6A"
+    },
+    {
+      "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": "VerdanturfTown_EventScript_271E73"
+    },
+    {
+      "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": "VerdanturfTown_EventScript_271E6A"
+    },
+    {
+      "type": "sign",
+      "x": 18,
+      "y": 3,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "VerdanturfTown_EventScript_271E73"
+    },
+    {
+      "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_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..e08187b61
--- /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_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..2e3b9aed1
--- /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_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..2f5190f61
--- /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_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..3a6785136
--- /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..cf6170e8a
--- /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..8ea0e1bf5
--- /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..1c1145565
--- /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_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..ad2df3d36
--- /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_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..10a3996fd
--- /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..b45981587
--- /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_0x40C3",
+      "var_value": 0,
+      "script": "VictoryRoad_1F_EventScript_235DAF"
+    },
+    {
+      "type": "trigger",
+      "x": 3,
+      "y": 23,
+      "elevation": 4,
+      "var": "VAR_0x40C3",
+      "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 20f36868e..2d1c63027 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -11,12 +11,12 @@ VictoryRoad_1F_MapScript1_235D80: @ 8235D80
 
 VictoryRoad_1F_EventScript_235D97:: @ 8235D97
 	setobjectxyperm 4, 2, 24
-	setobjectmovementtype 4, 8
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3
 	setobjectxyperm 4, 3, 24
-	setobjectmovementtype 4, 8
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	return
 
 VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF
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..523eddc06
--- /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..2667155a9
--- /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..e20d1adf2
--- /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",
+    "UnknownMap_25_29",
+    "UnknownMap_25_30",
+    "UnknownMap_25_31",
+    "UnknownMap_25_32",
+    "UnknownMap_25_33",
+    "UnknownMap_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/text/contest_strings.inc b/data/text/contest_strings.inc
index 737e4b862..1406ba3cb 100644
--- a/data/text/contest_strings.inc
+++ b/data/text/contest_strings.inc
@@ -665,19 +665,19 @@ gText_0827E817:: @ 827E817
 	.string "{STR_VAR_1}'s\n"
 	.string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E837:: @ 827E837
+gText_Contest_Shyness:: @ 827E837
 	.string "shyness$"
 
-gText_0827E83F:: @ 827E83F
+gText_Contest_Anxiety:: @ 827E83F
 	.string "anxiety$"
 
-gText_0827E847:: @ 827E847
+gText_Contest_Laziness:: @ 827E847
 	.string "laziness$"
 
-gText_0827E850:: @ 827E850
+gText_Contest_Hesitancy:: @ 827E850
 	.string "hesitancy$"
 
-gText_0827E85A:: @ 827E85A
+gText_Contest_Fear:: @ 827E85A
 	.string "fear$"
 
 gText_0827E85F:: @ 827E85F
diff --git a/graphics/misc/sunny_day/0.pal b/graphics/misc/sunny_day/0.pal
deleted file mode 100644
index 54f6a9ac0..000000000
--- a/graphics/misc/sunny_day/0.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 8
-24 8 8
-41 8 8
-57 8 8
-74 8 8
-90 8 8
-106 8 8
-139 0 0
-156 0 0
-172 0 0
-189 0 0
-205 0 0
-222 0 0
-238 0 0
-255 0 0
-255 24 24
-8 24 8
-24 24 8
-41 24 8
-57 24 8
-74 24 8
-90 24 8
-106 24 8
-139 16 0
-156 16 0
-172 16 0
-189 16 0
-205 16 0
-222 16 0
-238 16 0
-255 16 0
-255 32 24
-8 41 8
-24 41 8
-41 41 8
-57 41 8
-74 41 8
-90 41 8
-106 41 8
-139 41 0
-156 41 0
-172 32 0
-189 32 0
-205 32 0
-222 32 0
-238 32 0
-255 32 0
-255 49 24
-8 57 8
-24 57 8
-41 57 8
-57 57 8
-74 57 8
-90 57 8
-106 57 8
-139 57 0
-156 57 0
-172 57 0
-189 49 0
-205 57 0
-222 57 0
-238 49 0
-255 49 0
-255 65 24
-8 74 8
-24 74 8
-41 74 8
-57 74 8
-74 74 8
-90 74 8
-106 74 8
-139 74 0
-156 74 0
-172 74 0
-189 74 0
-205 74 0
-222 65 0
-238 74 0
-255 74 0
-255 82 24
-8 90 8
-24 90 8
-41 90 8
-57 90 8
-74 90 8
-90 90 8
-106 90 8
-139 98 0
-156 98 0
-172 90 0
-189 90 0
-205 90 0
-222 90 0
-238 90 0
-255 90 0
-255 98 24
-8 106 8
-24 106 8
-41 106 8
-57 106 8
-74 106 8
-90 106 8
-106 106 8
-139 115 0
-156 115 0
-172 115 0
-189 106 0
-205 106 0
-222 115 0
-238 106 0
-255 106 0
-255 115 24
-0 139 0
-24 139 0
-41 139 0
-57 139 0
-82 139 0
-98 139 0
-115 139 0
-139 139 0
-156 131 0
-172 131 0
-189 131 0
-205 123 0
-222 123 0
-238 131 0
-255 131 0
-255 131 24
-0 156 0
-24 156 0
-41 156 0
-57 156 0
-74 156 0
-98 156 0
-115 156 0
-139 156 0
-156 156 0
-172 148 0
-189 148 0
-205 148 0
-222 148 0
-238 148 0
-255 148 0
-255 148 24
-0 172 0
-16 172 0
-41 172 0
-57 172 0
-74 172 0
-98 172 0
-115 172 0
-131 172 0
-156 172 0
-172 172 0
-189 164 0
-205 164 0
-222 164 0
-238 164 0
-255 164 0
-255 164 24
-0 189 0
-16 189 0
-41 189 0
-57 189 0
-74 189 0
-90 189 0
-115 189 0
-131 189 0
-148 189 0
-172 189 0
-189 189 0
-205 189 0
-222 180 0
-238 180 0
-255 180 0
-255 180 24
-0 205 0
-16 205 0
-32 205 0
-57 205 0
-74 205 0
-98 205 0
-115 205 0
-131 205 0
-148 205 0
-172 205 0
-189 205 0
-205 205 0
-222 205 0
-238 197 0
-255 205 0
-255 189 24
-0 222 0
-16 222 0
-32 222 0
-57 222 0
-74 222 0
-90 222 0
-115 222 0
-131 222 0
-148 222 0
-164 222 0
-189 222 0
-205 222 0
-222 222 0
-238 222 0
-255 222 0
-255 205 24
-0 238 0
-16 238 0
-41 238 0
-57 238 0
-74 238 0
-90 238 0
-115 238 0
-131 238 0
-148 238 0
-172 238 0
-189 238 0
-205 238 0
-222 238 0
-238 238 0
-255 238 0
-255 222 24
-0 255 0
-16 255 0
-41 255 0
-57 255 0
-74 255 0
-90 255 0
-106 255 0
-131 255 0
-148 255 0
-164 255 0
-180 255 0
-205 255 0
-222 255 0
-238 255 0
-255 255 0
-255 238 24
-24 255 24
-41 255 24
-57 255 24
-74 255 24
-90 255 24
-106 255 24
-115 255 24
-131 255 24
-148 255 24
-164 255 24
-180 255 24
-197 255 24
-213 255 24
-230 255 24
-246 255 24
-255 255 24
diff --git a/graphics/misc/sunny_day/1.pal b/graphics/misc/sunny_day/1.pal
deleted file mode 100644
index 23fd665ef..000000000
--- a/graphics/misc/sunny_day/1.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 24
-24 8 24
-41 8 24
-57 8 24
-74 8 24
-90 8 24
-106 8 24
-139 0 24
-156 0 24
-172 0 16
-189 0 16
-205 0 16
-222 0 16
-238 0 16
-255 0 16
-255 24 41
-8 24 24
-24 24 24
-41 24 24
-57 24 24
-74 24 24
-90 24 24
-115 16 16
-131 16 16
-156 16 16
-172 16 16
-189 16 16
-205 16 16
-222 16 16
-238 16 16
-246 32 32
-255 41 41
-8 41 24
-24 41 24
-41 41 24
-57 41 24
-74 41 24
-90 41 24
-115 41 16
-131 41 16
-156 41 16
-172 32 16
-189 32 16
-205 32 16
-222 32 16
-238 32 16
-246 49 32
-255 57 41
-8 57 24
-24 57 24
-41 57 24
-57 57 24
-74 57 24
-90 57 24
-115 57 16
-131 57 16
-156 57 16
-172 57 16
-189 57 16
-205 49 16
-222 49 16
-238 49 16
-246 65 32
-255 74 41
-8 74 24
-24 74 24
-41 74 24
-57 74 24
-74 74 24
-90 74 24
-115 74 16
-131 74 16
-156 74 16
-172 74 16
-189 74 16
-205 65 16
-222 74 16
-238 74 16
-246 82 32
-255 82 41
-8 90 24
-24 90 24
-41 90 24
-57 90 24
-74 90 24
-90 90 24
-115 98 16
-131 98 16
-156 98 16
-172 90 16
-189 90 16
-205 90 16
-222 90 16
-238 90 16
-246 98 32
-255 106 41
-8 106 24
-16 115 16
-41 115 16
-57 115 16
-82 115 16
-98 115 16
-115 115 16
-131 115 16
-156 115 16
-172 115 16
-189 115 16
-205 115 16
-222 106 16
-238 106 16
-246 115 32
-255 115 41
-0 139 16
-16 131 16
-41 131 16
-57 131 16
-74 131 16
-98 131 16
-115 131 16
-131 131 16
-156 131 16
-172 131 16
-189 131 16
-205 123 16
-222 123 16
-238 131 16
-246 131 32
-255 131 41
-0 156 16
-16 156 16
-41 156 16
-57 156 16
-74 156 16
-98 156 16
-115 156 16
-131 156 16
-156 156 16
-172 148 16
-189 148 16
-205 148 16
-222 148 16
-238 139 16
-246 148 32
-255 148 41
-0 172 16
-16 172 16
-41 172 16
-57 172 16
-74 172 16
-90 172 16
-115 172 16
-131 172 16
-156 172 16
-172 172 16
-189 172 16
-205 164 16
-222 164 16
-238 164 16
-246 164 32
-255 164 41
-0 189 16
-16 189 16
-32 189 16
-57 189 16
-74 189 16
-90 189 16
-115 189 16
-131 189 16
-148 189 16
-172 189 16
-189 189 16
-205 180 16
-222 180 16
-238 180 16
-246 180 32
-255 180 41
-0 205 16
-16 205 16
-32 205 16
-57 205 16
-74 205 16
-90 205 16
-115 205 16
-131 205 16
-148 205 16
-172 205 16
-189 205 16
-205 205 16
-222 205 16
-238 197 16
-246 197 32
-255 197 41
-0 222 16
-16 222 16
-32 222 16
-57 222 16
-74 222 16
-90 222 16
-115 222 16
-131 222 16
-148 222 16
-172 222 16
-189 222 16
-205 222 16
-222 222 16
-238 222 16
-246 213 32
-255 213 41
-0 238 16
-16 238 16
-32 238 16
-57 238 16
-74 238 16
-90 238 16
-106 238 16
-131 238 16
-148 238 16
-164 238 16
-180 238 16
-205 238 16
-222 238 16
-238 238 16
-246 230 32
-255 230 41
-0 255 16
-32 246 32
-49 246 32
-65 246 32
-82 246 32
-98 246 32
-115 246 32
-131 246 32
-156 246 32
-164 246 32
-189 246 32
-197 246 32
-213 246 32
-238 246 32
-246 246 32
-255 238 41
-24 255 32
-41 255 41
-57 255 41
-74 255 41
-90 255 41
-106 255 41
-123 255 41
-139 255 41
-148 255 41
-164 255 41
-180 255 41
-197 255 41
-213 255 41
-230 255 41
-246 255 41
-255 255 41
diff --git a/graphics/misc/sunny_day/10.pal b/graphics/misc/sunny_day/10.pal
deleted file mode 100644
index cf290d63b..000000000
--- a/graphics/misc/sunny_day/10.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 189
-16 0 189
-32 0 189
-49 0 189
-74 0 189
-90 0 189
-106 0 189
-131 0 189
-148 0 189
-164 0 189
-189 0 189
-205 0 189
-222 0 189
-238 0 189
-255 0 180
-255 24 180
-0 16 189
-16 16 189
-32 16 189
-57 16 189
-74 16 189
-90 16 189
-115 16 189
-131 16 189
-148 16 189
-172 16 189
-189 16 189
-205 16 189
-222 16 189
-238 16 180
-246 32 189
-255 41 180
-0 41 189
-16 32 189
-32 32 189
-49 32 189
-74 32 189
-90 32 189
-115 32 189
-131 32 189
-148 32 189
-164 32 189
-189 32 189
-205 32 189
-222 32 180
-230 49 180
-246 49 180
-255 57 180
-0 57 189
-16 57 189
-32 57 189
-49 49 189
-74 49 189
-90 49 189
-106 49 189
-131 49 189
-148 49 189
-164 49 189
-189 49 189
-205 57 189
-213 65 180
-230 65 180
-246 65 180
-255 74 180
-0 74 189
-16 74 189
-32 74 189
-49 74 189
-74 74 180
-90 74 180
-106 74 180
-131 74 180
-148 74 180
-164 74 180
-180 74 180
-197 82 180
-213 82 180
-230 82 180
-246 82 180
-255 90 180
-0 90 189
-16 90 189
-32 90 189
-49 90 189
-74 90 180
-98 98 180
-115 98 180
-131 98 180
-148 98 180
-164 98 180
-180 98 180
-197 98 180
-213 98 180
-230 98 180
-246 106 189
-255 106 180
-0 115 189
-16 115 189
-32 115 189
-49 106 189
-74 106 180
-98 115 180
-115 115 180
-131 115 180
-148 115 180
-164 115 180
-180 115 180
-197 115 180
-213 115 180
-230 123 189
-246 123 180
-255 123 189
-0 131 189
-16 131 189
-32 131 189
-49 131 189
-74 131 180
-98 131 180
-115 131 180
-139 139 180
-148 139 180
-164 139 180
-180 139 180
-197 131 180
-213 139 180
-230 139 180
-246 139 189
-255 139 189
-0 148 189
-16 148 189
-32 148 189
-49 148 189
-74 148 180
-98 148 180
-115 148 180
-139 148 180
-156 156 180
-164 156 180
-180 156 180
-197 148 180
-213 156 180
-230 156 180
-246 156 189
-255 172 197
-0 172 189
-16 172 189
-32 172 189
-49 172 189
-74 164 180
-98 164 180
-115 164 180
-139 164 180
-156 164 180
-164 164 180
-180 164 180
-197 172 180
-213 172 189
-230 172 189
-246 180 197
-255 189 197
-0 189 189
-16 189 189
-32 189 189
-49 189 189
-74 180 180
-98 180 180
-115 180 180
-139 180 180
-156 180 180
-164 180 180
-180 180 180
-197 189 189
-213 189 189
-238 197 197
-246 197 197
-255 205 205
-0 205 189
-16 205 180
-32 205 180
-57 205 180
-82 197 180
-98 197 180
-115 197 180
-131 197 180
-148 197 180
-172 197 180
-189 197 189
-197 197 189
-213 197 189
-238 205 197
-246 213 197
-255 213 205
-0 222 180
-16 222 180
-32 222 180
-65 213 180
-82 213 180
-98 213 180
-115 213 180
-139 213 180
-156 213 180
-172 213 180
-189 213 189
-197 213 189
-213 213 189
-238 222 197
-246 222 197
-255 222 205
-0 238 180
-16 238 180
-49 230 180
-65 230 180
-82 230 180
-98 230 180
-123 230 180
-139 230 180
-156 230 180
-172 230 189
-197 238 197
-205 238 197
-222 238 197
-238 238 197
-246 238 197
-255 238 205
-0 255 180
-32 246 180
-49 246 180
-65 246 180
-82 246 180
-106 246 180
-123 246 180
-139 246 180
-156 246 180
-180 246 197
-197 246 197
-213 246 197
-222 246 197
-238 246 197
-246 246 197
-255 246 205
-24 255 180
-41 255 180
-57 255 180
-74 255 180
-90 255 180
-106 255 180
-123 255 180
-139 255 189
-172 255 197
-189 255 197
-205 255 205
-213 255 205
-230 255 205
-238 255 205
-246 255 205
-255 255 205
diff --git a/graphics/misc/sunny_day/11.pal b/graphics/misc/sunny_day/11.pal
deleted file mode 100644
index 2536a3423..000000000
--- a/graphics/misc/sunny_day/11.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 205
-16 0 205
-32 0 205
-57 0 205
-74 0 205
-90 0 205
-106 0 205
-123 0 205
-148 0 205
-164 0 205
-189 0 205
-205 0 205
-222 0 205
-238 0 205
-255 0 205
-255 24 197
-0 16 205
-16 16 205
-32 16 205
-49 16 205
-65 16 205
-90 16 205
-115 16 205
-123 16 205
-148 16 205
-164 16 205
-180 16 205
-205 16 205
-222 16 205
-238 16 205
-246 32 197
-255 41 197
-0 32 205
-16 32 205
-32 32 205
-49 32 205
-74 32 205
-90 32 205
-106 32 205
-131 32 205
-148 32 205
-164 32 205
-180 32 205
-205 32 205
-222 32 205
-230 49 197
-246 49 197
-255 57 197
-0 57 205
-16 57 205
-32 57 205
-57 57 205
-74 57 205
-90 57 205
-106 57 205
-131 57 205
-148 57 205
-164 57 205
-180 57 205
-205 57 205
-213 65 205
-230 65 197
-246 65 197
-255 74 197
-0 74 205
-16 74 205
-32 74 205
-57 74 205
-82 82 197
-98 82 197
-115 82 197
-131 82 197
-148 82 197
-164 82 197
-180 82 197
-197 82 197
-213 82 197
-230 82 197
-246 82 197
-255 90 197
-0 98 205
-16 90 205
-32 90 205
-57 90 205
-82 98 197
-98 98 197
-115 98 197
-131 98 197
-148 98 197
-164 98 197
-180 98 197
-197 98 197
-213 98 197
-230 98 197
-246 106 197
-255 106 197
-0 115 205
-16 115 205
-32 115 205
-57 106 205
-82 115 197
-98 115 197
-115 115 197
-131 115 197
-148 115 197
-164 115 197
-180 115 197
-197 115 197
-213 115 197
-230 123 197
-246 123 197
-255 123 205
-0 131 205
-16 131 205
-32 131 205
-57 131 205
-82 131 197
-98 131 197
-115 131 197
-131 131 197
-148 131 197
-164 131 197
-180 131 197
-197 131 197
-213 139 197
-230 139 197
-246 139 205
-255 139 197
-0 148 205
-16 148 205
-32 148 205
-57 148 205
-82 148 197
-98 148 197
-115 148 197
-131 148 197
-148 148 197
-164 148 197
-180 148 197
-197 148 197
-213 156 197
-230 156 197
-246 156 197
-255 172 205
-0 172 205
-16 172 205
-32 164 205
-57 164 205
-82 164 197
-98 164 197
-115 164 197
-131 164 197
-148 164 197
-172 172 197
-180 172 197
-197 172 197
-213 172 197
-230 172 197
-246 180 205
-255 189 213
-0 189 205
-16 189 205
-32 189 205
-57 189 205
-82 180 197
-98 180 197
-115 180 197
-131 180 197
-148 180 197
-172 180 197
-189 189 197
-197 189 197
-213 189 197
-238 197 205
-246 197 213
-255 205 213
-0 205 205
-16 205 205
-32 205 205
-57 205 205
-82 197 197
-98 197 197
-115 197 197
-131 197 197
-148 197 197
-172 197 197
-189 197 197
-197 197 197
-222 205 205
-238 213 213
-246 213 213
-255 222 222
-0 222 205
-16 222 205
-32 222 197
-65 213 197
-82 213 197
-98 213 197
-115 213 197
-139 213 197
-156 213 197
-172 213 197
-189 213 197
-205 222 205
-222 222 205
-238 222 213
-246 222 213
-255 230 222
-0 238 197
-16 238 197
-49 230 197
-65 230 197
-82 230 197
-98 230 197
-123 230 197
-139 230 197
-156 230 197
-172 230 197
-197 238 205
-213 238 213
-222 238 213
-238 238 213
-246 238 213
-255 238 222
-0 255 205
-32 246 197
-49 246 197
-65 246 197
-82 246 197
-106 246 197
-123 246 197
-139 246 197
-156 246 197
-180 246 205
-197 246 213
-213 246 213
-230 246 213
-238 246 213
-246 246 213
-255 246 222
-24 255 189
-41 255 197
-57 255 197
-74 255 197
-90 255 197
-106 255 197
-123 255 197
-139 255 197
-172 255 205
-189 255 213
-205 255 213
-222 255 222
-230 255 222
-238 255 222
-246 255 222
-255 255 222
diff --git a/graphics/misc/sunny_day/12.pal b/graphics/misc/sunny_day/12.pal
deleted file mode 100644
index 2b54d05cb..000000000
--- a/graphics/misc/sunny_day/12.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 222
-16 0 222
-32 0 222
-57 0 222
-65 0 222
-90 0 222
-115 0 222
-123 0 222
-148 0 222
-164 0 222
-180 0 222
-205 0 222
-222 0 222
-238 0 222
-255 0 222
-255 24 213
-0 16 222
-16 16 222
-32 16 222
-49 16 222
-74 16 222
-90 16 222
-106 16 222
-123 16 222
-148 16 222
-164 16 222
-180 16 222
-205 16 222
-222 16 222
-238 16 222
-246 32 213
-255 41 213
-0 32 222
-16 32 222
-32 32 222
-49 32 222
-65 32 222
-90 32 222
-106 32 222
-131 32 222
-139 32 222
-164 32 222
-180 32 222
-197 32 222
-222 32 222
-230 49 213
-246 49 213
-255 57 213
-0 57 222
-16 57 222
-32 57 222
-65 65 213
-82 65 213
-98 65 213
-115 65 213
-131 65 213
-148 65 213
-164 65 213
-180 65 213
-197 65 213
-213 65 213
-230 65 213
-246 65 213
-255 74 213
-0 74 222
-16 74 222
-32 74 222
-65 82 213
-82 82 213
-98 82 213
-115 82 213
-131 82 213
-148 82 213
-164 82 213
-180 82 213
-197 82 213
-213 82 213
-230 82 213
-246 82 213
-255 90 213
-0 90 222
-16 90 222
-32 90 222
-65 98 213
-82 98 213
-98 98 213
-115 98 213
-131 98 213
-148 98 213
-164 98 213
-180 98 213
-197 98 213
-213 98 213
-230 98 213
-246 106 213
-255 106 213
-0 115 222
-16 115 222
-32 106 222
-65 115 213
-82 115 213
-98 115 213
-115 115 213
-131 115 213
-148 115 213
-164 115 213
-180 115 213
-197 115 213
-213 115 213
-230 123 213
-246 123 213
-255 123 213
-0 131 222
-16 131 222
-32 131 222
-65 131 213
-82 131 213
-98 139 213
-115 131 213
-139 139 213
-148 139 213
-164 139 213
-180 139 213
-197 139 213
-213 139 213
-230 139 213
-246 139 213
-255 139 213
-0 148 222
-16 148 222
-32 148 222
-65 148 213
-82 148 213
-98 148 213
-115 148 213
-139 156 213
-156 156 213
-172 156 213
-180 156 213
-197 156 213
-213 156 213
-230 156 213
-246 156 213
-255 172 222
-0 164 222
-16 172 222
-32 164 222
-65 164 213
-82 164 213
-98 164 213
-115 164 213
-139 164 213
-156 172 213
-172 172 213
-180 172 213
-197 172 213
-213 172 213
-230 172 213
-246 180 222
-255 189 222
-0 189 222
-16 189 222
-32 180 222
-65 180 213
-82 180 213
-98 180 213
-115 180 213
-139 180 213
-156 180 213
-172 189 213
-189 189 213
-197 189 213
-213 189 213
-238 197 222
-246 197 222
-255 205 230
-0 205 222
-16 205 222
-32 205 222
-65 205 213
-82 197 213
-98 197 213
-115 197 213
-139 197 213
-156 197 213
-172 197 213
-189 197 213
-205 205 222
-222 205 222
-238 213 222
-246 213 230
-255 222 230
-0 222 222
-16 222 222
-32 222 222
-65 213 213
-82 213 213
-98 213 213
-115 213 213
-139 213 213
-156 213 213
-172 213 213
-189 213 213
-205 222 222
-222 222 222
-238 230 230
-246 230 230
-255 238 238
-0 238 222
-16 238 222
-49 230 213
-65 230 213
-82 230 213
-98 230 213
-123 230 213
-139 230 213
-156 230 213
-172 230 213
-197 238 222
-213 238 222
-230 238 230
-238 238 230
-246 238 230
-255 246 238
-0 255 222
-32 246 213
-49 246 213
-65 246 213
-82 246 213
-106 246 213
-123 246 213
-139 246 213
-156 246 213
-180 246 222
-197 246 222
-213 246 222
-230 246 230
-238 246 230
-246 246 230
-255 255 238
-24 255 205
-41 255 213
-57 255 205
-74 255 213
-90 255 213
-106 255 213
-123 255 213
-139 255 213
-172 255 222
-189 255 222
-205 255 222
-222 255 230
-238 255 238
-246 255 238
-255 255 238
-255 255 238
diff --git a/graphics/misc/sunny_day/13.pal b/graphics/misc/sunny_day/13.pal
deleted file mode 100644
index caf0a7545..000000000
--- a/graphics/misc/sunny_day/13.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 238
-16 0 238
-32 0 238
-49 0 238
-74 0 238
-90 0 238
-106 0 238
-131 0 238
-148 0 238
-164 0 238
-180 0 238
-197 0 238
-222 0 238
-238 0 238
-255 0 238
-255 24 230
-0 16 238
-16 16 238
-32 16 238
-49 16 238
-74 16 238
-90 16 238
-106 16 238
-131 16 238
-139 16 238
-164 16 238
-180 16 238
-197 16 238
-222 16 238
-238 16 238
-246 32 238
-255 41 230
-0 41 238
-16 32 238
-49 49 230
-65 49 230
-82 49 230
-98 49 230
-115 49 230
-131 49 230
-148 49 230
-164 49 230
-180 49 230
-197 49 230
-213 49 230
-230 49 230
-246 49 230
-255 57 230
-0 57 238
-16 57 238
-49 65 230
-65 65 230
-82 65 230
-98 65 230
-115 65 230
-131 65 230
-148 65 230
-164 65 230
-180 65 230
-197 65 230
-213 65 230
-230 65 230
-246 65 238
-255 74 230
-0 74 238
-16 74 238
-49 82 230
-65 82 230
-82 82 230
-98 82 230
-115 82 230
-131 82 230
-148 82 230
-164 82 230
-180 82 230
-197 82 230
-213 82 230
-230 82 230
-246 82 230
-255 90 230
-0 90 238
-16 90 238
-49 106 230
-65 98 230
-82 98 230
-98 98 230
-115 98 230
-131 98 230
-148 98 230
-164 98 230
-180 98 230
-197 98 230
-213 98 230
-230 98 230
-246 106 230
-255 106 230
-0 115 238
-16 106 238
-49 115 230
-65 115 230
-82 123 230
-98 123 230
-123 123 230
-131 123 230
-148 123 230
-164 123 230
-180 123 230
-197 123 230
-213 123 230
-230 123 230
-246 123 230
-255 123 230
-0 131 238
-16 131 238
-49 139 230
-65 131 230
-82 131 230
-98 131 230
-123 139 230
-139 139 230
-148 139 230
-164 139 230
-180 139 230
-197 139 230
-213 139 230
-230 139 230
-246 139 230
-255 139 230
-0 148 238
-16 148 238
-49 148 230
-65 148 230
-82 148 230
-98 156 230
-123 156 230
-139 156 230
-156 156 230
-164 156 230
-180 156 230
-197 156 230
-213 156 230
-230 156 230
-246 156 230
-255 172 230
-0 172 238
-16 164 238
-49 164 230
-65 164 230
-82 172 230
-98 164 230
-123 164 230
-139 164 230
-156 172 230
-172 172 230
-189 172 230
-197 172 230
-213 172 230
-230 172 230
-246 180 238
-255 189 238
-0 189 238
-16 180 238
-49 180 230
-65 180 230
-82 180 230
-98 180 230
-123 189 230
-139 180 230
-156 180 230
-172 189 230
-197 197 238
-205 197 238
-222 197 238
-238 197 238
-246 197 238
-255 205 238
-0 205 238
-16 205 238
-49 197 230
-65 197 230
-82 197 230
-98 197 230
-123 197 230
-139 197 230
-156 197 230
-172 197 230
-197 205 238
-213 213 238
-222 213 238
-238 213 238
-246 213 238
-255 222 238
-0 222 238
-16 222 238
-49 213 230
-65 213 230
-82 213 230
-98 213 230
-123 213 230
-139 213 230
-156 213 230
-172 213 230
-197 222 238
-213 222 238
-230 230 238
-238 230 238
-246 230 238
-255 238 246
-0 238 238
-16 238 238
-49 230 230
-65 230 230
-82 230 230
-98 230 230
-123 230 230
-139 230 230
-156 230 230
-172 230 230
-197 238 238
-213 238 238
-230 238 238
-238 238 238
-255 246 246
-255 255 255
-0 255 238
-32 246 230
-49 246 230
-65 246 230
-82 246 230
-106 246 230
-123 246 230
-139 246 230
-156 246 230
-180 246 230
-197 246 238
-213 246 238
-230 246 238
-246 255 246
-255 255 246
-255 255 255
-24 255 222
-41 255 230
-57 255 222
-74 255 222
-90 255 222
-106 255 230
-123 255 230
-139 255 230
-172 255 230
-189 255 230
-205 255 238
-222 255 238
-238 255 246
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/14.pal b/graphics/misc/sunny_day/14.pal
deleted file mode 100644
index c8d66ade5..000000000
--- a/graphics/misc/sunny_day/14.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 255
-16 0 255
-32 0 255
-49 0 255
-74 0 255
-90 0 255
-106 0 255
-131 0 255
-148 0 255
-164 0 255
-180 0 255
-205 0 255
-222 0 255
-238 0 255
-255 0 255
-255 24 246
-0 16 255
-32 32 246
-49 32 246
-65 32 246
-82 32 246
-98 32 246
-115 32 246
-131 32 246
-148 32 246
-164 32 246
-180 32 246
-197 32 246
-213 32 246
-230 32 246
-246 32 246
-255 41 246
-0 41 255
-32 49 246
-49 49 246
-65 49 246
-82 49 246
-98 49 246
-115 49 246
-131 49 246
-148 49 246
-164 49 246
-180 49 246
-197 49 246
-213 49 246
-230 49 246
-246 49 246
-255 57 246
-0 57 255
-32 65 246
-49 65 246
-65 65 246
-82 65 246
-98 65 246
-115 65 246
-131 65 246
-148 65 246
-164 65 246
-180 65 246
-197 65 246
-213 65 246
-230 65 246
-246 65 246
-255 74 246
-0 74 255
-32 82 246
-49 82 246
-65 90 246
-82 82 246
-98 82 246
-115 82 246
-131 82 246
-148 82 246
-164 82 246
-180 82 246
-197 82 246
-213 82 246
-230 82 246
-246 82 246
-255 90 246
-0 90 255
-32 98 246
-49 98 246
-65 98 246
-82 98 246
-106 106 246
-115 106 246
-131 106 246
-148 106 246
-164 106 246
-180 106 246
-197 106 246
-213 106 246
-230 106 246
-246 106 246
-255 106 246
-0 106 255
-32 115 246
-49 115 246
-65 123 246
-82 115 246
-106 123 246
-123 123 246
-131 123 246
-156 123 246
-164 123 246
-180 123 246
-197 123 246
-213 123 246
-230 123 246
-246 123 246
-255 123 246
-0 131 255
-32 131 246
-49 131 246
-65 131 246
-82 131 246
-106 139 246
-123 139 246
-139 139 246
-156 139 246
-172 139 246
-180 139 246
-197 139 246
-213 139 246
-230 139 246
-246 139 246
-255 139 246
-0 148 255
-32 156 246
-49 148 246
-65 156 246
-82 148 246
-106 148 246
-123 156 246
-139 156 246
-156 156 246
-172 156 246
-180 156 246
-197 156 246
-213 156 246
-230 156 246
-246 156 246
-255 172 246
-0 164 255
-32 164 246
-49 164 246
-65 164 246
-82 164 246
-106 172 246
-123 172 246
-139 172 246
-156 172 246
-180 180 246
-197 180 246
-205 180 246
-222 180 246
-230 180 246
-246 180 246
-255 189 246
-0 180 255
-32 189 246
-49 180 246
-65 180 246
-82 180 246
-106 189 246
-123 180 246
-139 189 246
-156 189 246
-180 197 246
-197 197 246
-213 197 246
-222 197 246
-238 197 246
-246 197 246
-255 205 246
-0 205 255
-32 197 246
-49 197 246
-65 197 246
-82 197 246
-106 197 246
-123 197 246
-139 205 246
-156 197 246
-180 205 246
-197 213 246
-213 213 246
-222 213 246
-238 213 246
-246 213 246
-255 222 246
-0 222 255
-32 213 246
-49 213 246
-65 213 246
-82 213 246
-106 213 246
-123 213 246
-139 213 246
-156 213 246
-180 222 246
-197 222 246
-213 230 246
-230 230 246
-238 230 246
-246 230 246
-255 238 255
-0 238 255
-32 238 246
-49 230 246
-65 238 246
-82 230 246
-106 230 246
-123 230 246
-139 230 246
-156 230 246
-180 238 246
-197 238 246
-213 238 246
-230 238 246
-246 246 255
-255 246 255
-255 255 255
-0 255 255
-32 246 246
-49 246 246
-65 246 246
-82 246 246
-106 246 246
-123 246 246
-139 246 246
-156 246 246
-180 246 246
-197 246 246
-213 246 246
-230 246 246
-246 255 255
-255 255 255
-255 255 255
-24 255 238
-41 255 238
-57 255 238
-74 255 238
-90 255 238
-106 255 238
-123 255 246
-139 255 246
-172 255 246
-189 255 246
-205 255 246
-222 255 246
-238 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/15.pal b/graphics/misc/sunny_day/15.pal
deleted file mode 100644
index c14fb84de..000000000
--- a/graphics/misc/sunny_day/15.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-24 24 255
-32 24 255
-49 24 255
-65 24 255
-82 24 255
-98 24 255
-115 24 255
-131 24 255
-148 24 255
-164 24 255
-180 24 255
-189 24 255
-205 24 255
-222 24 255
-238 24 255
-255 24 255
-24 41 255
-41 41 255
-57 41 255
-74 41 255
-82 41 255
-106 41 255
-115 41 255
-131 41 255
-148 41 255
-164 41 255
-180 41 255
-197 41 255
-213 41 255
-230 41 255
-238 41 255
-255 41 255
-24 57 255
-41 57 255
-57 57 255
-74 57 255
-90 57 255
-98 57 255
-115 57 255
-131 57 255
-148 57 255
-164 57 255
-180 57 255
-197 57 255
-205 57 255
-222 57 255
-238 57 255
-255 57 255
-24 74 255
-41 74 255
-57 74 255
-74 74 255
-90 74 255
-106 74 255
-123 74 255
-131 74 255
-148 74 255
-164 74 255
-180 74 255
-197 74 255
-213 74 255
-222 74 255
-238 74 255
-255 74 255
-24 90 255
-41 90 255
-57 90 255
-74 90 255
-90 90 255
-106 90 255
-123 90 255
-139 90 255
-148 90 255
-164 90 255
-180 90 255
-197 90 255
-213 90 255
-222 90 255
-238 90 255
-255 90 255
-24 106 255
-41 106 255
-57 106 255
-74 106 255
-90 106 255
-106 106 255
-123 106 255
-139 106 255
-148 106 255
-164 106 255
-180 106 255
-197 106 255
-213 106 255
-230 106 255
-238 106 255
-255 106 255
-24 115 255
-41 123 255
-57 123 255
-74 123 255
-90 123 255
-106 123 255
-123 123 255
-139 123 255
-156 123 255
-172 123 255
-180 123 255
-197 123 255
-213 123 255
-230 123 255
-246 123 255
-255 123 255
-24 131 255
-41 139 255
-57 131 255
-74 139 255
-90 139 255
-106 139 255
-123 139 255
-139 139 255
-156 139 255
-172 139 255
-189 139 255
-197 139 255
-213 139 255
-230 139 255
-246 139 255
-255 139 255
-24 148 255
-41 148 255
-57 156 255
-74 156 255
-90 156 255
-106 156 255
-123 156 255
-139 156 255
-172 172 255
-180 172 255
-197 172 255
-205 172 255
-222 172 255
-230 172 255
-246 172 255
-255 172 255
-24 164 255
-41 164 255
-57 172 255
-74 164 255
-90 172 255
-106 172 255
-123 172 255
-139 172 255
-172 180 255
-189 189 255
-197 189 255
-213 189 255
-222 189 255
-230 189 255
-246 189 255
-255 189 255
-24 180 255
-41 180 255
-57 180 255
-74 180 255
-90 180 255
-106 180 255
-123 189 255
-139 189 255
-172 197 255
-189 197 255
-205 205 255
-213 205 255
-222 205 255
-238 205 255
-246 205 255
-255 205 255
-24 197 255
-41 197 255
-57 197 255
-74 197 255
-90 197 255
-106 197 255
-123 205 255
-139 197 255
-172 205 255
-189 213 255
-205 213 255
-222 222 255
-230 222 255
-238 222 255
-246 222 255
-255 222 255
-24 213 255
-41 213 255
-57 213 255
-74 213 255
-90 213 255
-106 213 255
-123 213 255
-139 213 255
-172 222 255
-189 222 255
-205 230 255
-222 230 255
-238 238 255
-246 238 255
-255 238 255
-255 238 255
-24 230 255
-41 230 255
-57 230 255
-74 230 255
-90 230 255
-106 230 255
-123 230 255
-139 230 255
-172 230 255
-189 238 255
-205 238 255
-222 238 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-24 246 255
-41 246 255
-57 246 255
-74 246 255
-90 246 255
-106 246 255
-123 246 255
-139 246 255
-172 246 255
-189 246 255
-205 246 255
-222 246 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-24 255 255
-41 255 255
-57 255 255
-74 255 255
-90 255 255
-106 255 255
-123 255 255
-139 255 255
-172 255 255
-189 255 255
-205 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/16.pal b/graphics/misc/sunny_day/16.pal
deleted file mode 100644
index 6807ab175..000000000
--- a/graphics/misc/sunny_day/16.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 8
-24 8 8
-41 8 8
-57 8 8
-74 8 8
-90 8 8
-106 8 8
-148 0 0
-164 0 0
-180 0 0
-205 0 0
-222 0 0
-238 0 0
-255 0 0
-255 8 8
-255 32 32
-8 24 8
-24 24 8
-41 24 8
-57 24 8
-74 24 8
-90 24 8
-106 24 8
-148 16 0
-164 16 0
-180 16 0
-205 16 0
-222 16 0
-238 8 0
-255 16 0
-255 24 8
-255 49 32
-8 41 8
-24 41 8
-41 41 8
-57 41 8
-74 41 8
-90 41 8
-106 41 8
-148 41 0
-164 41 0
-180 41 0
-205 32 0
-222 32 0
-238 32 0
-255 32 0
-255 41 8
-255 57 32
-8 57 8
-24 57 8
-41 57 8
-57 57 8
-74 57 8
-90 57 8
-106 57 8
-148 57 0
-164 57 0
-180 57 0
-205 57 0
-222 57 0
-238 57 0
-255 49 0
-255 57 8
-255 74 32
-8 74 8
-24 74 8
-41 74 8
-57 74 8
-74 74 8
-90 74 8
-106 74 8
-148 82 0
-164 82 0
-180 82 0
-205 74 0
-222 74 0
-238 74 0
-255 74 0
-255 82 8
-255 90 32
-8 90 8
-24 90 8
-41 90 8
-57 90 8
-74 90 8
-90 90 8
-106 90 8
-148 106 0
-164 98 0
-180 98 0
-205 98 0
-222 98 0
-238 90 0
-255 90 0
-255 98 8
-255 106 32
-8 106 8
-24 106 8
-41 106 8
-57 106 8
-74 106 8
-90 106 8
-106 106 8
-148 123 0
-164 123 0
-180 115 0
-205 115 0
-222 115 0
-238 115 0
-255 115 0
-255 115 8
-255 123 32
-0 148 0
-24 148 0
-41 148 0
-65 148 0
-90 148 0
-106 148 0
-131 148 0
-148 148 0
-164 148 0
-180 139 0
-205 139 0
-222 131 0
-238 131 0
-255 131 0
-255 131 8
-255 139 32
-0 164 0
-24 164 0
-41 164 0
-65 164 0
-82 164 0
-106 164 0
-123 164 0
-148 164 0
-164 164 0
-180 164 0
-205 156 0
-222 156 0
-238 156 0
-255 148 0
-255 148 8
-255 148 32
-0 180 0
-16 180 0
-41 180 0
-57 180 0
-82 180 0
-106 180 0
-123 180 0
-139 180 0
-164 180 0
-180 180 0
-205 180 0
-222 172 0
-238 172 0
-255 172 0
-255 164 8
-255 164 32
-0 205 0
-16 205 0
-41 205 0
-57 205 0
-82 205 0
-98 205 0
-123 205 0
-139 205 0
-164 205 0
-180 205 0
-205 205 0
-222 197 0
-238 189 0
-255 189 0
-255 180 8
-255 180 32
-0 222 0
-16 222 0
-41 222 0
-57 222 0
-82 222 0
-98 222 0
-115 222 0
-139 222 0
-156 222 0
-180 222 0
-197 222 0
-222 222 0
-238 213 0
-255 213 0
-255 205 8
-255 197 32
-0 238 0
-16 238 0
-32 238 0
-57 238 0
-74 238 0
-98 238 0
-115 238 0
-139 238 0
-156 238 0
-172 238 0
-197 238 0
-213 238 0
-238 238 0
-255 230 0
-255 222 8
-255 213 32
-0 255 0
-16 255 0
-41 255 0
-57 255 0
-74 255 0
-98 255 0
-115 255 0
-139 255 0
-156 255 0
-172 255 0
-197 255 0
-213 255 0
-238 255 0
-255 255 0
-255 238 8
-255 222 32
-8 255 8
-24 255 8
-49 255 8
-65 255 8
-82 255 8
-98 255 8
-115 255 8
-131 255 8
-156 255 8
-172 255 8
-189 255 8
-205 255 8
-222 255 8
-238 255 8
-255 255 8
-255 238 32
-32 255 32
-49 255 32
-65 255 32
-82 255 32
-98 255 32
-106 255 32
-123 255 32
-139 255 32
-156 255 32
-172 255 32
-180 255 32
-197 255 32
-213 255 32
-230 255 32
-246 255 32
-255 255 32
diff --git a/graphics/misc/sunny_day/17.pal b/graphics/misc/sunny_day/17.pal
deleted file mode 100644
index da3846209..000000000
--- a/graphics/misc/sunny_day/17.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 24
-24 8 24
-41 8 24
-57 8 24
-74 8 24
-90 8 24
-106 8 24
-148 0 24
-164 0 24
-180 0 16
-205 0 16
-222 0 16
-238 0 16
-255 0 16
-255 8 24
-255 32 49
-8 24 24
-24 24 24
-41 24 24
-57 24 24
-74 24 24
-90 24 24
-131 24 24
-148 16 16
-164 16 16
-180 16 16
-197 16 16
-222 16 16
-238 16 16
-246 24 24
-255 41 41
-255 49 49
-8 41 24
-24 41 24
-41 41 24
-57 41 24
-74 41 24
-90 41 24
-131 41 24
-148 41 16
-164 41 16
-180 41 16
-197 32 16
-222 32 16
-238 32 16
-246 41 24
-255 57 41
-255 65 49
-8 57 24
-24 57 24
-41 57 24
-57 57 24
-74 57 24
-90 57 24
-131 57 24
-148 57 16
-164 57 16
-180 57 16
-197 57 16
-222 49 16
-238 49 16
-246 57 24
-255 74 41
-255 82 49
-8 74 24
-24 74 24
-41 74 24
-57 74 24
-74 74 24
-90 74 24
-131 82 24
-148 82 16
-164 82 16
-180 74 16
-197 74 16
-222 74 16
-238 74 16
-246 82 24
-255 90 41
-255 90 49
-8 90 24
-24 90 24
-41 90 24
-57 90 24
-74 90 24
-90 90 24
-131 106 24
-148 98 16
-164 98 16
-180 98 16
-197 98 16
-222 90 16
-238 90 16
-246 90 24
-255 106 41
-255 106 49
-8 106 24
-24 131 24
-41 131 24
-65 131 24
-82 131 24
-106 131 24
-131 131 24
-148 123 16
-164 123 16
-180 115 16
-197 115 16
-222 115 16
-238 115 16
-246 115 24
-255 115 41
-255 123 49
-0 148 16
-16 148 16
-41 148 16
-57 148 16
-82 148 16
-106 148 16
-123 148 16
-148 148 16
-164 139 16
-180 139 16
-197 139 16
-222 131 16
-238 131 16
-246 131 24
-255 139 41
-255 139 49
-0 164 16
-16 164 16
-41 164 16
-65 164 16
-82 164 16
-106 164 16
-123 164 16
-148 164 16
-164 164 16
-180 156 16
-197 156 16
-222 156 16
-238 148 16
-246 148 24
-255 156 41
-255 156 49
-0 180 16
-16 180 16
-41 180 16
-57 180 16
-82 180 16
-98 180 16
-123 180 16
-139 180 16
-164 180 16
-180 180 16
-197 180 16
-222 172 16
-238 172 16
-246 164 24
-255 164 41
-255 172 49
-0 205 16
-16 197 16
-32 197 16
-57 197 16
-74 197 16
-98 197 16
-123 197 16
-139 197 16
-164 197 16
-180 197 16
-197 197 16
-222 197 16
-238 189 16
-246 189 24
-255 189 41
-255 180 49
-0 222 16
-16 222 16
-32 222 16
-57 222 16
-74 222 16
-98 222 16
-115 222 16
-139 222 16
-156 222 16
-180 222 16
-197 222 16
-222 222 16
-238 213 16
-246 205 24
-255 197 41
-255 197 49
-0 238 8
-16 238 16
-32 238 16
-57 238 16
-74 238 16
-98 238 16
-115 238 16
-139 238 16
-156 238 16
-180 238 16
-197 238 16
-213 238 16
-238 238 16
-246 222 24
-255 213 41
-255 213 49
-0 255 16
-24 246 24
-41 246 24
-57 246 24
-82 246 24
-98 246 24
-115 246 24
-131 246 24
-148 246 24
-172 246 24
-189 246 24
-205 246 24
-222 246 24
-246 246 24
-255 238 41
-255 230 49
-8 255 24
-41 255 41
-57 255 41
-74 255 41
-90 255 41
-106 255 41
-123 255 41
-139 255 41
-156 255 41
-172 255 41
-189 255 41
-205 255 41
-222 255 41
-238 255 41
-255 255 41
-255 238 49
-32 255 49
-49 255 49
-65 255 49
-82 255 49
-98 255 49
-115 255 49
-131 255 49
-139 255 49
-156 255 49
-172 255 49
-189 255 49
-197 255 49
-213 255 49
-230 255 49
-246 255 49
-255 255 49
diff --git a/graphics/misc/sunny_day/18.pal b/graphics/misc/sunny_day/18.pal
deleted file mode 100644
index 6e6b05b99..000000000
--- a/graphics/misc/sunny_day/18.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 41
-24 8 41
-41 8 41
-57 8 41
-74 8 41
-90 8 41
-106 8 41
-148 0 41
-164 0 41
-180 0 41
-205 0 41
-222 0 41
-238 0 32
-255 0 41
-255 8 49
-255 32 65
-8 24 41
-24 24 41
-41 24 41
-57 24 41
-74 24 41
-90 24 41
-131 24 41
-148 16 41
-164 16 41
-180 16 41
-197 16 32
-222 16 32
-238 16 32
-246 24 41
-255 41 57
-255 49 65
-8 41 41
-24 41 41
-41 41 41
-57 41 41
-74 41 41
-106 41 41
-123 41 41
-148 41 41
-164 32 32
-180 32 32
-197 32 32
-213 32 32
-222 41 41
-238 57 57
-255 57 57
-255 65 65
-8 57 41
-24 57 41
-41 57 41
-57 57 41
-74 57 41
-106 65 41
-123 57 41
-148 57 41
-164 57 32
-180 57 32
-197 57 32
-213 49 32
-222 57 41
-238 74 57
-255 74 57
-255 82 65
-8 74 41
-24 74 41
-41 74 41
-57 74 41
-74 74 41
-106 82 41
-123 82 41
-148 82 41
-164 74 32
-180 74 32
-197 74 32
-213 74 32
-222 74 41
-238 90 57
-255 90 57
-255 98 65
-8 90 41
-24 90 41
-41 106 41
-65 106 41
-82 106 41
-106 106 41
-123 106 41
-148 98 41
-164 98 32
-180 98 32
-197 98 32
-213 90 32
-222 90 41
-238 106 57
-255 106 57
-255 106 65
-8 106 41
-24 131 41
-41 123 41
-57 123 41
-82 123 41
-106 123 41
-123 123 41
-148 123 41
-164 115 32
-180 115 32
-197 115 32
-213 115 32
-222 115 41
-238 123 57
-255 123 57
-255 123 65
-0 148 41
-16 148 41
-41 148 41
-57 148 41
-82 148 41
-98 148 41
-123 148 41
-148 148 41
-164 139 32
-180 139 32
-197 131 32
-213 131 32
-222 131 41
-238 139 57
-255 139 57
-255 139 65
-0 164 41
-16 164 41
-32 164 32
-57 164 32
-82 164 32
-98 164 32
-123 164 32
-139 164 32
-164 164 32
-180 156 32
-197 156 32
-213 148 32
-222 148 41
-238 156 57
-255 156 57
-255 156 65
-0 180 41
-16 180 41
-32 180 32
-57 180 32
-82 180 32
-98 180 32
-123 180 32
-139 180 32
-164 180 32
-180 180 32
-197 172 32
-213 172 32
-222 164 41
-238 164 57
-255 164 57
-255 172 65
-0 205 32
-16 197 32
-32 197 32
-57 197 32
-74 197 32
-98 197 32
-115 197 32
-139 197 32
-156 197 32
-180 197 32
-197 197 32
-213 197 32
-222 180 41
-238 189 57
-255 180 57
-255 180 65
-0 222 32
-16 222 32
-32 213 32
-57 213 32
-74 213 32
-98 213 32
-115 213 32
-139 213 32
-156 213 32
-172 213 32
-197 213 32
-213 213 32
-222 205 41
-238 197 57
-255 205 57
-255 197 65
-0 238 32
-16 238 32
-41 222 41
-57 222 41
-82 222 41
-98 222 41
-115 222 41
-131 222 41
-148 222 41
-172 222 41
-189 222 41
-205 222 41
-222 222 41
-238 222 57
-255 213 57
-255 213 65
-0 255 32
-24 246 41
-57 238 57
-74 238 57
-90 238 57
-106 238 57
-123 238 57
-139 238 57
-156 238 57
-172 238 57
-189 238 57
-205 238 57
-222 238 57
-238 238 57
-255 230 57
-255 230 65
-8 255 41
-41 255 57
-57 255 57
-74 255 57
-90 255 57
-106 255 57
-123 255 57
-139 255 57
-156 255 57
-172 255 57
-189 255 57
-205 255 57
-222 255 57
-238 255 57
-255 255 57
-255 246 65
-32 255 57
-49 255 65
-65 255 65
-82 255 65
-98 255 65
-115 255 65
-131 255 65
-139 255 65
-156 255 65
-172 255 65
-189 255 65
-205 255 65
-213 255 65
-230 255 65
-246 255 65
-255 255 65
diff --git a/graphics/misc/sunny_day/19.pal b/graphics/misc/sunny_day/19.pal
deleted file mode 100644
index e03cc0253..000000000
--- a/graphics/misc/sunny_day/19.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 57
-24 8 57
-41 8 57
-57 8 57
-74 8 57
-90 8 57
-106 8 57
-148 0 65
-164 0 65
-180 0 57
-205 0 57
-222 0 57
-238 0 57
-255 0 57
-255 8 65
-255 32 82
-8 24 57
-24 24 57
-41 24 57
-57 24 57
-74 24 57
-90 24 57
-131 24 65
-148 16 57
-164 16 65
-180 16 57
-197 16 57
-222 16 57
-238 16 57
-246 24 57
-255 41 74
-255 49 82
-8 41 57
-24 41 57
-41 41 57
-57 41 57
-74 41 57
-106 41 65
-123 41 57
-148 41 57
-164 32 57
-180 32 57
-197 32 57
-213 32 57
-222 41 57
-238 57 74
-255 57 74
-255 65 82
-8 57 57
-24 57 57
-41 57 57
-57 57 57
-82 65 65
-106 57 57
-123 57 57
-139 57 57
-156 57 57
-180 57 57
-197 49 49
-205 57 57
-222 74 74
-238 74 74
-255 74 74
-255 82 82
-8 74 57
-24 74 57
-41 74 57
-65 82 65
-82 82 65
-106 82 57
-123 82 57
-139 82 57
-156 74 57
-180 74 57
-197 74 49
-205 74 57
-222 90 74
-238 90 74
-255 90 74
-255 98 82
-8 90 57
-24 90 57
-41 106 65
-57 106 57
-82 106 57
-106 106 57
-123 98 57
-139 98 57
-156 98 57
-180 90 57
-197 90 49
-205 98 57
-222 106 74
-238 106 74
-255 106 74
-255 115 82
-8 106 57
-24 131 57
-41 123 57
-57 123 57
-82 123 57
-98 123 57
-123 123 57
-139 123 57
-156 115 57
-180 115 57
-197 115 49
-205 115 57
-222 123 74
-238 123 74
-255 123 74
-255 131 82
-0 148 57
-16 148 57
-41 148 57
-57 139 57
-82 139 57
-98 139 57
-123 139 57
-139 139 57
-156 139 57
-180 131 57
-197 131 49
-205 131 57
-222 139 74
-238 139 74
-255 139 74
-255 139 82
-0 164 57
-16 164 57
-32 164 57
-57 156 57
-74 156 57
-98 156 57
-115 156 57
-139 156 57
-156 156 57
-180 156 57
-197 156 49
-205 148 57
-222 156 74
-238 156 74
-255 156 74
-255 156 82
-0 180 57
-16 180 57
-32 180 57
-57 180 57
-74 180 57
-98 180 57
-115 180 57
-139 180 57
-156 180 57
-180 180 57
-197 172 49
-205 172 57
-222 172 74
-238 172 74
-255 172 74
-255 172 82
-0 205 57
-16 197 57
-32 197 57
-49 197 49
-74 197 49
-98 197 49
-115 197 49
-139 197 49
-156 197 49
-180 197 49
-197 197 49
-205 189 57
-222 189 74
-238 180 74
-255 180 74
-255 180 82
-0 222 57
-16 222 49
-32 213 49
-57 205 57
-82 205 57
-98 205 57
-115 205 57
-131 205 57
-156 205 57
-172 205 57
-189 205 57
-205 205 57
-222 205 74
-238 197 74
-255 205 74
-255 197 82
-0 238 57
-16 238 49
-41 222 57
-74 222 74
-90 222 74
-106 222 74
-123 222 74
-139 222 74
-156 222 74
-172 222 74
-189 222 74
-205 222 74
-222 222 74
-238 213 74
-255 213 74
-255 213 82
-0 255 49
-24 246 57
-57 238 74
-74 238 74
-90 238 74
-106 238 74
-123 238 74
-139 238 74
-156 238 74
-172 238 74
-189 238 74
-205 238 74
-222 238 74
-238 238 74
-255 230 74
-255 230 82
-8 255 57
-41 255 74
-57 255 74
-74 255 74
-90 255 74
-106 255 74
-123 255 74
-139 255 74
-156 255 74
-172 255 74
-189 255 74
-205 255 74
-222 255 74
-238 255 74
-255 255 74
-255 238 82
-32 255 74
-49 255 82
-65 255 82
-82 255 82
-98 255 82
-115 255 82
-131 255 82
-139 255 82
-156 255 82
-172 255 82
-189 255 82
-197 255 82
-213 255 82
-230 255 82
-246 255 82
-255 255 82
diff --git a/graphics/misc/sunny_day/2.pal b/graphics/misc/sunny_day/2.pal
deleted file mode 100644
index 7a8075799..000000000
--- a/graphics/misc/sunny_day/2.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 41
-24 8 41
-41 8 41
-57 8 41
-74 8 41
-90 8 41
-106 8 41
-139 0 41
-156 0 41
-172 0 41
-189 0 41
-205 0 32
-222 0 32
-238 0 41
-255 0 41
-255 24 57
-8 24 41
-24 24 41
-41 24 41
-57 24 41
-74 24 41
-90 24 41
-115 16 41
-131 16 41
-156 16 41
-172 16 41
-189 16 32
-205 16 32
-222 16 32
-238 16 32
-246 32 49
-255 41 57
-8 41 41
-24 41 41
-41 41 41
-57 41 41
-74 41 41
-98 41 41
-115 41 41
-131 41 41
-148 32 32
-172 32 32
-189 32 32
-205 32 32
-222 32 32
-230 49 49
-246 49 49
-255 57 57
-8 57 41
-24 57 41
-41 57 41
-57 57 41
-74 57 41
-98 57 41
-115 57 41
-131 57 41
-148 57 32
-172 57 32
-189 49 32
-205 49 32
-222 49 32
-230 65 49
-246 65 49
-255 74 57
-8 74 41
-24 74 41
-41 74 41
-57 74 41
-74 74 41
-98 74 41
-115 74 41
-131 74 41
-148 74 32
-172 74 32
-189 74 32
-205 74 32
-222 65 32
-230 82 49
-246 82 49
-255 90 57
-8 90 41
-24 90 41
-41 98 41
-57 98 41
-82 98 41
-98 98 41
-115 98 41
-131 90 41
-148 90 32
-172 90 32
-189 90 32
-205 90 32
-222 90 32
-230 98 49
-246 98 49
-255 98 57
-8 106 41
-16 115 41
-41 115 41
-57 115 41
-74 115 41
-98 115 41
-115 115 41
-131 115 41
-148 115 32
-172 115 32
-189 115 32
-205 106 32
-222 106 32
-230 115 49
-246 115 49
-255 115 57
-0 139 41
-16 131 41
-41 131 41
-57 131 41
-74 131 41
-98 131 41
-115 131 41
-131 131 41
-148 131 32
-172 131 32
-189 131 32
-205 131 32
-222 131 32
-230 131 49
-246 131 49
-255 131 57
-0 156 41
-16 156 41
-32 148 32
-57 148 32
-74 148 32
-90 148 32
-115 148 32
-131 148 32
-148 148 32
-172 148 32
-189 148 32
-205 148 32
-222 139 32
-230 148 49
-246 148 49
-255 148 57
-0 172 32
-16 172 32
-32 172 32
-57 172 32
-74 172 32
-90 172 32
-115 172 32
-131 172 32
-148 172 32
-172 172 32
-189 164 32
-205 164 32
-222 164 32
-230 164 49
-246 164 49
-255 164 57
-0 189 32
-16 189 32
-32 189 32
-57 189 32
-74 189 32
-90 189 32
-115 189 32
-131 189 32
-148 189 32
-172 189 32
-189 189 32
-205 180 32
-222 180 32
-230 180 49
-246 180 49
-255 180 57
-0 205 32
-16 205 32
-32 205 32
-57 205 32
-74 205 32
-90 205 32
-115 205 32
-131 205 32
-148 205 32
-164 205 32
-189 205 32
-205 205 32
-222 197 32
-230 197 49
-246 197 49
-255 197 57
-0 222 32
-16 222 32
-32 222 32
-57 222 32
-74 222 32
-90 222 32
-106 222 32
-131 222 32
-148 222 32
-164 222 32
-180 222 32
-205 222 32
-222 222 32
-230 213 49
-246 213 49
-255 205 57
-0 238 32
-16 238 32
-49 230 49
-65 230 49
-82 230 49
-106 230 49
-115 230 49
-139 230 49
-148 230 49
-164 230 49
-180 230 49
-197 230 49
-213 230 49
-230 230 49
-246 230 49
-255 222 57
-0 255 32
-32 246 49
-49 246 49
-65 246 49
-82 246 49
-98 246 49
-115 246 49
-131 246 49
-148 246 49
-164 246 49
-180 246 49
-197 246 49
-213 246 49
-230 246 49
-246 246 49
-255 238 57
-24 255 49
-41 255 57
-57 255 57
-74 255 57
-90 255 57
-106 255 57
-123 255 57
-131 255 57
-156 255 57
-172 255 57
-180 255 57
-197 255 57
-213 255 57
-230 255 57
-246 255 57
-255 255 57
diff --git a/graphics/misc/sunny_day/20.pal b/graphics/misc/sunny_day/20.pal
deleted file mode 100644
index bf140d072..000000000
--- a/graphics/misc/sunny_day/20.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 74
-24 8 74
-41 8 74
-57 8 74
-74 8 74
-90 8 74
-106 8 74
-148 0 90
-164 0 82
-180 0 82
-205 0 82
-222 0 82
-238 0 74
-255 0 74
-255 8 82
-255 32 98
-8 24 74
-24 24 74
-41 24 74
-57 24 74
-74 24 74
-90 24 74
-131 24 82
-148 16 82
-164 16 82
-180 16 82
-197 16 74
-222 16 74
-238 16 74
-246 24 82
-255 41 90
-255 49 98
-8 41 74
-24 41 74
-41 41 74
-57 41 74
-74 41 74
-106 41 82
-123 41 82
-148 41 82
-164 32 82
-180 32 82
-197 32 74
-213 32 74
-222 41 82
-238 57 90
-255 57 90
-255 65 98
-8 57 74
-24 57 74
-41 57 74
-65 65 82
-82 65 82
-106 57 82
-123 57 82
-139 57 82
-156 57 74
-180 57 74
-197 49 74
-205 57 82
-222 74 90
-238 74 90
-255 74 90
-255 82 98
-8 74 74
-24 74 74
-41 74 74
-65 82 82
-82 82 82
-98 82 82
-123 82 82
-139 74 74
-156 74 74
-172 74 74
-189 82 82
-205 90 90
-222 90 90
-238 90 90
-255 90 90
-255 106 106
-8 90 74
-24 90 74
-41 106 82
-57 106 82
-82 98 82
-98 98 82
-123 98 82
-139 98 74
-156 98 74
-172 90 74
-189 98 82
-205 106 90
-222 106 90
-238 106 90
-255 106 90
-255 115 106
-8 106 74
-24 131 82
-41 123 82
-57 123 82
-82 123 82
-98 123 82
-123 123 82
-139 115 74
-156 115 74
-172 115 74
-189 115 82
-205 123 90
-222 123 90
-238 123 90
-255 123 90
-255 131 106
-0 148 82
-16 148 82
-41 148 82
-57 139 82
-74 139 74
-98 139 74
-115 139 74
-139 139 74
-156 139 74
-172 131 74
-189 131 82
-205 139 90
-222 139 90
-238 139 90
-255 139 90
-255 148 106
-0 164 82
-16 164 82
-32 164 74
-57 156 74
-74 156 74
-98 156 74
-115 156 74
-139 156 74
-156 156 74
-172 156 74
-189 148 82
-205 156 90
-222 156 90
-238 156 90
-255 156 90
-255 156 106
-0 180 82
-16 180 74
-32 180 74
-57 180 74
-74 172 74
-90 172 74
-115 172 74
-131 172 74
-156 172 74
-172 172 74
-189 164 82
-205 172 90
-222 172 90
-238 172 90
-255 172 90
-255 172 106
-0 205 74
-16 197 74
-32 197 74
-49 197 74
-82 189 82
-98 189 82
-115 189 82
-131 189 82
-148 189 82
-172 189 82
-189 189 82
-205 189 90
-222 189 90
-238 189 90
-255 189 90
-255 189 106
-0 222 74
-16 222 74
-32 213 74
-57 205 74
-90 205 90
-106 205 90
-123 205 90
-139 205 90
-156 205 90
-172 205 90
-189 205 90
-205 205 90
-222 205 90
-238 205 90
-255 197 90
-255 197 106
-0 238 74
-16 238 74
-41 222 74
-74 222 90
-90 222 90
-106 222 90
-123 222 90
-139 222 90
-156 222 90
-172 222 90
-189 222 90
-205 222 90
-222 222 90
-238 222 90
-255 213 90
-255 213 106
-0 255 74
-24 246 82
-57 238 90
-74 238 90
-90 238 90
-106 238 90
-123 238 90
-139 238 90
-156 238 90
-172 238 90
-189 238 90
-205 238 90
-222 238 90
-238 238 90
-255 230 90
-255 230 106
-8 255 82
-41 255 90
-57 255 90
-74 255 90
-90 255 90
-106 255 90
-123 255 90
-139 255 90
-156 255 90
-172 255 90
-189 255 90
-205 255 90
-222 255 90
-238 255 90
-255 255 90
-255 246 106
-32 255 90
-49 255 90
-65 255 98
-82 255 98
-106 255 106
-115 255 106
-131 255 106
-148 255 106
-156 255 106
-172 255 106
-189 255 106
-205 255 106
-213 255 106
-230 255 106
-246 255 106
-255 255 106
diff --git a/graphics/misc/sunny_day/21.pal b/graphics/misc/sunny_day/21.pal
deleted file mode 100644
index 9a48b9028..000000000
--- a/graphics/misc/sunny_day/21.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 90
-24 8 90
-41 8 90
-57 8 90
-74 8 90
-90 8 90
-106 8 90
-148 0 106
-164 0 106
-180 0 106
-205 0 98
-222 0 98
-238 0 98
-255 0 98
-255 8 98
-255 32 106
-8 24 90
-24 24 90
-41 24 90
-57 24 90
-74 24 90
-90 24 90
-131 24 106
-148 16 106
-164 16 106
-180 16 98
-197 16 98
-222 16 98
-238 16 98
-246 24 98
-255 41 106
-255 49 115
-8 41 90
-24 41 90
-41 41 106
-65 41 106
-82 41 106
-106 41 106
-123 41 106
-148 41 98
-164 32 98
-180 32 98
-197 32 98
-213 32 98
-222 41 98
-238 57 106
-255 57 106
-255 65 115
-8 57 90
-24 57 90
-41 65 106
-57 57 106
-82 57 106
-106 57 106
-123 57 98
-139 57 98
-156 57 98
-180 57 98
-197 49 98
-205 57 98
-222 74 106
-238 74 106
-255 74 106
-255 82 115
-8 74 90
-24 74 90
-41 82 106
-57 82 106
-82 82 98
-98 82 98
-123 82 98
-139 74 98
-156 74 98
-172 74 90
-189 82 98
-205 90 106
-222 90 106
-238 90 106
-255 90 106
-255 106 115
-8 90 90
-24 90 90
-41 106 106
-57 106 106
-82 98 98
-98 98 98
-123 98 98
-139 98 98
-156 98 98
-172 98 98
-189 106 106
-205 106 106
-222 106 106
-238 106 106
-255 115 115
-255 123 123
-8 106 90
-24 131 106
-41 123 106
-57 123 98
-82 123 98
-98 123 98
-123 123 98
-139 115 98
-156 115 98
-172 115 98
-189 123 106
-205 123 106
-222 123 106
-238 123 106
-255 123 115
-255 131 123
-0 148 106
-16 148 98
-41 148 98
-57 139 98
-74 139 98
-98 139 98
-115 139 98
-139 139 98
-156 131 98
-172 131 98
-189 139 106
-205 139 106
-222 139 106
-238 139 106
-255 139 115
-255 148 123
-0 164 98
-16 164 98
-32 164 98
-57 156 98
-74 156 98
-98 156 98
-115 156 98
-131 156 98
-156 156 98
-172 156 98
-189 156 106
-205 156 106
-222 156 106
-238 156 106
-255 156 115
-255 156 123
-0 180 98
-16 180 98
-32 180 98
-57 180 90
-74 172 90
-98 172 98
-115 172 98
-131 172 98
-156 172 98
-172 172 98
-189 172 106
-205 172 106
-222 172 106
-238 172 106
-255 172 115
-255 172 123
-0 205 98
-16 197 98
-32 197 98
-49 197 90
-82 189 98
-106 189 106
-123 189 106
-139 189 106
-156 189 106
-172 189 106
-189 189 106
-205 189 106
-222 189 106
-238 189 106
-255 189 115
-255 189 123
-0 222 98
-16 222 90
-32 213 90
-57 205 98
-90 205 106
-106 205 106
-123 205 106
-139 205 106
-156 205 106
-172 205 106
-189 205 106
-205 205 106
-222 205 106
-238 205 106
-255 205 115
-255 197 123
-0 238 90
-16 238 90
-41 222 90
-74 222 106
-90 222 106
-106 222 106
-123 222 106
-139 222 106
-156 222 106
-172 222 106
-189 222 106
-205 222 106
-222 222 106
-238 222 106
-255 222 115
-255 213 123
-0 255 90
-24 246 90
-57 238 106
-74 238 106
-90 238 106
-106 238 106
-123 238 106
-139 238 106
-156 238 106
-172 238 106
-189 238 106
-205 238 106
-222 238 106
-238 238 106
-255 238 115
-255 230 123
-8 255 98
-41 255 106
-57 255 106
-74 255 106
-90 255 106
-115 255 115
-123 255 115
-139 255 115
-156 255 115
-172 255 115
-189 255 115
-205 255 115
-222 255 115
-238 255 115
-255 255 115
-255 246 123
-32 255 106
-49 255 106
-65 255 106
-82 255 115
-106 255 115
-123 255 123
-131 255 123
-148 255 123
-164 255 123
-172 255 123
-189 255 123
-205 255 123
-213 255 123
-230 255 123
-246 255 123
-255 255 123
diff --git a/graphics/misc/sunny_day/22.pal b/graphics/misc/sunny_day/22.pal
deleted file mode 100644
index 25d9bc513..000000000
--- a/graphics/misc/sunny_day/22.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 106
-24 8 106
-41 8 106
-57 8 106
-74 8 106
-90 8 106
-106 8 106
-148 0 131
-164 0 123
-180 0 123
-205 0 123
-222 0 115
-238 0 115
-255 0 115
-255 8 115
-255 32 123
-8 24 106
-24 24 131
-41 24 131
-57 24 131
-82 24 131
-106 24 131
-131 24 131
-148 16 123
-164 16 123
-180 16 123
-197 16 123
-222 16 115
-238 16 115
-246 24 115
-255 41 123
-255 49 131
-8 41 106
-24 41 131
-41 41 123
-57 41 123
-82 41 123
-106 41 123
-123 41 123
-148 41 123
-164 32 123
-180 32 123
-197 32 115
-213 32 115
-222 41 115
-238 57 123
-255 57 123
-255 65 131
-8 57 106
-24 65 131
-41 57 123
-57 57 123
-82 57 123
-98 57 123
-123 57 123
-139 57 123
-156 57 115
-180 57 115
-197 49 115
-205 57 115
-222 74 123
-238 74 123
-255 74 123
-255 82 131
-8 74 106
-24 82 131
-41 82 123
-57 82 123
-82 82 123
-98 82 123
-123 82 123
-139 74 115
-156 74 115
-172 74 115
-189 82 115
-205 90 123
-222 90 123
-238 90 123
-255 90 123
-255 106 131
-8 90 106
-24 106 131
-41 106 123
-57 98 123
-82 98 123
-98 98 123
-123 98 123
-139 98 115
-156 98 115
-172 98 115
-189 106 123
-205 106 123
-222 106 123
-238 106 123
-255 115 123
-255 123 131
-8 106 106
-24 131 131
-41 123 123
-57 123 123
-82 123 123
-98 123 123
-115 115 115
-139 115 115
-156 115 115
-172 123 123
-189 123 123
-205 123 123
-222 123 123
-238 123 123
-246 131 131
-255 139 139
-0 148 123
-16 148 123
-41 148 123
-57 139 123
-74 139 115
-98 139 115
-115 139 115
-139 139 115
-156 131 115
-172 139 123
-189 139 123
-205 139 123
-222 139 123
-238 139 123
-246 139 131
-255 148 139
-0 164 123
-16 164 123
-32 164 115
-57 156 115
-74 156 115
-98 156 115
-115 156 115
-131 156 115
-156 156 115
-172 156 123
-189 156 123
-205 156 123
-222 156 123
-238 156 123
-246 156 131
-255 164 139
-0 180 115
-16 180 115
-32 180 115
-57 180 115
-74 172 115
-98 172 115
-123 172 123
-139 172 123
-156 172 123
-172 172 123
-189 172 123
-205 172 123
-222 172 123
-238 172 123
-246 172 131
-255 172 139
-0 205 115
-16 197 115
-32 197 115
-49 197 115
-82 189 115
-106 189 123
-123 189 123
-139 189 123
-156 189 123
-172 189 123
-189 189 123
-205 189 123
-222 189 123
-238 189 123
-246 189 131
-255 189 139
-0 222 115
-16 222 115
-32 213 115
-57 205 115
-90 205 123
-106 205 123
-123 205 123
-139 205 123
-156 205 123
-172 205 123
-189 205 123
-205 205 123
-222 205 123
-238 205 123
-246 205 131
-255 205 139
-0 238 115
-16 238 115
-41 222 115
-74 222 123
-90 222 123
-106 222 123
-123 222 123
-139 222 123
-156 222 123
-172 222 123
-189 222 123
-205 222 123
-222 222 123
-238 222 123
-246 222 131
-255 213 139
-0 255 115
-24 246 115
-57 238 123
-74 238 123
-90 238 123
-106 238 123
-123 238 123
-139 238 123
-156 238 123
-172 238 123
-189 238 123
-205 238 123
-222 238 123
-238 238 123
-246 230 131
-255 230 139
-8 255 115
-41 255 115
-57 255 123
-74 255 123
-90 255 123
-115 255 123
-131 246 131
-148 246 131
-156 246 131
-172 246 131
-189 246 131
-205 246 131
-222 246 131
-238 246 131
-246 246 131
-255 246 139
-32 255 123
-49 255 123
-65 255 123
-82 255 131
-106 255 131
-123 255 131
-139 255 139
-148 255 139
-164 255 139
-180 255 139
-189 255 139
-205 255 139
-222 255 139
-230 255 139
-246 255 139
-255 255 139
diff --git a/graphics/misc/sunny_day/23.pal b/graphics/misc/sunny_day/23.pal
deleted file mode 100644
index 478a765f6..000000000
--- a/graphics/misc/sunny_day/23.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 148
-16 0 148
-41 0 148
-57 0 148
-82 0 148
-106 0 148
-123 0 148
-148 0 148
-164 0 148
-180 0 139
-205 0 139
-222 0 139
-238 0 139
-255 0 139
-255 8 131
-255 32 139
-0 24 148
-16 16 148
-41 16 148
-57 16 148
-82 16 148
-98 16 148
-123 16 148
-148 16 148
-164 16 148
-180 16 139
-197 16 139
-222 16 139
-238 16 139
-246 24 131
-255 41 139
-255 49 139
-0 41 148
-16 41 148
-41 41 148
-57 41 148
-82 41 148
-98 41 148
-123 41 148
-148 41 148
-164 32 139
-180 32 139
-197 32 139
-213 32 139
-222 41 131
-238 57 139
-255 57 139
-255 65 139
-0 65 148
-16 57 148
-41 57 148
-57 57 139
-82 57 139
-98 57 139
-123 57 139
-139 57 139
-156 57 139
-180 57 139
-197 49 139
-205 57 131
-222 74 139
-238 74 139
-255 74 139
-255 82 139
-0 90 148
-16 82 148
-41 82 148
-57 82 139
-74 74 139
-98 74 139
-115 74 139
-139 74 139
-156 74 139
-172 74 131
-189 82 131
-205 90 139
-222 90 139
-238 90 139
-255 90 139
-255 106 148
-0 106 148
-16 106 148
-41 98 148
-57 98 139
-74 98 139
-98 98 139
-115 98 139
-139 98 139
-156 98 131
-172 98 131
-189 106 139
-205 106 139
-222 106 139
-238 106 139
-255 115 139
-255 123 148
-0 131 148
-16 123 148
-41 123 148
-57 123 139
-74 115 139
-98 115 139
-115 115 139
-139 115 139
-156 115 131
-172 123 139
-189 123 139
-205 123 139
-222 123 139
-238 123 139
-246 131 148
-255 139 148
-0 148 148
-16 148 148
-41 148 148
-57 139 139
-74 139 139
-98 139 139
-115 139 139
-139 131 131
-156 139 139
-172 139 139
-189 139 139
-205 139 139
-222 139 139
-238 139 139
-246 148 148
-255 156 156
-0 164 148
-16 164 139
-32 164 139
-57 156 139
-74 156 139
-98 156 131
-115 156 131
-139 156 139
-156 156 139
-172 156 139
-189 156 139
-205 156 139
-222 156 139
-238 156 139
-246 156 148
-255 164 156
-0 180 139
-16 180 139
-32 180 139
-57 180 131
-74 172 131
-98 172 131
-123 172 139
-139 172 139
-156 172 139
-172 172 139
-189 172 139
-205 172 139
-222 172 139
-238 172 139
-246 172 148
-255 180 156
-0 205 139
-16 197 139
-32 197 131
-49 197 131
-82 189 131
-106 189 139
-123 189 139
-139 189 139
-156 189 139
-172 189 139
-189 189 139
-205 189 139
-222 189 139
-238 189 139
-246 189 148
-255 189 156
-0 222 131
-16 222 131
-32 213 131
-57 205 131
-90 205 139
-106 205 139
-123 205 139
-139 205 139
-156 205 139
-172 205 139
-189 205 139
-205 205 139
-222 205 139
-238 205 139
-246 205 148
-255 205 156
-0 238 131
-16 238 131
-41 222 131
-74 222 139
-90 222 139
-106 222 139
-123 222 139
-139 222 139
-156 222 139
-172 222 139
-189 222 139
-205 222 139
-222 222 139
-238 222 139
-246 222 148
-255 222 156
-0 255 131
-24 246 131
-57 238 139
-74 238 139
-90 238 139
-106 238 139
-123 238 139
-139 238 139
-156 238 139
-172 238 139
-189 238 139
-205 238 139
-222 238 139
-238 238 139
-246 238 148
-255 230 156
-8 255 131
-41 255 139
-57 255 139
-74 255 139
-90 255 139
-115 255 139
-131 246 139
-148 246 148
-164 246 148
-180 246 148
-189 246 148
-205 246 148
-222 246 148
-238 246 148
-246 246 148
-255 246 156
-32 255 139
-49 255 139
-65 255 139
-82 255 139
-106 255 148
-123 255 148
-139 255 148
-156 255 156
-164 255 156
-180 255 156
-197 255 156
-205 255 156
-222 255 156
-230 255 156
-246 255 156
-255 255 156
diff --git a/graphics/misc/sunny_day/24.pal b/graphics/misc/sunny_day/24.pal
deleted file mode 100644
index 5da491fd2..000000000
--- a/graphics/misc/sunny_day/24.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 164
-16 0 164
-41 0 164
-57 0 164
-82 0 164
-98 0 164
-123 0 164
-148 0 164
-164 0 164
-180 0 164
-205 0 164
-222 0 156
-238 0 156
-255 0 156
-255 8 156
-255 32 156
-0 24 164
-16 16 164
-41 16 164
-57 16 164
-82 16 164
-98 16 164
-123 16 164
-139 16 164
-164 16 164
-180 16 164
-197 16 164
-222 16 156
-238 16 156
-246 24 148
-255 41 156
-255 49 156
-0 41 164
-16 41 164
-32 32 164
-57 32 164
-74 32 164
-98 32 164
-115 32 164
-139 32 164
-164 32 164
-180 32 164
-197 32 156
-213 32 156
-222 41 148
-238 57 156
-255 57 156
-255 65 156
-0 65 164
-16 65 164
-32 57 164
-57 57 156
-74 57 156
-98 57 156
-115 57 156
-139 57 156
-156 57 156
-180 57 156
-197 49 156
-205 57 156
-222 74 156
-238 74 156
-255 74 156
-255 82 156
-0 82 164
-16 82 164
-32 82 164
-57 74 156
-74 74 156
-98 74 156
-115 74 156
-139 74 156
-156 74 156
-172 74 156
-189 82 148
-205 90 156
-222 90 156
-238 90 156
-255 90 156
-255 106 156
-0 106 164
-16 106 164
-32 98 164
-57 98 156
-74 98 156
-98 98 156
-115 98 156
-131 98 156
-156 98 156
-172 98 156
-189 106 156
-205 106 156
-222 106 156
-238 106 156
-255 115 156
-255 123 164
-0 123 164
-16 123 164
-32 123 164
-57 115 156
-74 115 156
-98 115 156
-115 115 156
-131 115 156
-156 115 156
-172 123 156
-189 123 156
-205 123 156
-222 123 156
-238 123 156
-246 131 156
-255 139 164
-0 148 164
-16 148 164
-32 139 164
-57 139 156
-74 139 156
-98 131 156
-115 131 156
-139 139 156
-156 139 156
-172 139 156
-189 139 156
-205 139 156
-222 139 156
-238 139 156
-246 148 164
-255 156 164
-0 164 164
-16 164 164
-32 164 164
-57 156 156
-74 156 156
-98 156 156
-115 156 156
-139 156 156
-156 156 156
-172 156 156
-189 156 156
-205 156 156
-222 156 156
-238 164 164
-246 164 164
-255 180 180
-0 180 164
-16 180 156
-32 180 156
-57 180 156
-74 172 156
-98 172 156
-123 172 156
-139 172 156
-156 172 156
-172 172 156
-189 172 156
-205 172 156
-222 172 156
-238 172 164
-246 172 164
-255 189 180
-0 205 156
-16 197 156
-32 197 156
-49 197 156
-82 189 148
-106 189 156
-123 189 156
-139 189 156
-156 189 156
-172 189 156
-189 189 156
-205 189 156
-222 189 156
-238 189 164
-246 189 164
-255 205 180
-0 222 156
-16 222 156
-32 213 148
-57 205 148
-90 205 156
-106 205 156
-123 205 156
-139 205 156
-156 205 156
-172 205 156
-189 205 156
-205 205 156
-222 205 156
-238 205 164
-246 205 164
-255 213 180
-0 238 156
-16 238 148
-41 222 148
-74 222 156
-90 222 156
-106 222 156
-123 222 156
-139 222 156
-156 222 156
-172 222 156
-189 222 156
-205 222 156
-222 222 156
-238 222 164
-246 222 164
-255 222 180
-0 255 148
-24 246 148
-57 238 156
-74 238 156
-90 238 156
-106 238 156
-123 238 156
-139 238 156
-164 238 164
-172 238 164
-189 238 164
-205 238 164
-222 238 164
-238 238 164
-246 230 164
-255 238 180
-8 255 148
-41 255 156
-57 255 156
-74 255 156
-90 255 156
-115 255 156
-131 246 156
-148 246 156
-164 246 164
-180 246 164
-189 246 164
-205 246 164
-222 246 164
-238 246 164
-246 246 164
-255 246 180
-32 255 148
-49 255 156
-65 255 156
-82 255 156
-106 255 156
-123 255 156
-139 255 164
-156 255 164
-180 255 180
-189 255 180
-205 255 180
-213 255 180
-230 255 180
-238 255 180
-246 255 180
-255 255 180
diff --git a/graphics/misc/sunny_day/25.pal b/graphics/misc/sunny_day/25.pal
deleted file mode 100644
index dce1c86a1..000000000
--- a/graphics/misc/sunny_day/25.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 180
-16 0 180
-41 0 180
-57 0 180
-82 0 180
-98 0 180
-115 0 180
-139 0 180
-164 0 180
-180 0 180
-205 0 180
-222 0 180
-238 0 172
-255 0 172
-255 8 172
-255 32 172
-0 16 180
-16 16 180
-41 16 180
-57 16 180
-74 16 180
-98 16 180
-115 16 180
-139 16 180
-156 16 180
-180 16 180
-197 16 180
-222 16 180
-238 16 180
-246 24 172
-255 41 172
-255 49 172
-0 41 180
-16 41 180
-32 32 180
-57 32 180
-74 32 180
-98 32 180
-115 32 180
-139 32 180
-156 32 180
-180 32 180
-197 32 180
-213 32 172
-222 41 172
-238 57 172
-255 57 172
-255 65 172
-0 57 180
-16 57 180
-32 57 180
-57 57 180
-74 57 180
-90 57 180
-115 57 180
-131 57 180
-156 57 180
-180 57 180
-197 49 180
-205 57 172
-222 74 172
-238 74 172
-255 74 172
-255 82 172
-0 82 180
-16 82 180
-32 82 180
-57 74 180
-74 74 172
-90 74 172
-115 74 172
-131 74 172
-156 74 172
-172 74 172
-189 82 172
-205 90 172
-222 90 172
-238 90 172
-255 90 172
-255 106 172
-0 106 180
-16 98 180
-32 98 180
-57 98 180
-74 90 172
-98 98 172
-115 98 172
-131 98 172
-156 98 172
-172 98 172
-189 106 172
-205 106 172
-222 106 172
-238 106 172
-255 115 172
-255 123 172
-0 123 180
-16 123 180
-32 123 180
-57 115 180
-74 115 172
-98 115 172
-123 123 172
-139 123 172
-156 123 172
-172 123 172
-189 123 172
-205 123 172
-222 123 172
-238 123 172
-246 131 172
-255 139 180
-0 139 180
-16 139 180
-32 139 180
-57 139 180
-74 131 172
-98 131 172
-123 139 172
-139 139 172
-156 139 172
-172 139 172
-189 139 172
-205 139 172
-222 139 172
-238 139 172
-246 148 180
-255 156 180
-0 164 180
-16 164 180
-32 164 180
-57 156 180
-74 156 172
-98 156 172
-123 156 172
-139 156 172
-156 156 172
-172 156 172
-189 156 172
-205 156 172
-222 156 172
-238 164 172
-246 164 180
-255 180 189
-0 180 180
-16 180 180
-32 180 180
-57 180 180
-74 172 172
-98 172 172
-123 172 172
-139 172 172
-156 172 172
-172 172 172
-189 172 172
-205 172 172
-222 172 172
-238 180 180
-246 189 189
-255 197 197
-0 205 180
-16 197 180
-32 197 172
-49 197 172
-82 189 164
-106 189 172
-123 189 172
-139 189 172
-156 189 172
-172 189 172
-189 189 172
-205 189 172
-222 189 172
-238 189 180
-246 197 189
-255 205 197
-0 222 172
-16 222 172
-32 213 172
-57 205 172
-90 205 172
-106 205 172
-123 205 172
-139 205 172
-156 205 172
-172 205 172
-189 205 172
-205 205 172
-222 205 172
-238 205 180
-246 213 189
-255 213 197
-0 238 172
-16 238 172
-41 222 164
-74 222 172
-90 222 172
-106 222 172
-123 222 172
-139 222 172
-156 222 172
-172 222 172
-189 222 172
-205 222 172
-222 222 172
-238 222 180
-246 222 189
-255 230 197
-0 255 172
-24 246 164
-57 238 164
-74 238 172
-90 238 172
-106 238 172
-123 238 172
-139 238 172
-164 238 172
-180 238 180
-189 238 180
-205 238 180
-222 238 180
-238 238 180
-246 238 189
-255 238 197
-8 255 164
-41 255 164
-57 255 164
-74 255 172
-90 255 172
-115 255 172
-131 246 172
-148 246 172
-164 246 172
-189 246 189
-205 246 189
-213 246 189
-230 246 189
-238 246 189
-246 246 189
-255 246 197
-32 255 164
-49 255 172
-65 255 172
-82 255 172
-106 255 172
-123 255 172
-139 255 172
-156 255 180
-180 255 189
-197 255 197
-205 255 197
-222 255 197
-230 255 197
-238 255 197
-246 255 197
-255 255 197
diff --git a/graphics/misc/sunny_day/26.pal b/graphics/misc/sunny_day/26.pal
deleted file mode 100644
index 2ddab2f0b..000000000
--- a/graphics/misc/sunny_day/26.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 205
-16 0 205
-32 0 205
-57 0 205
-74 0 205
-98 0 205
-115 0 205
-139 0 205
-156 0 205
-180 0 205
-205 0 205
-222 0 197
-238 0 197
-255 0 197
-255 8 189
-255 32 180
-0 16 205
-16 16 197
-32 16 197
-57 16 197
-74 16 197
-98 16 197
-115 16 197
-139 16 197
-156 16 197
-180 16 197
-197 16 197
-222 16 197
-238 16 197
-246 24 189
-255 41 189
-255 49 189
-0 41 205
-16 32 197
-32 32 197
-57 32 197
-74 32 197
-98 32 197
-115 32 197
-131 32 197
-156 32 197
-172 32 197
-197 32 197
-213 32 197
-222 41 189
-238 57 189
-255 57 189
-255 65 189
-0 57 205
-16 57 197
-32 57 197
-49 49 197
-74 49 197
-90 49 197
-115 49 197
-131 49 197
-156 49 197
-172 49 197
-197 49 197
-205 57 189
-222 74 189
-238 74 189
-255 74 189
-255 82 189
-0 82 205
-16 74 197
-32 74 197
-49 74 197
-82 82 189
-98 82 189
-115 82 189
-131 82 189
-148 82 189
-164 82 189
-189 82 189
-205 90 189
-222 90 189
-238 90 189
-255 90 189
-255 106 189
-0 98 205
-16 98 197
-32 98 197
-49 98 197
-82 98 189
-106 106 189
-123 106 189
-139 106 189
-156 106 189
-172 106 189
-189 106 189
-205 106 189
-222 106 189
-238 106 189
-255 115 189
-255 123 189
-0 123 205
-16 123 197
-32 115 197
-49 115 197
-82 115 189
-106 123 189
-123 123 189
-139 123 189
-156 123 189
-172 123 189
-189 123 189
-205 123 189
-222 123 189
-238 123 189
-246 131 189
-255 139 189
-0 139 205
-16 139 197
-32 139 197
-49 139 197
-82 131 189
-106 139 189
-123 139 189
-139 139 189
-156 139 189
-172 139 189
-189 139 189
-205 139 189
-222 139 189
-238 139 189
-246 148 189
-255 156 197
-0 164 205
-16 164 197
-32 156 197
-49 156 197
-82 148 189
-106 156 189
-123 156 189
-139 156 189
-156 156 189
-172 156 189
-189 156 189
-205 156 189
-222 156 189
-238 164 189
-246 164 189
-255 180 205
-0 180 205
-16 180 197
-32 180 197
-49 180 197
-82 172 189
-106 172 189
-123 172 189
-139 172 189
-156 172 189
-172 172 189
-189 172 189
-205 172 189
-222 172 189
-238 180 189
-246 189 205
-255 197 205
-0 205 205
-16 197 197
-32 197 197
-49 197 197
-82 189 189
-106 189 189
-123 189 189
-139 189 189
-156 189 189
-172 189 189
-189 189 189
-205 189 189
-222 189 189
-238 205 205
-246 205 205
-255 213 213
-0 222 197
-16 222 197
-32 213 197
-57 205 189
-90 205 189
-106 205 189
-123 205 189
-139 205 189
-156 205 189
-172 205 189
-189 205 189
-205 205 189
-222 205 189
-238 213 205
-246 213 205
-255 222 213
-0 238 189
-16 238 189
-41 222 180
-74 222 189
-90 222 189
-106 222 189
-123 222 189
-139 222 189
-156 222 189
-172 222 189
-189 222 189
-205 222 189
-222 222 189
-238 222 205
-246 230 205
-255 230 213
-0 255 189
-24 246 189
-57 238 189
-74 238 180
-90 238 189
-106 238 189
-123 238 189
-139 238 189
-164 238 189
-180 238 189
-205 238 205
-213 238 205
-230 238 205
-238 238 205
-246 238 205
-255 238 213
-8 255 180
-41 255 189
-57 255 180
-74 255 180
-90 255 189
-115 255 189
-131 246 189
-148 246 189
-164 246 189
-189 246 197
-205 246 205
-213 246 205
-230 246 205
-238 246 205
-246 246 205
-255 246 213
-32 255 180
-49 255 180
-65 255 180
-82 255 180
-106 255 189
-123 255 189
-139 255 189
-156 255 189
-180 255 205
-197 255 205
-213 255 213
-222 255 213
-230 255 213
-238 255 213
-246 255 213
-255 255 213
diff --git a/graphics/misc/sunny_day/27.pal b/graphics/misc/sunny_day/27.pal
deleted file mode 100644
index a0af5ad23..000000000
--- a/graphics/misc/sunny_day/27.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 222
-16 0 222
-32 0 222
-57 0 222
-74 0 222
-98 0 222
-115 0 222
-131 0 222
-156 0 222
-172 0 222
-197 0 222
-222 0 222
-238 0 213
-255 0 213
-255 8 205
-255 32 197
-0 16 222
-16 16 222
-32 16 222
-49 16 222
-74 16 222
-90 16 222
-115 16 222
-131 16 222
-156 16 222
-172 16 222
-197 16 222
-222 16 222
-238 16 213
-246 24 205
-255 41 205
-255 49 197
-0 41 222
-16 32 222
-32 32 213
-49 32 213
-74 32 213
-90 32 213
-115 32 213
-131 32 213
-148 32 213
-172 32 213
-197 32 213
-213 32 213
-222 41 205
-238 57 205
-255 57 205
-255 65 205
-0 57 222
-16 57 222
-32 57 213
-57 57 205
-74 57 205
-98 57 205
-115 57 205
-131 57 205
-148 57 205
-172 57 205
-189 57 205
-205 57 205
-222 74 205
-238 74 205
-255 74 205
-255 82 197
-0 82 222
-16 74 222
-32 74 213
-57 82 205
-90 90 205
-106 90 205
-123 90 205
-139 90 205
-156 90 205
-172 90 205
-189 90 205
-205 90 205
-222 90 205
-238 90 205
-255 90 205
-255 106 205
-0 98 222
-16 98 222
-32 98 213
-57 98 205
-90 106 205
-106 106 205
-123 106 205
-139 106 205
-156 106 205
-172 106 205
-189 106 205
-205 106 205
-222 106 205
-238 106 205
-255 115 205
-255 123 205
-0 115 222
-16 115 222
-32 115 213
-57 115 205
-90 123 205
-106 123 205
-123 123 205
-139 123 205
-156 123 205
-172 123 205
-189 123 205
-205 123 205
-222 123 205
-238 123 205
-246 131 205
-255 139 205
-0 139 222
-16 139 222
-32 139 213
-57 131 205
-90 139 205
-106 139 205
-123 139 205
-139 139 205
-156 139 205
-172 139 205
-189 139 205
-205 139 205
-222 139 205
-238 139 205
-246 148 205
-255 156 205
-0 156 222
-16 156 222
-32 156 213
-57 156 205
-90 156 205
-106 156 205
-123 156 205
-139 156 205
-156 156 205
-172 156 205
-189 156 205
-205 156 205
-222 156 205
-238 164 205
-246 164 205
-255 180 213
-0 180 222
-16 180 222
-32 172 213
-57 172 205
-90 172 205
-106 172 205
-123 172 205
-139 172 205
-156 172 205
-172 172 205
-189 172 205
-205 172 205
-222 172 205
-238 180 205
-246 189 213
-255 197 222
-0 197 222
-16 197 222
-32 197 213
-57 189 205
-90 189 205
-106 189 205
-123 189 205
-139 189 205
-156 189 205
-172 189 205
-189 189 205
-205 189 205
-222 189 205
-238 205 213
-246 205 213
-255 213 222
-0 222 222
-16 222 222
-32 213 213
-57 205 205
-90 205 205
-106 205 205
-123 205 205
-139 205 205
-156 205 205
-172 205 205
-189 205 205
-205 205 205
-230 213 213
-238 213 213
-255 222 222
-255 230 230
-0 238 213
-16 238 213
-41 222 205
-74 222 205
-90 222 205
-106 222 205
-123 222 205
-139 222 205
-156 222 205
-172 222 205
-189 222 205
-213 230 213
-230 230 213
-238 230 213
-255 230 222
-255 238 230
-0 255 213
-24 246 205
-57 238 197
-74 238 197
-90 238 205
-106 238 205
-123 238 205
-139 238 205
-164 238 205
-180 238 205
-205 238 213
-213 238 213
-230 238 213
-238 238 213
-255 238 222
-255 246 230
-8 255 205
-41 255 197
-57 255 205
-74 255 205
-90 255 197
-115 255 205
-131 246 205
-148 246 205
-164 246 205
-189 246 213
-205 246 213
-222 255 222
-230 255 222
-238 255 222
-255 255 222
-255 255 230
-32 255 197
-49 255 197
-65 255 197
-82 255 197
-106 255 197
-123 255 197
-139 255 205
-156 255 205
-180 255 213
-197 255 213
-213 255 222
-230 255 230
-238 255 230
-246 255 230
-255 255 230
-255 255 230
diff --git a/graphics/misc/sunny_day/28.pal b/graphics/misc/sunny_day/28.pal
deleted file mode 100644
index fbc88233a..000000000
--- a/graphics/misc/sunny_day/28.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 238
-8 0 238
-32 0 238
-57 0 238
-74 0 238
-90 0 238
-115 0 238
-131 0 238
-156 0 238
-172 0 238
-189 0 238
-213 0 238
-238 0 238
-255 0 238
-255 8 222
-255 32 213
-0 16 238
-16 16 238
-32 16 238
-49 16 238
-74 16 238
-90 16 238
-115 16 238
-131 16 238
-148 16 238
-172 16 238
-189 16 238
-213 16 238
-238 16 238
-246 24 222
-255 41 222
-255 49 213
-0 32 238
-16 32 238
-41 41 222
-57 41 222
-74 41 222
-90 41 222
-115 41 222
-131 41 222
-148 41 222
-164 41 222
-180 41 222
-205 41 222
-222 41 222
-238 57 222
-255 57 222
-255 65 213
-0 57 238
-16 57 238
-41 57 222
-74 74 222
-90 74 222
-106 74 222
-123 74 222
-139 74 222
-156 74 222
-172 74 222
-189 74 222
-205 74 222
-222 74 222
-238 74 222
-255 74 222
-255 82 213
-0 74 238
-16 74 238
-41 82 222
-74 90 222
-90 90 222
-106 90 222
-123 90 222
-139 90 222
-156 90 222
-172 90 222
-189 90 222
-205 90 222
-222 90 222
-238 90 222
-255 90 222
-255 106 213
-0 98 238
-16 98 238
-41 98 222
-74 106 222
-90 106 222
-106 106 222
-123 106 222
-139 106 222
-156 106 222
-172 106 222
-189 106 222
-205 106 222
-222 106 222
-238 106 222
-255 115 222
-255 123 213
-0 115 238
-16 115 238
-41 115 222
-74 123 222
-90 123 222
-106 123 222
-123 123 222
-139 123 222
-156 123 222
-172 123 222
-189 123 222
-205 123 222
-222 123 222
-238 123 222
-246 131 222
-255 139 222
-0 139 238
-16 139 238
-41 131 222
-74 139 222
-90 139 222
-106 139 222
-123 139 222
-139 139 222
-156 139 222
-172 139 222
-189 139 222
-205 139 222
-222 139 222
-238 139 222
-246 148 222
-255 156 222
-0 156 238
-16 156 238
-41 148 222
-74 156 222
-90 156 222
-106 156 222
-123 156 222
-139 156 222
-156 156 222
-172 156 222
-189 156 222
-205 156 222
-222 156 222
-238 164 222
-246 164 222
-255 180 230
-0 172 238
-16 180 238
-41 172 222
-74 172 222
-90 172 222
-106 172 222
-123 172 222
-139 172 222
-156 172 222
-172 172 222
-189 172 222
-205 172 222
-222 172 222
-238 180 222
-246 189 230
-255 197 230
-0 197 238
-16 197 238
-41 189 222
-74 189 222
-90 189 222
-106 189 222
-123 189 222
-139 189 222
-156 189 222
-172 189 222
-189 189 222
-205 189 222
-222 189 222
-238 205 230
-246 205 230
-255 213 230
-0 213 238
-16 213 238
-41 205 222
-74 205 222
-90 205 222
-106 205 222
-123 205 222
-139 205 222
-156 205 222
-172 205 222
-189 205 222
-213 213 230
-230 213 230
-238 213 230
-255 222 230
-255 230 238
-0 238 238
-16 238 238
-41 222 222
-74 222 222
-90 222 222
-106 222 222
-123 222 222
-139 222 222
-156 222 222
-172 222 222
-189 222 222
-213 230 230
-230 230 230
-238 230 230
-255 238 238
-255 246 246
-0 255 230
-24 246 222
-57 238 222
-74 238 213
-90 238 222
-106 238 222
-123 238 222
-139 238 222
-164 238 222
-180 238 222
-205 238 222
-213 238 230
-230 238 230
-238 238 230
-255 246 238
-255 255 246
-8 255 222
-41 255 213
-57 255 213
-74 255 213
-90 255 213
-115 255 222
-131 246 222
-148 246 222
-164 246 222
-189 246 222
-205 246 230
-222 255 230
-238 255 238
-246 255 238
-255 255 238
-255 255 246
-32 255 213
-49 255 213
-65 255 213
-82 255 213
-106 255 213
-123 255 213
-139 255 213
-156 255 222
-180 255 222
-197 255 230
-213 255 230
-230 255 238
-246 255 246
-255 255 246
-255 255 246
-255 255 246
diff --git a/graphics/misc/sunny_day/29.pal b/graphics/misc/sunny_day/29.pal
deleted file mode 100644
index 4786c3922..000000000
--- a/graphics/misc/sunny_day/29.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 255
-16 0 255
-32 0 255
-49 0 255
-74 0 255
-90 0 255
-115 0 255
-131 0 255
-148 0 255
-172 0 255
-189 0 255
-213 0 255
-230 0 255
-255 0 255
-255 8 238
-255 32 230
-0 16 255
-24 24 246
-41 24 246
-57 24 246
-82 24 246
-90 24 246
-115 24 246
-131 24 246
-148 24 246
-164 24 246
-189 24 246
-205 24 246
-222 24 246
-246 24 246
-255 41 238
-255 49 230
-0 41 255
-24 41 246
-57 57 238
-74 57 238
-90 57 238
-106 57 238
-123 57 238
-139 57 238
-156 57 238
-164 57 238
-189 57 238
-197 57 238
-222 57 238
-238 57 238
-255 57 238
-255 65 230
-0 57 255
-24 57 246
-57 74 238
-74 74 238
-90 74 238
-106 74 238
-123 74 238
-139 74 238
-156 74 238
-172 74 238
-180 74 238
-197 74 238
-213 74 238
-238 74 238
-255 74 238
-255 82 230
-0 74 255
-24 82 246
-57 90 238
-74 90 238
-90 90 238
-106 90 238
-123 90 238
-139 90 238
-156 90 238
-172 90 238
-189 90 238
-205 90 238
-222 90 238
-238 90 238
-255 90 238
-255 106 230
-0 98 255
-24 98 246
-57 106 238
-74 106 238
-90 106 238
-106 106 238
-123 106 238
-139 106 238
-156 106 238
-172 106 238
-189 106 238
-205 106 238
-222 106 238
-238 106 238
-255 115 238
-255 123 230
-0 115 255
-24 115 246
-57 123 238
-74 123 238
-90 123 238
-106 123 238
-123 123 238
-139 123 238
-156 123 238
-172 123 238
-189 123 238
-205 123 238
-222 123 238
-238 123 238
-246 131 238
-255 139 230
-0 139 255
-24 131 246
-57 139 238
-74 139 238
-90 139 238
-106 139 238
-123 139 238
-139 139 238
-156 139 238
-172 139 238
-189 139 238
-205 139 238
-222 139 238
-238 139 238
-246 148 238
-255 156 230
-0 156 255
-24 148 246
-57 156 238
-74 156 238
-90 156 238
-106 156 238
-123 156 238
-139 156 238
-164 164 238
-172 164 238
-189 164 238
-205 164 238
-222 164 238
-238 164 238
-246 164 238
-255 180 238
-0 172 255
-24 172 246
-57 172 238
-74 172 238
-90 172 238
-106 172 238
-123 172 238
-139 172 238
-164 172 238
-180 180 238
-189 180 238
-205 180 238
-222 180 238
-238 180 238
-246 189 238
-255 197 238
-0 197 255
-24 189 246
-57 189 238
-74 189 238
-90 189 238
-106 189 238
-123 189 238
-139 189 238
-164 189 238
-180 189 238
-205 205 238
-213 205 238
-222 205 238
-238 205 238
-246 205 238
-255 213 238
-0 213 255
-24 205 246
-57 205 238
-74 205 238
-90 205 238
-106 205 238
-123 205 238
-139 205 238
-164 205 238
-180 205 238
-205 213 238
-213 213 238
-230 213 238
-238 213 238
-255 222 238
-255 230 246
-0 238 255
-24 222 246
-57 222 238
-74 222 238
-90 222 238
-106 222 238
-123 222 238
-139 222 238
-164 222 238
-180 222 238
-205 230 238
-213 230 238
-230 230 238
-238 230 238
-255 238 246
-255 246 255
-0 255 255
-24 246 246
-57 238 238
-74 238 238
-90 238 238
-106 238 238
-123 238 238
-139 238 238
-164 238 238
-180 238 238
-205 238 238
-213 238 238
-230 238 238
-246 246 246
-255 255 255
-255 255 255
-8 255 238
-41 255 238
-57 255 230
-74 255 230
-90 255 230
-115 255 238
-131 246 230
-148 246 238
-164 246 230
-189 246 238
-205 246 238
-222 255 238
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-32 255 222
-49 255 230
-65 255 230
-82 255 230
-106 255 230
-123 255 230
-139 255 230
-156 255 230
-180 255 238
-197 255 238
-213 255 238
-230 255 246
-246 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/3.pal b/graphics/misc/sunny_day/3.pal
deleted file mode 100644
index fc463f301..000000000
--- a/graphics/misc/sunny_day/3.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 57
-24 8 57
-41 8 57
-57 8 57
-74 8 57
-90 8 57
-106 8 57
-139 0 57
-156 0 57
-172 0 57
-189 0 57
-205 0 57
-222 0 57
-238 0 57
-255 0 57
-255 24 74
-8 24 57
-24 24 57
-41 24 57
-57 24 57
-74 24 57
-90 24 57
-115 16 57
-131 16 57
-156 16 57
-172 16 57
-189 16 57
-205 16 57
-222 16 57
-238 16 57
-246 32 65
-255 41 74
-8 41 57
-24 41 57
-41 41 57
-57 41 57
-74 41 57
-98 41 57
-115 41 57
-131 41 57
-148 32 57
-172 32 57
-189 32 57
-205 32 57
-222 32 57
-230 49 65
-246 49 65
-255 57 74
-8 57 57
-24 57 57
-41 57 57
-57 57 57
-74 57 57
-98 57 57
-115 57 57
-131 57 57
-148 57 57
-164 57 57
-189 49 49
-205 57 57
-213 65 65
-230 65 65
-246 65 65
-255 74 74
-8 74 57
-24 74 57
-41 74 57
-57 74 57
-74 74 57
-98 74 57
-115 74 57
-131 74 57
-148 74 57
-164 74 57
-189 74 49
-205 74 57
-213 82 65
-230 82 65
-246 82 65
-255 90 74
-8 90 57
-24 90 57
-41 98 57
-57 98 57
-74 98 57
-98 98 57
-115 90 57
-131 90 57
-148 90 57
-164 90 57
-189 90 49
-205 90 57
-213 98 65
-230 98 65
-246 98 65
-255 106 74
-8 106 57
-16 115 57
-41 115 57
-57 115 57
-74 115 57
-98 115 57
-115 115 57
-131 115 57
-148 106 57
-164 115 57
-189 106 49
-205 106 57
-213 115 65
-230 115 65
-246 115 65
-255 123 74
-0 139 57
-16 131 57
-41 131 57
-57 131 57
-74 131 57
-90 131 57
-115 131 57
-131 131 57
-148 131 57
-164 131 57
-189 131 49
-205 131 57
-213 131 65
-230 131 65
-246 131 65
-255 131 74
-0 156 57
-16 156 57
-32 148 57
-57 148 57
-74 148 57
-90 148 57
-115 148 57
-131 148 57
-148 148 57
-164 148 57
-189 148 49
-205 148 57
-213 148 65
-230 148 65
-246 148 65
-255 148 74
-0 172 57
-16 172 57
-32 172 57
-57 164 57
-74 164 57
-90 164 57
-115 164 57
-131 164 57
-148 164 57
-164 164 57
-189 164 49
-205 164 57
-213 164 65
-230 164 65
-246 164 65
-255 164 74
-0 189 49
-16 189 57
-32 189 49
-49 189 49
-74 189 49
-90 189 49
-106 189 49
-131 189 49
-148 189 49
-172 189 49
-189 189 49
-205 180 57
-213 180 65
-230 180 65
-246 180 65
-255 180 74
-0 205 57
-16 205 49
-32 205 49
-57 205 57
-74 205 57
-90 205 57
-106 205 57
-131 205 57
-148 205 57
-164 205 57
-189 205 57
-205 205 57
-213 197 65
-230 197 65
-246 197 65
-255 197 74
-0 222 57
-16 222 49
-32 222 49
-65 213 65
-82 213 65
-98 213 65
-115 213 65
-131 213 65
-148 213 65
-164 213 65
-180 213 65
-205 213 65
-213 213 65
-230 213 65
-246 213 65
-255 213 74
-0 238 49
-16 238 49
-49 230 65
-65 230 65
-82 230 65
-98 230 65
-115 230 65
-131 230 65
-148 230 65
-164 230 65
-180 230 65
-197 230 65
-213 230 65
-230 230 65
-246 230 65
-255 222 74
-0 255 49
-32 246 65
-49 246 65
-65 246 65
-90 246 65
-98 246 65
-123 246 65
-131 246 65
-156 246 65
-164 246 65
-180 246 65
-197 246 65
-213 246 65
-238 246 65
-246 246 65
-255 238 74
-24 255 65
-41 255 74
-57 255 74
-74 255 74
-90 255 74
-106 255 74
-123 255 74
-139 255 74
-156 255 74
-164 255 74
-180 255 74
-197 255 74
-213 255 74
-230 255 74
-246 255 74
-255 255 74
diff --git a/graphics/misc/sunny_day/30.pal b/graphics/misc/sunny_day/30.pal
deleted file mode 100644
index de1492a5a..000000000
--- a/graphics/misc/sunny_day/30.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 255
-24 8 255
-41 8 255
-57 8 255
-82 8 255
-98 8 255
-115 8 255
-131 8 255
-148 8 255
-164 8 255
-180 8 255
-205 8 255
-222 8 255
-238 8 255
-255 8 255
-255 32 246
-8 24 255
-41 41 255
-57 41 255
-74 41 255
-90 41 255
-106 41 255
-115 41 255
-139 41 255
-156 41 255
-164 41 255
-189 41 255
-197 41 255
-213 41 255
-238 41 255
-255 41 255
-255 49 246
-8 49 255
-41 57 255
-57 57 255
-74 57 255
-90 57 255
-106 57 255
-123 57 255
-139 57 255
-156 57 255
-164 57 255
-180 57 255
-205 57 255
-213 57 255
-230 57 255
-255 57 255
-255 65 246
-8 65 255
-41 74 255
-57 74 255
-74 74 255
-90 74 255
-106 74 255
-123 74 255
-139 74 255
-156 74 255
-172 74 255
-180 74 255
-205 74 255
-213 74 255
-230 74 255
-255 74 255
-255 82 246
-8 82 255
-41 90 255
-57 90 255
-74 90 255
-90 90 255
-106 90 255
-123 90 255
-139 90 255
-156 90 255
-172 90 255
-189 90 255
-197 90 255
-213 90 255
-230 90 255
-255 90 255
-255 106 246
-8 98 255
-41 106 255
-57 106 255
-74 106 255
-90 106 255
-115 115 255
-123 115 255
-139 115 255
-156 115 255
-172 115 255
-189 115 255
-205 115 255
-222 115 255
-238 115 255
-255 115 255
-255 123 246
-8 115 255
-41 123 255
-57 123 255
-74 123 255
-90 123 255
-115 123 255
-131 131 246
-139 131 246
-156 131 246
-172 131 246
-189 131 246
-205 131 246
-222 131 246
-230 131 246
-246 131 246
-255 139 246
-8 131 255
-41 139 255
-57 139 255
-74 139 255
-90 139 255
-115 139 255
-131 148 246
-148 148 246
-156 148 246
-172 148 246
-189 148 246
-205 148 246
-222 148 246
-238 148 246
-246 148 246
-255 156 246
-8 156 255
-41 156 255
-57 156 255
-74 156 255
-90 156 255
-115 156 255
-131 156 246
-148 164 246
-164 164 246
-172 164 246
-189 164 246
-205 164 246
-222 164 246
-230 164 246
-246 164 246
-255 180 246
-8 172 255
-41 172 255
-57 172 255
-74 172 255
-90 172 255
-115 172 255
-131 172 246
-148 180 246
-164 180 246
-189 189 246
-197 189 246
-213 189 246
-222 189 246
-238 189 246
-246 189 246
-255 197 246
-8 189 255
-41 189 255
-57 189 255
-74 189 255
-90 189 255
-115 189 255
-131 189 246
-148 189 246
-164 189 246
-189 205 246
-205 205 246
-213 205 246
-230 205 246
-238 205 246
-246 205 246
-255 213 246
-8 205 255
-41 205 255
-57 205 255
-74 205 255
-90 205 255
-115 205 255
-131 205 246
-148 205 246
-164 205 246
-189 213 246
-205 213 246
-222 222 255
-230 222 255
-238 222 255
-255 222 255
-255 230 255
-8 222 255
-41 222 255
-57 222 255
-74 222 255
-90 222 255
-115 222 255
-131 222 246
-148 222 246
-164 222 246
-189 230 246
-205 230 246
-222 230 255
-238 238 255
-246 238 255
-255 238 255
-255 246 255
-8 238 255
-41 238 255
-57 238 255
-74 238 255
-90 238 255
-115 238 255
-131 238 246
-148 238 246
-164 238 246
-189 238 246
-205 238 246
-222 238 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-8 255 255
-41 255 255
-57 255 255
-74 255 255
-90 255 255
-115 255 255
-131 246 246
-148 246 246
-164 246 246
-189 246 246
-205 246 246
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-32 255 238
-49 255 238
-65 255 246
-82 255 238
-106 255 246
-123 255 246
-139 255 246
-156 255 246
-180 255 246
-197 255 246
-213 255 246
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/31.pal b/graphics/misc/sunny_day/31.pal
deleted file mode 100644
index c48c846ad..000000000
--- a/graphics/misc/sunny_day/31.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-32 32 255
-49 32 255
-57 32 255
-74 32 255
-90 32 255
-106 32 255
-123 32 255
-139 32 255
-148 32 255
-164 32 255
-180 32 255
-197 32 255
-213 32 255
-222 32 255
-238 32 255
-255 32 255
-32 49 255
-49 49 255
-65 49 255
-82 49 255
-90 49 255
-106 49 255
-123 49 255
-139 49 255
-156 49 255
-172 49 255
-180 49 255
-197 49 255
-213 49 255
-230 49 255
-238 49 255
-255 49 255
-32 65 255
-49 65 255
-65 65 255
-82 65 255
-98 65 255
-106 65 255
-123 65 255
-139 65 255
-156 65 255
-172 65 255
-180 65 255
-197 65 255
-213 65 255
-230 65 255
-246 65 255
-255 65 255
-32 82 255
-49 82 255
-65 82 255
-82 82 255
-98 82 255
-115 82 255
-131 82 255
-139 82 255
-156 82 255
-172 82 255
-180 82 255
-197 82 255
-213 82 255
-230 82 255
-238 82 255
-255 82 255
-32 98 255
-49 98 255
-65 98 255
-82 98 255
-106 106 255
-115 106 255
-131 106 255
-148 106 255
-156 106 255
-172 106 255
-189 106 255
-197 106 255
-213 106 255
-230 106 255
-246 106 255
-255 106 255
-32 106 255
-49 115 255
-65 115 255
-82 115 255
-106 115 255
-123 123 255
-131 123 255
-148 123 255
-156 123 255
-172 123 255
-189 123 255
-197 123 255
-213 123 255
-230 123 255
-246 123 255
-255 123 255
-32 123 255
-49 131 255
-65 131 255
-82 131 255
-106 131 255
-123 131 255
-139 139 255
-148 139 255
-164 139 255
-172 139 255
-189 139 255
-205 139 255
-213 139 255
-230 139 255
-246 139 255
-255 139 255
-32 139 255
-49 139 255
-65 139 255
-82 139 255
-106 148 255
-123 148 255
-139 148 255
-156 156 255
-164 156 255
-180 156 255
-189 156 255
-205 156 255
-222 156 255
-230 156 255
-246 156 255
-255 156 255
-32 156 255
-49 156 255
-65 156 255
-82 156 255
-106 156 255
-123 164 255
-139 164 255
-156 164 255
-180 180 255
-189 180 255
-205 180 255
-213 180 255
-222 180 255
-238 180 255
-246 180 255
-255 180 255
-32 172 255
-49 172 255
-65 172 255
-82 172 255
-106 172 255
-123 172 255
-139 180 255
-156 180 255
-180 189 255
-197 197 255
-205 197 255
-213 197 255
-230 197 255
-238 197 255
-246 197 255
-255 197 255
-32 180 255
-49 189 255
-65 189 255
-82 189 255
-106 189 255
-123 189 255
-139 189 255
-156 197 255
-180 205 255
-197 205 255
-213 213 255
-222 213 255
-230 213 255
-238 213 255
-246 213 255
-255 213 255
-32 197 255
-49 197 255
-65 205 255
-82 197 255
-106 205 255
-123 205 255
-139 205 255
-156 205 255
-180 213 255
-197 222 255
-213 222 255
-230 230 255
-238 230 255
-246 230 255
-255 230 255
-255 230 255
-32 213 255
-49 213 255
-65 213 255
-82 213 255
-106 213 255
-123 213 255
-139 222 255
-156 222 255
-180 230 255
-197 230 255
-213 230 255
-230 238 255
-246 246 255
-255 246 255
-255 246 255
-255 246 255
-32 230 255
-49 230 255
-65 230 255
-82 230 255
-106 230 255
-123 230 255
-139 230 255
-156 230 255
-180 238 255
-197 238 255
-213 238 255
-230 246 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-32 246 255
-49 246 255
-65 246 255
-82 246 255
-106 246 255
-123 246 255
-139 246 255
-156 246 255
-180 246 255
-197 246 255
-213 246 255
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-32 255 255
-49 255 255
-65 255 255
-82 255 255
-106 255 255
-123 255 255
-139 255 255
-156 255 255
-180 255 255
-197 255 255
-213 255 255
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/32.pal b/graphics/misc/sunny_day/32.pal
deleted file mode 100644
index 238ca8950..000000000
--- a/graphics/misc/sunny_day/32.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 8
-24 8 8
-41 8 8
-57 8 8
-74 8 8
-90 8 8
-106 8 8
-156 0 0
-180 0 0
-197 0 0
-213 0 0
-230 0 0
-246 0 0
-255 0 0
-255 16 16
-255 49 49
-8 24 8
-24 24 8
-41 24 8
-57 24 8
-74 24 8
-90 24 8
-106 24 8
-156 16 0
-180 16 0
-197 16 0
-213 16 0
-230 16 0
-246 16 0
-255 16 0
-255 32 16
-255 57 49
-8 41 8
-24 41 8
-41 41 8
-57 41 8
-74 41 8
-90 41 8
-106 41 8
-156 41 0
-180 41 0
-197 41 0
-213 32 0
-230 32 0
-246 32 0
-255 41 0
-255 49 16
-255 74 49
-8 57 8
-24 57 8
-41 57 8
-57 57 8
-74 57 8
-90 57 8
-106 57 8
-156 65 0
-180 65 0
-197 57 0
-213 57 0
-230 57 0
-246 57 0
-255 57 0
-255 65 16
-255 82 49
-8 74 8
-24 74 8
-41 74 8
-57 74 8
-74 74 8
-90 74 8
-106 74 8
-156 90 0
-180 90 0
-197 82 0
-213 82 0
-230 74 0
-246 74 0
-255 82 0
-255 90 16
-255 98 49
-8 90 8
-24 90 8
-41 90 8
-57 90 8
-74 90 8
-90 90 8
-106 90 8
-156 115 0
-180 106 0
-197 106 0
-213 106 0
-230 98 0
-246 98 0
-255 98 0
-255 98 16
-255 115 49
-8 106 8
-24 106 8
-41 106 8
-57 106 8
-74 106 8
-90 106 8
-106 106 8
-156 139 0
-180 131 0
-197 123 0
-213 123 0
-230 123 0
-246 123 0
-255 115 0
-255 115 16
-255 123 49
-0 156 0
-24 156 0
-49 156 0
-65 156 0
-90 156 0
-115 156 0
-139 156 0
-156 156 0
-180 156 0
-197 148 0
-213 148 0
-230 139 0
-246 139 0
-255 139 0
-255 139 16
-255 139 49
-0 180 0
-24 180 0
-41 180 0
-65 180 0
-90 180 0
-115 180 0
-131 180 0
-156 180 0
-180 180 0
-197 172 0
-213 164 0
-230 164 0
-246 156 0
-255 156 0
-255 156 16
-255 156 49
-0 197 0
-16 197 0
-41 197 0
-65 197 0
-82 197 0
-106 197 0
-131 197 0
-156 197 0
-172 197 0
-197 197 0
-213 189 0
-230 180 0
-246 180 0
-255 180 0
-255 172 16
-255 172 49
-0 213 0
-16 213 0
-41 213 0
-57 213 0
-82 213 0
-106 213 0
-123 213 0
-148 213 0
-172 213 0
-189 213 0
-213 213 0
-230 205 0
-246 197 0
-255 197 0
-255 189 16
-255 180 49
-0 230 0
-16 230 0
-41 230 0
-65 230 0
-82 230 0
-106 230 0
-123 230 0
-148 230 0
-164 230 0
-189 230 0
-213 230 0
-230 230 0
-246 222 0
-255 213 0
-255 205 16
-255 197 49
-0 246 0
-16 246 0
-41 246 0
-57 246 0
-82 246 0
-98 246 0
-123 246 0
-139 246 0
-164 246 0
-180 246 0
-205 246 0
-230 246 0
-246 246 0
-255 238 0
-255 222 16
-255 213 49
-0 255 0
-24 255 0
-41 255 0
-57 255 0
-82 255 0
-98 255 0
-123 255 0
-139 255 0
-156 255 0
-180 255 0
-197 255 0
-222 255 0
-238 255 0
-255 255 0
-255 238 16
-255 230 49
-16 255 16
-41 255 16
-57 255 16
-74 255 16
-90 255 16
-106 255 16
-123 255 16
-139 255 16
-156 255 16
-172 255 16
-189 255 16
-213 255 16
-230 255 16
-246 255 16
-255 255 16
-255 238 49
-49 255 49
-57 255 49
-74 255 49
-90 255 49
-98 255 49
-115 255 49
-131 255 49
-148 255 49
-156 255 49
-172 255 49
-189 255 49
-205 255 49
-213 255 49
-230 255 49
-246 255 49
-255 255 49
diff --git a/graphics/misc/sunny_day/33.pal b/graphics/misc/sunny_day/33.pal
deleted file mode 100644
index e616bd849..000000000
--- a/graphics/misc/sunny_day/33.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 24
-24 8 24
-41 8 24
-57 8 24
-74 8 24
-90 8 24
-106 8 24
-156 0 24
-180 0 24
-197 0 16
-213 0 16
-230 0 16
-246 0 16
-255 0 24
-255 16 41
-255 49 57
-8 24 24
-24 24 24
-41 24 24
-57 24 24
-74 24 24
-90 24 24
-139 24 24
-156 16 16
-172 16 16
-189 16 16
-213 16 16
-230 16 16
-246 16 16
-246 32 32
-255 49 49
-255 65 65
-8 41 24
-24 41 24
-41 41 24
-57 41 24
-74 41 24
-90 41 24
-139 41 24
-156 41 16
-172 41 16
-189 41 16
-213 32 16
-230 32 16
-246 32 16
-246 41 32
-255 65 49
-255 74 65
-8 57 24
-24 57 24
-41 57 24
-57 57 24
-74 57 24
-90 57 24
-139 65 24
-156 65 16
-172 65 16
-189 57 16
-213 57 16
-230 49 16
-246 57 16
-246 65 32
-255 82 49
-255 90 65
-8 74 24
-24 74 24
-41 74 24
-57 74 24
-74 74 24
-90 74 24
-139 90 24
-156 90 16
-172 82 16
-189 82 16
-213 74 16
-230 74 16
-246 74 16
-246 82 32
-255 90 49
-255 98 65
-8 90 24
-24 90 24
-41 90 24
-57 90 24
-74 90 24
-90 90 24
-139 115 24
-156 106 16
-172 106 16
-189 106 16
-213 98 16
-230 98 16
-246 98 16
-246 98 32
-255 115 49
-255 115 65
-8 106 24
-24 139 24
-41 139 24
-65 139 24
-90 139 24
-115 139 24
-139 139 24
-156 131 16
-172 123 16
-189 123 16
-213 123 16
-230 123 16
-246 115 16
-246 115 32
-255 123 49
-255 131 65
-0 156 16
-16 156 16
-41 156 16
-65 156 16
-90 156 16
-106 156 16
-131 156 16
-156 156 16
-172 148 16
-189 148 16
-213 139 16
-230 139 16
-246 139 16
-246 139 32
-255 139 49
-255 148 65
-0 180 16
-16 172 16
-41 172 16
-65 172 16
-82 172 16
-106 172 16
-131 172 16
-156 172 16
-172 172 16
-189 172 16
-213 164 16
-230 164 16
-246 156 16
-246 156 32
-255 156 49
-255 164 65
-0 197 16
-16 189 16
-41 189 16
-57 189 16
-82 189 16
-106 189 16
-131 189 16
-148 189 16
-172 189 16
-189 189 16
-213 189 16
-230 180 16
-246 180 16
-246 172 32
-255 172 49
-255 172 65
-0 213 16
-16 213 16
-32 213 16
-57 213 16
-82 213 16
-106 213 16
-123 213 16
-148 213 16
-172 213 16
-189 213 16
-213 213 16
-230 205 16
-246 197 16
-246 189 32
-255 189 49
-255 189 65
-0 230 16
-16 230 16
-32 230 16
-57 230 16
-74 230 16
-98 230 16
-123 230 16
-139 230 16
-164 230 16
-189 230 16
-205 230 16
-230 230 16
-246 222 16
-246 205 32
-255 205 49
-255 197 65
-0 246 16
-16 246 16
-41 246 16
-57 246 16
-82 246 16
-98 246 16
-123 246 16
-139 246 16
-164 246 16
-180 246 16
-205 246 16
-222 246 16
-246 246 16
-246 222 32
-255 222 49
-255 213 65
-0 255 16
-32 246 32
-49 246 32
-65 246 32
-82 246 32
-98 246 32
-123 246 32
-139 246 32
-156 246 32
-172 246 32
-189 246 32
-213 246 32
-230 246 32
-246 246 32
-255 238 49
-255 230 65
-16 255 32
-49 255 49
-65 255 49
-82 255 49
-98 255 49
-115 255 49
-131 255 49
-148 255 49
-164 255 49
-172 255 49
-197 255 49
-205 255 49
-222 255 49
-238 255 49
-255 255 49
-255 246 65
-49 255 57
-65 255 65
-82 255 65
-90 255 65
-106 255 65
-123 255 65
-131 255 65
-148 255 65
-164 255 65
-180 255 65
-189 255 65
-205 255 65
-222 255 65
-230 255 65
-246 255 65
-255 255 65
diff --git a/graphics/misc/sunny_day/34.pal b/graphics/misc/sunny_day/34.pal
deleted file mode 100644
index 0ddddc444..000000000
--- a/graphics/misc/sunny_day/34.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 41
-24 8 41
-41 8 41
-57 8 41
-74 8 41
-90 8 41
-106 8 41
-156 0 49
-180 0 41
-197 0 41
-213 0 41
-230 0 41
-246 0 41
-255 0 41
-255 16 57
-255 49 74
-8 24 41
-24 24 41
-41 24 41
-57 24 41
-74 24 41
-90 24 41
-139 24 41
-156 16 41
-172 16 41
-189 16 41
-213 16 32
-230 16 32
-246 16 41
-246 32 49
-255 49 65
-255 65 82
-8 41 41
-24 41 41
-41 41 41
-57 41 41
-74 41 41
-115 41 41
-131 41 41
-156 41 41
-172 32 32
-189 32 32
-205 32 32
-222 41 41
-230 49 49
-238 65 65
-255 65 65
-255 82 82
-8 57 41
-24 57 41
-41 57 41
-57 57 41
-74 57 41
-115 65 41
-131 65 41
-156 57 41
-172 57 32
-189 57 32
-205 57 32
-222 57 41
-230 65 49
-238 82 65
-255 82 65
-255 90 82
-8 74 41
-24 74 41
-41 74 41
-57 74 41
-74 74 41
-115 90 41
-131 90 41
-156 82 41
-172 82 32
-189 82 32
-205 74 32
-222 74 41
-230 82 49
-238 90 65
-255 98 65
-255 106 82
-8 90 41
-24 90 41
-41 115 41
-65 115 41
-90 115 41
-115 115 41
-131 106 41
-156 106 41
-172 106 32
-189 98 32
-205 98 32
-222 98 41
-230 98 49
-238 115 65
-255 115 65
-255 115 82
-8 106 41
-24 139 41
-41 131 41
-65 131 41
-90 131 41
-106 131 41
-131 131 41
-156 131 41
-172 123 32
-189 123 32
-205 123 32
-222 115 41
-230 115 49
-238 123 65
-255 123 65
-255 131 82
-0 156 41
-16 156 41
-41 156 41
-57 156 41
-82 156 41
-106 156 41
-131 156 41
-156 156 41
-172 148 32
-189 148 32
-205 139 32
-222 139 41
-230 139 49
-238 139 65
-255 139 65
-255 148 82
-0 180 41
-16 172 41
-32 172 32
-57 172 32
-82 172 32
-106 172 32
-123 172 32
-148 172 32
-172 172 32
-189 164 32
-205 164 32
-222 156 41
-230 156 49
-238 156 65
-255 164 65
-255 156 82
-0 197 41
-16 189 41
-32 189 32
-57 189 32
-82 189 32
-98 189 32
-123 189 32
-148 189 32
-172 189 32
-189 189 32
-205 189 32
-222 180 41
-230 172 49
-238 172 65
-255 172 65
-255 172 82
-0 213 32
-16 213 32
-32 205 32
-57 205 32
-74 205 32
-98 205 32
-123 205 32
-148 205 32
-164 205 32
-189 205 32
-205 205 32
-222 197 41
-230 189 49
-238 189 65
-255 189 65
-255 189 82
-0 230 32
-16 230 32
-41 222 41
-57 222 41
-82 222 41
-98 222 41
-123 222 41
-139 222 41
-164 222 41
-180 222 41
-205 222 41
-222 222 41
-230 205 49
-238 205 65
-255 205 65
-255 205 82
-0 246 32
-16 246 32
-49 230 49
-65 230 49
-82 230 49
-98 230 49
-123 230 49
-139 230 49
-156 230 49
-172 230 49
-189 230 49
-213 230 49
-230 230 49
-238 222 65
-255 222 65
-255 213 82
-0 255 41
-32 246 41
-65 238 65
-82 238 65
-98 238 65
-115 238 65
-131 238 65
-148 238 65
-164 238 65
-172 238 65
-189 238 65
-205 238 65
-222 238 65
-238 238 65
-255 238 65
-255 230 82
-16 255 49
-49 255 65
-65 255 65
-82 255 65
-98 255 65
-115 255 65
-131 255 65
-148 255 65
-164 255 65
-172 255 65
-189 255 65
-205 255 65
-222 255 65
-238 255 65
-255 255 65
-255 246 82
-49 255 74
-65 255 74
-82 255 82
-90 255 82
-106 255 82
-123 255 82
-139 255 82
-148 255 82
-164 255 82
-180 255 82
-189 255 82
-205 255 82
-213 255 82
-230 255 82
-246 255 82
-255 255 82
diff --git a/graphics/misc/sunny_day/35.pal b/graphics/misc/sunny_day/35.pal
deleted file mode 100644
index 8f81dda6d..000000000
--- a/graphics/misc/sunny_day/35.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 57
-24 8 57
-41 8 57
-57 8 57
-74 8 57
-90 8 57
-106 8 57
-156 0 65
-180 0 65
-197 0 65
-213 0 57
-230 0 65
-246 0 57
-255 0 57
-255 16 74
-255 49 90
-8 24 57
-24 24 57
-41 24 57
-57 24 57
-74 24 57
-90 24 57
-139 24 65
-156 16 65
-172 16 65
-189 16 57
-213 16 57
-230 16 57
-246 16 57
-246 32 65
-255 49 82
-255 65 90
-8 41 57
-24 41 57
-41 41 57
-57 41 57
-74 41 57
-115 41 65
-131 41 65
-156 41 57
-172 32 57
-189 32 57
-205 32 57
-222 41 57
-230 49 65
-238 65 82
-255 65 82
-255 82 90
-8 57 57
-24 57 57
-41 57 57
-57 57 57
-90 65 65
-115 65 65
-131 57 57
-148 57 57
-172 57 57
-189 57 57
-205 57 57
-213 65 65
-222 82 82
-238 82 82
-255 82 82
-255 98 98
-8 74 57
-24 74 57
-41 74 57
-65 90 65
-90 90 65
-115 90 65
-131 82 57
-148 82 57
-172 74 57
-189 74 57
-205 74 57
-213 82 65
-222 90 82
-238 98 82
-255 98 82
-255 106 98
-8 90 57
-24 90 57
-41 115 65
-65 115 65
-90 115 65
-115 115 65
-131 106 57
-148 106 57
-172 98 57
-189 98 57
-205 98 57
-213 98 65
-222 115 82
-238 115 82
-255 115 82
-255 123 98
-8 106 57
-24 139 65
-41 131 65
-57 131 57
-82 131 57
-106 131 57
-131 131 57
-148 131 57
-172 123 57
-189 123 57
-205 115 57
-213 115 65
-222 123 82
-238 123 82
-255 131 82
-255 139 98
-0 156 65
-16 156 65
-41 156 57
-57 148 57
-82 148 57
-106 148 57
-131 148 57
-148 148 57
-172 148 57
-189 139 57
-205 139 57
-213 139 65
-222 139 82
-238 139 82
-255 139 82
-255 148 98
-0 180 65
-16 172 65
-32 172 57
-57 172 57
-82 172 57
-98 172 57
-123 172 57
-148 172 57
-172 172 57
-189 164 57
-205 156 57
-213 156 65
-222 156 82
-238 164 82
-255 164 82
-255 164 98
-0 197 57
-16 189 57
-32 189 57
-57 189 57
-74 189 57
-98 189 57
-123 189 57
-139 189 57
-164 189 57
-189 189 57
-205 180 57
-213 172 65
-222 172 82
-238 172 82
-255 172 82
-255 180 98
-0 213 57
-16 213 57
-32 205 57
-57 205 57
-74 205 57
-98 205 57
-123 205 57
-139 205 57
-164 205 57
-180 205 57
-205 205 57
-213 189 65
-222 189 82
-238 189 82
-255 189 82
-255 189 98
-0 230 57
-16 230 49
-41 222 57
-65 213 65
-82 213 65
-98 213 65
-123 213 65
-139 213 65
-156 213 65
-172 213 65
-197 213 65
-213 213 65
-222 205 82
-238 205 82
-255 205 82
-255 205 98
-0 246 57
-16 246 57
-49 230 65
-82 222 82
-98 222 82
-115 222 82
-131 222 82
-148 222 82
-164 222 82
-172 222 82
-189 222 82
-213 222 82
-222 222 82
-238 222 82
-255 222 82
-255 222 98
-0 255 57
-32 246 65
-65 238 82
-82 238 82
-98 238 82
-115 238 82
-131 238 82
-148 238 82
-164 238 82
-172 238 82
-189 238 82
-205 238 82
-222 238 82
-238 238 82
-255 238 82
-255 230 98
-16 255 65
-49 255 82
-65 255 82
-82 255 82
-98 255 82
-115 255 82
-131 255 82
-148 255 82
-164 255 82
-180 255 82
-189 255 82
-205 255 82
-222 255 82
-238 255 82
-255 255 82
-255 246 98
-49 255 82
-65 255 90
-82 255 90
-98 255 98
-106 255 98
-123 255 98
-139 255 98
-148 255 98
-164 255 98
-180 255 98
-189 255 98
-205 255 98
-222 255 98
-230 255 98
-246 255 98
-255 255 98
diff --git a/graphics/misc/sunny_day/36.pal b/graphics/misc/sunny_day/36.pal
deleted file mode 100644
index 4797f3887..000000000
--- a/graphics/misc/sunny_day/36.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 74
-24 8 74
-41 8 74
-57 8 74
-74 8 74
-90 8 74
-106 8 74
-156 0 90
-180 0 90
-197 0 82
-213 0 82
-230 0 82
-246 0 82
-255 0 82
-255 16 90
-255 49 98
-8 24 74
-24 24 74
-41 24 74
-57 24 74
-74 24 74
-90 24 74
-139 24 90
-156 16 90
-172 16 82
-189 16 82
-213 16 82
-230 16 74
-246 16 82
-246 32 82
-255 49 98
-255 65 106
-8 41 74
-24 41 74
-41 41 74
-57 41 74
-74 41 74
-115 41 90
-131 41 90
-156 41 82
-172 32 82
-189 32 82
-205 32 74
-222 41 82
-230 49 82
-238 65 98
-255 65 98
-255 82 106
-8 57 74
-24 57 74
-41 57 74
-65 65 90
-90 65 90
-115 65 90
-131 57 82
-148 57 82
-172 57 82
-189 57 74
-205 57 74
-213 65 82
-222 82 98
-238 82 98
-255 82 98
-255 98 106
-8 74 74
-24 74 74
-41 74 74
-65 90 90
-90 82 82
-106 82 82
-131 82 82
-148 74 74
-164 74 74
-180 74 74
-197 82 82
-205 98 98
-222 98 98
-238 98 98
-255 98 98
-255 115 115
-8 90 74
-24 90 74
-41 115 90
-65 115 90
-82 106 82
-106 106 82
-131 106 82
-148 98 74
-164 98 74
-180 98 74
-197 98 82
-205 115 98
-222 115 98
-238 115 98
-255 115 98
-255 123 115
-8 106 74
-24 139 90
-41 131 90
-57 131 82
-82 131 82
-106 131 82
-131 131 82
-148 123 74
-164 123 74
-180 115 74
-197 115 82
-205 131 98
-222 131 98
-238 131 98
-255 131 98
-255 139 115
-0 156 90
-16 156 90
-41 156 82
-57 148 82
-74 148 74
-98 148 74
-123 148 74
-148 148 74
-164 148 74
-180 139 74
-197 139 82
-205 139 98
-222 139 98
-238 139 98
-255 148 98
-255 156 115
-0 180 90
-16 172 82
-32 172 82
-57 172 74
-74 164 74
-98 164 74
-123 164 74
-148 164 74
-164 164 74
-180 164 74
-197 156 82
-205 156 98
-222 164 98
-238 156 98
-255 156 98
-255 164 115
-0 197 82
-16 189 82
-32 189 82
-57 189 74
-74 180 74
-98 180 74
-123 180 74
-139 180 74
-164 180 74
-180 180 74
-197 172 82
-205 172 98
-222 172 98
-238 172 98
-255 180 98
-255 180 115
-0 213 82
-16 213 74
-32 205 74
-57 205 74
-82 197 82
-98 197 82
-123 197 82
-139 197 82
-156 197 82
-172 197 82
-197 197 82
-205 189 98
-222 189 98
-238 189 98
-255 189 98
-255 189 115
-0 230 74
-16 230 74
-41 222 74
-65 213 82
-98 205 98
-115 205 98
-131 205 98
-148 205 98
-164 205 98
-172 205 98
-197 205 98
-205 205 98
-222 205 98
-238 205 98
-255 205 98
-255 205 115
-0 246 74
-16 246 74
-49 230 82
-82 222 90
-98 222 98
-115 222 98
-131 222 98
-148 222 98
-164 222 98
-180 222 98
-189 222 98
-205 222 98
-222 222 98
-238 222 98
-255 222 98
-255 213 115
-0 255 82
-32 246 82
-65 238 90
-82 238 98
-98 238 98
-115 238 98
-131 238 98
-148 238 98
-164 238 98
-180 238 98
-189 238 98
-205 238 98
-222 238 98
-238 238 98
-255 238 98
-255 230 115
-16 255 90
-49 255 90
-65 255 98
-82 255 98
-98 255 98
-115 255 98
-131 255 98
-148 255 98
-164 255 98
-180 255 98
-189 255 98
-205 255 98
-222 255 98
-238 255 98
-255 255 98
-255 246 115
-49 255 98
-65 255 98
-82 255 106
-98 255 106
-115 255 115
-131 255 115
-139 255 115
-156 255 115
-164 255 115
-180 255 115
-197 255 115
-205 255 115
-222 255 115
-230 255 115
-246 255 115
-255 255 115
diff --git a/graphics/misc/sunny_day/37.pal b/graphics/misc/sunny_day/37.pal
deleted file mode 100644
index f65232b01..000000000
--- a/graphics/misc/sunny_day/37.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 90
-24 8 90
-41 8 90
-57 8 90
-74 8 90
-90 8 90
-106 8 90
-156 0 115
-180 0 115
-197 0 106
-213 0 106
-230 0 106
-246 0 98
-255 0 98
-255 16 106
-255 49 115
-8 24 90
-24 24 90
-41 24 90
-57 24 90
-74 24 90
-90 24 90
-139 24 115
-156 16 106
-172 16 106
-189 16 106
-213 16 106
-230 16 98
-246 16 98
-246 32 98
-255 49 115
-255 65 123
-8 41 90
-24 41 90
-41 41 115
-65 41 115
-90 41 115
-115 41 115
-131 41 106
-156 41 106
-172 32 106
-189 32 98
-205 32 98
-222 41 98
-230 49 98
-238 65 115
-255 65 115
-255 82 123
-8 57 90
-24 57 90
-41 65 115
-65 65 115
-90 65 115
-115 65 115
-131 57 106
-148 57 106
-172 57 98
-189 57 98
-205 57 98
-213 65 98
-222 82 115
-238 82 115
-255 82 115
-255 98 123
-8 74 90
-24 74 90
-41 90 115
-65 90 115
-82 82 106
-106 82 106
-131 82 106
-148 74 98
-164 74 98
-180 74 98
-197 82 98
-205 98 115
-222 98 115
-238 98 115
-255 98 115
-255 115 131
-8 90 90
-24 90 90
-41 115 115
-65 115 115
-82 106 106
-106 98 98
-131 98 98
-148 98 98
-164 98 98
-180 98 98
-197 106 106
-205 115 115
-222 115 115
-238 115 115
-255 123 123
-255 131 131
-8 106 90
-24 139 115
-41 131 106
-57 131 106
-82 131 106
-98 131 98
-131 131 98
-148 123 98
-164 115 98
-180 115 98
-197 123 106
-205 123 115
-222 131 115
-238 131 115
-255 131 123
-255 139 131
-0 156 115
-16 156 106
-41 156 106
-57 148 106
-74 148 98
-98 148 98
-123 148 98
-148 148 98
-164 139 98
-180 139 98
-197 139 106
-205 139 115
-222 148 115
-238 148 115
-255 148 123
-255 156 131
-0 180 106
-16 172 106
-32 172 106
-57 172 98
-74 164 98
-98 164 98
-115 164 98
-139 164 98
-164 164 98
-180 156 98
-197 156 106
-205 164 115
-222 156 115
-238 164 115
-255 164 123
-255 164 131
-0 197 106
-16 189 106
-32 189 98
-57 189 98
-74 180 98
-98 180 98
-115 180 98
-139 180 98
-156 180 98
-180 180 98
-197 172 106
-205 172 115
-222 172 115
-238 180 115
-255 180 123
-255 180 131
-0 213 106
-16 213 98
-32 205 98
-57 205 98
-82 197 98
-106 197 106
-123 197 106
-139 197 106
-164 197 106
-180 197 106
-197 197 106
-205 189 115
-222 189 115
-238 189 115
-255 189 123
-255 197 131
-0 230 98
-16 230 98
-41 222 98
-65 213 98
-98 205 115
-115 205 115
-131 205 115
-148 205 115
-164 205 115
-172 205 115
-189 205 115
-205 205 115
-222 205 115
-238 205 115
-255 205 123
-255 205 131
-0 246 98
-16 246 98
-49 230 98
-82 222 115
-98 222 115
-115 222 115
-131 222 115
-148 222 115
-164 222 115
-180 222 115
-189 222 115
-213 222 115
-222 222 115
-238 222 115
-255 222 123
-255 222 131
-0 255 98
-32 246 98
-65 238 115
-82 238 115
-98 238 115
-115 238 115
-131 238 115
-148 238 115
-164 238 115
-180 238 115
-197 238 115
-205 238 115
-222 238 115
-238 238 115
-255 238 123
-255 230 131
-16 255 98
-49 255 115
-65 255 115
-82 255 115
-98 255 115
-123 255 123
-131 255 123
-148 255 123
-164 255 123
-180 255 123
-197 255 123
-205 255 123
-222 255 123
-238 255 123
-255 255 123
-255 246 131
-49 255 115
-65 255 115
-82 255 115
-98 255 123
-115 255 123
-131 255 131
-139 255 131
-156 255 131
-172 255 131
-180 255 131
-197 255 131
-205 255 131
-222 255 131
-230 255 131
-246 255 131
-255 255 131
diff --git a/graphics/misc/sunny_day/38.pal b/graphics/misc/sunny_day/38.pal
deleted file mode 100644
index ddb2442fb..000000000
--- a/graphics/misc/sunny_day/38.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 106
-24 8 106
-41 8 106
-57 8 106
-74 8 106
-90 8 106
-106 8 106
-156 0 139
-180 0 131
-197 0 131
-213 0 123
-230 0 123
-246 0 123
-255 0 123
-255 16 123
-255 49 131
-8 24 106
-24 24 139
-41 24 139
-65 24 139
-90 24 139
-115 24 139
-139 24 139
-156 16 131
-172 16 131
-189 16 131
-213 16 123
-230 16 123
-246 16 123
-246 32 123
-255 49 131
-255 65 131
-8 41 106
-24 41 139
-41 41 131
-65 41 131
-90 41 131
-106 41 131
-131 41 131
-156 41 131
-172 32 123
-189 32 123
-205 32 123
-222 41 123
-230 49 123
-238 65 131
-255 65 131
-255 82 139
-8 57 106
-24 65 139
-41 65 131
-57 57 131
-82 57 131
-106 57 131
-131 57 131
-148 57 131
-172 57 123
-189 57 123
-205 57 123
-213 65 123
-222 82 131
-238 82 131
-255 82 131
-255 98 139
-8 74 106
-24 90 139
-41 90 131
-57 82 131
-82 82 131
-106 82 131
-131 82 131
-148 74 123
-164 74 123
-180 74 123
-197 82 123
-205 98 131
-222 98 131
-238 98 131
-255 98 131
-255 115 139
-8 90 106
-24 115 139
-41 106 131
-57 106 131
-82 106 131
-98 98 131
-131 98 131
-148 98 123
-164 98 115
-180 98 115
-197 106 123
-205 115 131
-222 115 131
-238 115 131
-255 123 131
-255 131 139
-8 106 106
-24 139 139
-41 131 131
-57 131 131
-82 131 131
-98 131 131
-123 115 115
-148 115 115
-156 115 115
-180 123 123
-197 123 123
-205 131 131
-222 131 131
-238 131 131
-255 139 139
-255 148 148
-0 156 139
-16 156 131
-41 156 131
-57 148 131
-74 148 123
-98 148 123
-115 148 115
-148 148 115
-156 139 115
-180 139 123
-197 139 123
-205 148 131
-222 148 131
-238 148 131
-255 148 139
-255 156 148
-0 180 131
-16 172 123
-32 172 123
-57 172 123
-74 164 123
-98 164 115
-115 156 115
-139 156 115
-156 156 115
-180 156 123
-197 164 123
-205 156 131
-222 164 131
-238 164 131
-255 164 139
-255 172 148
-0 197 123
-16 189 123
-32 189 123
-57 189 123
-74 180 115
-98 180 115
-123 180 123
-139 180 123
-164 180 123
-180 180 123
-197 180 123
-205 172 131
-222 180 131
-238 180 131
-255 180 139
-255 180 148
-0 213 123
-16 213 123
-32 205 123
-57 205 115
-82 197 115
-106 197 123
-123 197 123
-139 197 123
-164 197 123
-180 197 123
-197 197 123
-205 189 131
-222 189 131
-238 189 131
-255 197 139
-255 197 148
-0 230 123
-16 230 123
-41 222 115
-65 213 115
-98 205 131
-115 205 123
-131 205 131
-148 205 131
-164 205 131
-180 205 131
-189 205 131
-205 205 131
-222 205 131
-238 205 131
-255 205 139
-255 205 148
-0 246 123
-16 246 115
-49 230 115
-82 222 123
-98 222 131
-115 222 131
-131 222 131
-148 222 131
-164 222 131
-180 222 131
-197 222 131
-205 222 131
-222 222 131
-238 222 131
-255 222 139
-255 222 148
-0 255 115
-32 246 115
-65 238 123
-82 238 123
-98 238 131
-115 238 131
-131 238 131
-148 238 131
-164 238 131
-180 238 131
-197 238 131
-205 238 131
-222 238 131
-238 238 131
-255 238 139
-255 230 148
-16 255 115
-49 255 123
-65 255 123
-82 255 131
-98 255 131
-123 255 131
-139 255 139
-156 255 139
-164 255 139
-180 255 139
-197 255 139
-213 255 139
-222 255 139
-238 255 139
-255 255 139
-255 246 148
-49 255 123
-65 255 131
-82 255 131
-98 255 139
-115 255 139
-131 255 139
-148 255 148
-156 255 148
-172 255 148
-180 255 148
-197 255 148
-213 255 148
-222 255 148
-238 255 148
-246 255 148
-255 255 148
diff --git a/graphics/misc/sunny_day/39.pal b/graphics/misc/sunny_day/39.pal
deleted file mode 100644
index b98692692..000000000
--- a/graphics/misc/sunny_day/39.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 156
-16 0 156
-41 0 156
-65 0 156
-90 0 156
-115 0 156
-139 0 156
-156 0 156
-180 0 156
-197 0 156
-213 0 148
-230 0 148
-246 0 139
-255 0 139
-255 16 139
-255 49 148
-0 24 156
-16 16 156
-41 16 156
-65 16 156
-90 16 156
-106 16 156
-131 16 156
-156 16 156
-172 16 156
-189 16 148
-213 16 148
-230 16 139
-246 16 139
-246 32 139
-255 49 148
-255 65 148
-0 49 156
-16 41 156
-41 41 156
-57 41 156
-82 41 156
-106 41 156
-131 41 156
-156 41 156
-172 32 148
-189 32 148
-205 32 148
-222 41 139
-230 49 139
-238 65 148
-255 65 148
-255 82 148
-0 65 156
-16 65 156
-41 57 156
-57 57 148
-82 57 148
-106 57 148
-131 57 148
-148 57 148
-172 57 148
-189 57 139
-205 57 139
-213 65 139
-222 82 148
-238 82 148
-255 82 148
-255 98 148
-0 90 156
-16 90 156
-41 82 156
-57 82 148
-74 74 148
-98 74 148
-123 74 148
-148 74 148
-164 74 148
-180 74 139
-197 82 139
-205 98 148
-222 98 148
-238 98 148
-255 98 148
-255 115 156
-0 115 156
-16 106 156
-41 106 156
-57 106 148
-74 98 148
-98 98 148
-123 98 148
-148 98 148
-164 98 139
-180 98 139
-197 106 139
-205 115 148
-222 115 148
-238 115 148
-255 123 148
-255 131 156
-0 139 156
-16 131 156
-41 131 156
-57 131 148
-74 123 148
-98 123 148
-115 115 148
-148 115 148
-156 115 139
-180 123 139
-197 123 139
-205 131 148
-222 131 148
-238 131 148
-255 139 156
-255 148 156
-0 156 156
-16 156 156
-41 156 156
-57 148 148
-74 148 148
-98 148 148
-115 148 148
-139 131 131
-164 139 139
-180 139 139
-197 148 148
-205 148 148
-222 148 148
-238 148 148
-255 156 156
-255 164 164
-0 180 156
-16 172 148
-32 172 148
-57 172 148
-74 164 148
-98 164 139
-115 156 139
-139 164 139
-164 164 139
-180 164 139
-197 156 148
-205 164 148
-222 164 148
-238 164 148
-255 164 156
-255 172 164
-0 197 148
-16 189 148
-32 189 148
-57 189 139
-74 180 139
-98 180 139
-123 180 139
-139 180 139
-164 180 139
-180 180 139
-197 172 148
-205 180 148
-222 180 148
-238 180 148
-255 180 156
-255 189 164
-0 213 148
-16 213 139
-32 205 139
-57 205 139
-82 197 139
-106 197 139
-123 197 139
-148 197 148
-164 197 148
-180 197 148
-197 197 148
-205 197 148
-222 189 148
-238 197 148
-255 197 156
-255 197 164
-0 230 139
-16 230 139
-41 222 139
-65 213 139
-98 205 139
-115 205 139
-131 205 148
-148 205 148
-164 205 148
-180 205 148
-197 205 148
-205 205 148
-222 205 148
-238 205 148
-255 205 156
-255 213 164
-0 246 139
-16 246 139
-49 230 139
-82 222 139
-98 222 139
-115 222 148
-131 222 148
-148 222 148
-164 222 148
-180 222 148
-197 222 148
-205 222 148
-222 222 148
-238 222 148
-255 222 156
-255 222 164
-0 255 139
-32 246 139
-65 238 139
-82 238 139
-98 238 139
-115 238 148
-131 238 148
-148 238 148
-164 238 148
-180 238 148
-197 238 148
-205 238 148
-222 238 148
-238 238 148
-255 238 156
-255 238 164
-16 255 139
-49 255 139
-65 255 139
-82 255 139
-98 255 148
-123 255 148
-139 255 148
-156 255 156
-172 255 156
-180 255 156
-197 255 156
-213 255 156
-222 255 156
-238 255 156
-255 255 156
-255 246 164
-49 255 139
-65 255 148
-82 255 148
-98 255 148
-115 255 156
-131 255 156
-148 255 156
-164 255 164
-180 255 164
-189 255 164
-197 255 164
-213 255 164
-222 255 164
-238 255 164
-246 255 164
-255 255 164
diff --git a/graphics/misc/sunny_day/4.pal b/graphics/misc/sunny_day/4.pal
deleted file mode 100644
index 2c72d05af..000000000
--- a/graphics/misc/sunny_day/4.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 74
-24 8 74
-41 8 74
-57 8 74
-74 8 74
-90 8 74
-106 8 74
-139 0 82
-156 0 74
-172 0 74
-189 0 74
-205 0 74
-222 0 74
-238 0 74
-255 0 74
-255 24 90
-8 24 74
-24 24 74
-41 24 74
-57 24 74
-74 24 74
-90 24 74
-115 16 82
-131 16 74
-156 16 74
-172 16 74
-189 16 74
-205 16 74
-222 16 74
-238 16 74
-246 32 82
-255 41 90
-8 41 74
-24 41 74
-41 41 74
-57 41 74
-74 41 74
-98 41 82
-115 41 74
-131 41 74
-148 32 74
-172 32 74
-189 32 74
-205 32 74
-222 32 74
-230 49 82
-246 49 82
-255 57 90
-8 57 74
-24 57 74
-41 57 74
-57 57 74
-74 57 74
-98 57 74
-115 57 74
-131 57 74
-148 57 74
-164 57 74
-189 49 74
-205 57 74
-213 65 82
-230 65 82
-246 65 90
-255 74 90
-8 74 74
-24 74 74
-41 74 74
-57 74 74
-74 74 74
-98 74 74
-115 74 74
-131 74 74
-148 74 74
-164 74 74
-180 74 74
-197 82 82
-213 82 82
-230 82 82
-246 82 82
-255 90 90
-8 90 74
-24 90 74
-41 98 74
-57 98 74
-74 98 74
-98 98 74
-115 90 74
-131 90 74
-148 90 74
-164 90 74
-180 90 74
-197 98 82
-213 98 82
-230 98 82
-246 98 82
-255 106 90
-8 106 74
-16 115 74
-41 115 74
-57 115 74
-74 115 74
-90 115 74
-115 115 74
-131 115 74
-148 115 74
-164 106 74
-180 106 74
-197 115 82
-213 115 82
-230 115 82
-246 115 82
-255 123 90
-0 139 74
-16 131 74
-41 131 74
-57 131 74
-74 131 74
-90 131 74
-115 131 74
-131 131 74
-148 131 74
-164 131 74
-180 131 74
-197 131 82
-213 131 82
-230 131 82
-246 131 82
-255 139 90
-0 156 74
-16 156 74
-32 148 74
-57 148 74
-74 148 74
-90 148 74
-115 148 74
-131 148 74
-148 148 74
-164 148 74
-180 148 74
-197 148 82
-213 148 82
-230 148 82
-246 148 82
-255 148 90
-0 172 74
-16 172 74
-32 172 74
-57 164 74
-74 164 74
-90 164 74
-106 164 74
-131 164 74
-148 164 74
-164 164 74
-180 164 74
-197 164 82
-213 164 82
-230 164 82
-246 164 82
-255 164 90
-0 189 74
-16 189 74
-32 189 74
-49 189 74
-74 180 74
-90 180 74
-106 180 74
-131 180 74
-148 180 74
-164 180 74
-180 180 74
-197 180 82
-213 180 82
-230 180 82
-246 180 82
-255 180 90
-0 205 74
-16 205 65
-32 205 74
-57 205 74
-82 197 82
-98 197 82
-115 197 82
-131 197 82
-148 197 82
-164 197 82
-180 197 82
-197 197 82
-213 197 82
-230 197 82
-246 197 82
-255 197 90
-0 222 65
-16 222 74
-32 222 65
-65 213 82
-82 213 82
-98 213 82
-115 213 82
-131 213 82
-148 213 82
-164 213 82
-180 213 82
-197 213 82
-213 213 82
-230 213 82
-246 213 82
-255 213 90
-0 238 74
-16 238 74
-49 230 82
-65 230 82
-82 230 82
-98 230 82
-123 230 82
-131 230 82
-148 230 82
-172 230 82
-180 230 82
-197 230 82
-213 230 82
-230 230 82
-246 230 82
-255 222 90
-0 255 74
-32 246 82
-49 246 82
-65 246 82
-82 246 82
-98 246 82
-115 246 82
-131 246 82
-148 246 82
-164 246 82
-180 246 82
-197 246 82
-213 246 82
-230 246 82
-246 246 82
-255 238 90
-24 255 82
-41 255 82
-57 255 90
-74 255 90
-90 255 90
-106 255 90
-123 255 90
-139 255 90
-156 255 90
-172 255 90
-180 255 90
-197 255 90
-213 255 90
-230 255 90
-246 255 90
-255 255 90
diff --git a/graphics/misc/sunny_day/40.pal b/graphics/misc/sunny_day/40.pal
deleted file mode 100644
index 68c85cefd..000000000
--- a/graphics/misc/sunny_day/40.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 180
-16 0 180
-41 0 180
-65 0 180
-90 0 180
-106 0 180
-131 0 180
-156 0 180
-180 0 180
-197 0 172
-213 0 172
-230 0 164
-246 0 164
-255 0 156
-255 16 156
-255 49 156
-0 24 180
-16 16 172
-41 16 172
-65 16 172
-82 16 172
-106 16 172
-123 16 172
-148 16 172
-172 16 172
-189 16 172
-213 16 172
-230 16 164
-246 16 164
-246 32 156
-255 49 164
-255 65 164
-0 41 180
-16 41 172
-32 32 172
-57 32 172
-82 32 172
-106 32 172
-123 32 172
-148 32 172
-172 32 172
-189 32 172
-205 32 164
-222 41 164
-230 49 156
-238 65 164
-255 65 164
-255 82 164
-0 65 180
-16 65 172
-32 57 172
-57 57 172
-74 57 172
-98 57 172
-123 57 172
-148 57 172
-172 57 172
-189 57 164
-205 57 164
-213 65 156
-222 82 164
-238 82 164
-255 82 164
-255 98 164
-0 90 180
-16 82 172
-32 82 172
-57 82 172
-74 74 164
-98 74 164
-123 74 164
-148 74 164
-164 74 164
-180 74 164
-197 82 156
-205 98 164
-222 98 164
-238 98 164
-255 98 164
-255 115 164
-0 115 180
-16 106 172
-32 106 172
-57 98 172
-74 98 164
-98 98 164
-115 98 164
-139 98 164
-164 98 164
-180 98 156
-197 106 164
-205 115 164
-222 115 164
-238 115 164
-255 123 164
-255 131 172
-0 131 180
-16 131 172
-32 123 172
-57 123 172
-74 123 164
-98 115 164
-115 115 156
-139 115 156
-156 115 156
-180 123 164
-197 123 164
-205 131 164
-222 131 164
-238 131 164
-255 139 164
-255 148 172
-0 156 180
-16 156 172
-32 148 172
-57 148 172
-74 148 164
-98 139 164
-115 139 156
-139 139 164
-164 139 164
-180 139 164
-197 148 164
-205 148 164
-222 148 164
-238 148 164
-255 156 172
-255 164 180
-0 180 180
-16 172 172
-32 172 172
-57 172 172
-74 164 164
-98 164 164
-115 156 156
-139 164 164
-164 156 156
-180 156 156
-197 164 164
-213 164 164
-222 164 164
-238 164 164
-255 172 172
-255 189 189
-0 197 172
-16 189 172
-32 189 164
-57 189 164
-74 180 164
-98 180 156
-123 180 156
-139 180 164
-156 180 156
-180 180 156
-197 180 164
-213 180 164
-222 180 164
-238 180 164
-255 180 172
-255 197 189
-0 213 164
-16 213 164
-32 205 164
-57 205 156
-82 197 156
-106 197 156
-123 197 164
-148 197 156
-164 197 164
-180 197 164
-197 197 164
-213 197 164
-222 197 164
-238 197 164
-255 197 172
-255 213 189
-0 230 164
-16 230 164
-41 222 156
-65 213 156
-98 205 156
-115 205 164
-131 205 156
-148 205 164
-164 213 164
-180 213 164
-197 213 164
-213 213 164
-222 205 164
-238 205 164
-255 213 172
-255 222 189
-0 246 156
-16 246 156
-49 230 156
-82 222 156
-98 222 164
-115 222 156
-131 222 164
-148 222 164
-164 222 164
-180 222 164
-197 222 164
-205 222 164
-222 222 164
-238 222 164
-255 222 172
-255 230 189
-0 255 156
-32 246 156
-65 238 156
-82 238 164
-98 238 156
-115 238 164
-131 238 164
-148 238 164
-164 238 164
-180 238 164
-197 238 164
-213 238 164
-222 238 164
-238 238 164
-255 238 172
-255 238 189
-16 255 156
-49 255 156
-65 255 164
-82 255 164
-98 255 156
-123 255 164
-139 255 164
-156 255 164
-172 255 172
-180 255 172
-197 255 172
-213 255 172
-222 255 172
-238 255 172
-255 255 172
-255 246 189
-49 255 156
-65 255 164
-82 255 156
-98 255 164
-115 255 164
-131 255 164
-148 255 172
-164 255 172
-189 255 189
-205 255 189
-213 255 189
-222 255 189
-230 255 189
-238 255 189
-246 255 189
-255 255 189
diff --git a/graphics/misc/sunny_day/41.pal b/graphics/misc/sunny_day/41.pal
deleted file mode 100644
index 121a39ad3..000000000
--- a/graphics/misc/sunny_day/41.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 197
-16 0 197
-41 0 197
-57 0 197
-82 0 197
-106 0 197
-123 0 197
-148 0 197
-172 0 197
-197 0 197
-213 0 189
-230 0 189
-246 0 180
-255 0 180
-255 16 172
-255 49 172
-0 16 197
-16 16 189
-41 16 189
-57 16 189
-82 16 189
-106 16 189
-123 16 189
-148 16 189
-172 16 189
-189 16 189
-213 16 189
-230 16 189
-246 16 180
-246 32 172
-255 49 172
-255 65 180
-0 41 197
-16 41 189
-32 32 189
-57 32 189
-82 32 189
-98 32 189
-123 32 189
-148 32 189
-164 32 189
-189 32 189
-205 32 189
-222 41 180
-230 49 172
-238 65 172
-255 65 172
-255 82 180
-0 65 197
-16 57 189
-32 57 189
-57 57 189
-74 57 189
-98 57 189
-123 57 189
-139 57 189
-164 57 189
-189 57 189
-205 57 180
-213 65 172
-222 82 172
-238 82 172
-255 82 180
-255 98 180
-0 82 197
-16 82 189
-32 82 189
-57 74 189
-74 74 180
-98 74 180
-115 74 180
-139 74 180
-164 74 180
-180 74 180
-197 82 172
-205 98 172
-222 98 180
-238 98 180
-255 98 180
-255 115 180
-0 106 197
-16 106 189
-32 98 189
-57 98 189
-74 98 180
-98 98 180
-115 98 180
-139 98 180
-156 98 180
-180 98 180
-197 106 180
-205 115 172
-222 115 180
-238 115 180
-255 123 180
-255 131 180
-0 131 197
-16 131 189
-32 123 189
-57 123 189
-74 123 180
-98 115 180
-123 123 180
-139 123 180
-156 123 180
-180 123 180
-197 123 180
-205 131 180
-222 131 180
-238 131 180
-255 139 180
-255 148 180
-0 156 197
-16 148 189
-32 148 189
-57 139 189
-74 139 180
-98 139 180
-123 139 180
-139 139 180
-164 139 180
-180 139 180
-197 148 180
-205 148 180
-222 148 180
-238 148 180
-255 156 180
-255 164 189
-0 172 197
-16 172 189
-32 172 189
-57 164 189
-74 164 180
-98 156 180
-123 164 180
-139 164 180
-156 156 180
-180 156 180
-197 164 180
-213 164 180
-222 164 180
-238 164 180
-255 172 180
-255 189 205
-0 197 197
-16 189 189
-32 189 189
-57 189 189
-74 180 180
-98 180 180
-123 180 180
-139 180 180
-156 180 180
-180 172 172
-197 172 172
-213 180 180
-222 180 180
-238 180 180
-255 197 197
-255 205 205
-0 213 189
-16 213 189
-32 205 189
-57 205 180
-82 197 172
-106 197 172
-123 197 180
-148 197 172
-164 197 180
-172 197 172
-197 197 172
-213 197 180
-222 197 180
-238 197 180
-255 205 197
-255 213 205
-0 230 180
-16 230 180
-41 222 180
-65 213 172
-98 205 172
-115 205 172
-131 205 172
-148 205 180
-164 213 180
-180 213 180
-197 213 180
-213 213 180
-222 205 180
-238 213 180
-255 222 197
-255 222 205
-0 246 180
-16 246 180
-49 230 172
-82 222 172
-98 222 172
-115 222 172
-131 222 180
-148 222 180
-164 222 180
-180 222 180
-197 222 180
-213 222 180
-222 222 180
-238 222 180
-255 230 197
-255 230 205
-0 255 180
-32 246 172
-65 238 172
-82 238 172
-98 238 172
-115 238 180
-131 238 180
-148 238 180
-164 238 180
-180 238 180
-197 238 180
-213 238 180
-222 238 180
-238 238 180
-255 238 197
-255 238 205
-16 255 172
-49 255 172
-65 255 172
-82 255 172
-98 255 180
-123 255 180
-139 255 180
-156 255 180
-172 255 180
-197 255 197
-205 255 197
-222 255 197
-230 255 197
-238 255 197
-255 255 197
-255 246 205
-49 255 172
-65 255 172
-82 255 172
-98 255 180
-115 255 180
-131 255 180
-148 255 180
-164 255 189
-189 255 197
-205 255 205
-213 255 205
-222 255 205
-230 255 205
-238 255 205
-246 255 205
-255 255 205
diff --git a/graphics/misc/sunny_day/42.pal b/graphics/misc/sunny_day/42.pal
deleted file mode 100644
index 534316abf..000000000
--- a/graphics/misc/sunny_day/42.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 213
-16 0 213
-32 0 213
-57 0 213
-82 0 213
-106 0 213
-123 0 213
-148 0 213
-164 0 213
-189 0 213
-213 0 213
-230 0 213
-246 0 205
-255 0 197
-255 16 189
-255 49 189
-0 16 213
-16 16 213
-32 16 213
-57 16 213
-74 16 213
-98 16 213
-123 16 213
-139 16 213
-164 16 213
-189 16 213
-213 16 213
-230 16 205
-246 16 205
-246 32 189
-255 49 197
-255 65 189
-0 41 213
-16 32 213
-32 32 205
-57 32 205
-74 32 205
-98 32 205
-123 32 205
-139 32 205
-164 32 205
-189 32 205
-205 32 205
-222 41 205
-230 49 189
-238 65 189
-255 65 189
-255 82 189
-0 57 213
-16 57 213
-32 57 205
-57 57 205
-74 57 205
-98 57 205
-115 57 205
-139 57 205
-156 57 205
-180 57 205
-205 57 205
-213 65 197
-222 82 189
-238 82 189
-255 82 189
-255 98 189
-0 82 213
-16 82 213
-32 74 205
-57 74 205
-82 82 197
-98 82 197
-115 82 197
-139 82 197
-156 82 197
-172 82 197
-197 82 197
-205 98 197
-222 98 189
-238 98 189
-255 98 189
-255 115 197
-0 106 213
-16 106 213
-32 98 205
-57 98 205
-82 98 197
-106 106 197
-123 106 197
-139 106 197
-156 106 197
-172 106 197
-197 106 197
-205 115 189
-222 115 189
-238 115 197
-255 123 197
-255 131 197
-0 123 213
-16 123 213
-32 123 205
-57 123 205
-82 123 197
-106 123 197
-123 123 197
-139 123 197
-164 123 197
-180 123 197
-197 123 197
-205 131 189
-222 131 197
-238 131 197
-255 139 197
-255 148 197
-0 148 213
-16 148 213
-32 148 205
-57 139 205
-82 139 197
-106 139 197
-123 139 197
-148 148 197
-156 148 197
-172 148 197
-197 148 197
-205 148 197
-222 148 197
-238 148 197
-255 156 197
-255 164 197
-0 172 213
-16 172 213
-32 164 205
-57 164 205
-82 156 197
-106 164 197
-123 164 197
-148 164 197
-164 164 197
-180 164 197
-197 164 197
-213 164 197
-222 164 197
-238 164 197
-255 172 197
-255 189 213
-0 189 213
-16 189 213
-32 189 205
-57 180 205
-82 172 197
-106 180 197
-123 180 197
-148 180 197
-164 180 197
-172 172 197
-197 172 197
-213 180 197
-222 180 197
-238 180 197
-255 197 205
-255 205 213
-0 213 213
-16 213 213
-32 205 205
-57 205 205
-82 197 197
-106 197 197
-123 197 197
-148 197 197
-164 197 197
-172 197 197
-197 189 189
-213 197 197
-230 197 197
-238 205 205
-255 213 213
-255 222 222
-0 230 205
-16 230 205
-41 222 197
-65 213 189
-98 205 189
-115 205 189
-131 205 189
-148 205 197
-164 213 197
-180 213 197
-197 213 197
-213 213 197
-230 213 197
-238 222 205
-255 222 213
-255 230 222
-0 246 197
-16 246 197
-49 230 189
-82 222 189
-98 222 189
-115 222 189
-131 222 189
-148 222 189
-164 222 197
-180 222 197
-197 230 197
-213 230 197
-230 230 197
-238 230 205
-255 230 213
-255 238 222
-0 255 197
-32 246 189
-65 238 189
-82 238 189
-98 238 189
-115 238 189
-131 238 189
-148 238 197
-164 238 197
-180 238 197
-205 238 205
-222 238 205
-230 238 205
-238 238 205
-255 246 213
-255 246 222
-16 255 189
-49 255 189
-65 255 189
-82 255 189
-98 255 189
-123 255 189
-139 255 197
-156 255 197
-172 255 197
-197 255 205
-213 255 213
-222 255 213
-230 255 213
-246 255 213
-255 255 213
-255 255 222
-49 255 180
-65 255 189
-82 255 189
-98 255 189
-115 255 189
-131 255 197
-148 255 197
-164 255 197
-189 255 213
-205 255 213
-222 255 222
-230 255 222
-238 255 222
-246 255 222
-255 255 222
-255 255 222
diff --git a/graphics/misc/sunny_day/43.pal b/graphics/misc/sunny_day/43.pal
deleted file mode 100644
index 8fc1e0fb4..000000000
--- a/graphics/misc/sunny_day/43.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 230
-16 0 230
-32 0 230
-57 0 230
-74 0 230
-98 0 230
-123 0 230
-139 0 230
-164 0 230
-180 0 230
-205 0 230
-230 0 230
-246 0 230
-255 0 222
-255 16 213
-255 49 205
-0 16 230
-16 16 230
-32 16 230
-49 16 230
-74 16 230
-98 16 230
-123 16 230
-139 16 230
-164 16 230
-180 16 230
-205 16 230
-230 16 230
-246 16 222
-246 32 213
-255 49 205
-255 65 205
-0 41 230
-16 32 230
-41 41 222
-57 41 222
-74 41 222
-98 41 222
-115 41 222
-139 41 222
-156 41 222
-180 41 222
-197 41 222
-222 41 222
-230 49 213
-238 65 205
-255 65 205
-255 82 205
-0 65 230
-16 57 230
-41 57 222
-65 65 213
-82 65 213
-98 65 213
-115 65 213
-139 65 213
-156 65 213
-172 65 213
-189 65 213
-213 65 213
-222 82 213
-238 82 205
-255 82 205
-255 98 205
-0 82 230
-16 74 230
-41 82 222
-65 82 213
-98 98 205
-115 98 205
-131 98 205
-139 98 205
-156 98 205
-172 98 205
-189 98 205
-205 98 205
-222 98 205
-238 98 205
-255 98 205
-255 115 205
-0 106 230
-16 98 230
-41 98 222
-65 98 213
-98 115 205
-115 115 205
-123 115 205
-139 115 205
-164 115 205
-172 115 205
-189 115 205
-205 115 205
-222 115 213
-238 115 205
-255 123 205
-255 131 205
-0 123 230
-16 123 230
-41 123 222
-65 123 213
-98 131 205
-115 131 205
-131 131 205
-148 131 205
-156 131 205
-172 131 205
-189 131 205
-205 131 205
-222 131 205
-238 131 205
-255 139 213
-255 148 213
-0 148 230
-16 139 230
-41 139 222
-65 139 213
-98 148 205
-115 148 205
-131 148 205
-148 148 205
-164 148 205
-180 148 205
-197 148 205
-205 148 205
-222 148 205
-238 148 205
-255 156 213
-255 164 213
-0 164 230
-16 164 230
-41 164 222
-65 156 213
-98 164 205
-115 164 205
-131 164 205
-148 164 205
-164 164 213
-180 164 213
-197 164 213
-213 164 213
-222 164 205
-238 164 213
-255 172 213
-255 189 222
-0 189 230
-16 189 230
-41 180 222
-65 172 213
-98 172 205
-115 172 205
-131 180 205
-148 180 205
-164 180 213
-180 180 213
-197 180 213
-213 180 213
-222 180 213
-238 180 213
-255 197 222
-255 205 222
-0 213 230
-16 205 230
-41 205 222
-65 197 213
-98 197 205
-115 189 205
-131 189 205
-148 197 205
-164 197 213
-180 197 213
-197 197 213
-213 197 213
-230 197 213
-238 205 222
-255 213 222
-255 222 230
-0 230 230
-16 230 230
-41 222 222
-65 213 213
-98 205 205
-115 205 205
-131 205 205
-148 205 205
-164 213 213
-180 213 213
-197 213 213
-213 213 213
-230 222 222
-246 222 222
-255 230 230
-255 238 238
-0 246 222
-16 246 222
-49 230 205
-82 222 205
-98 222 205
-115 222 205
-131 222 205
-148 222 205
-164 222 205
-180 222 205
-197 230 213
-222 230 222
-230 230 222
-246 230 222
-255 238 230
-255 246 238
-0 255 213
-32 246 205
-65 238 205
-82 238 205
-98 238 205
-115 238 205
-131 238 205
-148 238 205
-164 238 205
-180 238 213
-205 238 222
-222 246 222
-230 246 222
-246 246 222
-255 246 230
-255 246 238
-16 255 205
-49 255 205
-65 255 205
-82 255 205
-98 255 205
-123 255 205
-139 255 205
-156 255 205
-172 255 213
-197 255 222
-213 255 222
-230 255 230
-238 255 230
-246 255 230
-255 255 230
-255 255 238
-49 255 197
-65 255 197
-82 255 205
-98 255 205
-115 255 205
-131 255 205
-148 255 205
-164 255 213
-189 255 222
-205 255 222
-222 255 230
-238 255 238
-246 255 238
-246 255 238
-255 255 238
-255 255 238
diff --git a/graphics/misc/sunny_day/44.pal b/graphics/misc/sunny_day/44.pal
deleted file mode 100644
index 3ee3d9970..000000000
--- a/graphics/misc/sunny_day/44.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 246
-16 0 246
-32 0 246
-57 0 246
-74 0 246
-98 0 246
-123 0 246
-139 0 246
-156 0 246
-180 0 246
-197 0 246
-222 0 246
-246 0 246
-255 0 238
-255 16 230
-255 49 213
-0 16 246
-16 16 246
-32 16 246
-57 16 246
-74 16 246
-98 16 246
-115 16 246
-139 16 246
-156 16 246
-180 16 246
-197 16 246
-222 16 246
-246 16 246
-246 32 230
-255 49 222
-255 65 222
-0 41 246
-16 41 246
-49 49 230
-65 49 230
-82 49 230
-98 49 230
-115 49 230
-139 49 230
-156 49 230
-172 49 230
-189 49 230
-205 49 230
-230 49 230
-238 65 222
-255 65 222
-255 82 213
-0 57 246
-16 57 246
-49 65 230
-82 82 222
-90 82 222
-115 82 222
-123 82 222
-139 82 222
-156 82 222
-172 82 222
-189 82 222
-205 82 222
-222 82 222
-238 82 222
-255 82 222
-255 98 222
-0 82 246
-16 82 246
-49 82 230
-82 98 222
-98 98 222
-115 98 222
-131 98 222
-139 98 222
-164 98 222
-172 98 222
-189 98 222
-205 98 222
-222 98 222
-238 98 222
-255 98 222
-255 115 222
-0 98 246
-16 98 246
-49 98 230
-82 115 222
-98 115 222
-115 115 222
-131 115 222
-148 115 222
-156 115 222
-172 115 222
-189 115 222
-205 115 222
-222 115 222
-238 115 222
-255 123 222
-255 131 222
-0 123 246
-16 123 246
-49 123 230
-82 131 222
-98 131 222
-115 131 222
-131 131 222
-148 131 222
-164 131 222
-180 131 222
-189 131 222
-205 131 222
-222 131 222
-238 131 222
-255 139 222
-255 148 222
-0 139 246
-16 139 246
-49 139 230
-82 148 222
-98 148 222
-115 148 222
-131 148 222
-148 148 222
-164 148 222
-180 148 222
-189 148 222
-205 148 222
-222 148 222
-238 148 222
-255 156 222
-255 164 222
-0 164 246
-16 164 246
-49 156 230
-82 164 222
-98 164 222
-115 164 222
-131 164 222
-148 164 222
-164 164 222
-180 164 222
-197 164 222
-205 164 222
-222 164 222
-238 164 222
-255 172 222
-255 189 230
-0 180 246
-16 180 246
-49 172 230
-82 172 222
-98 180 222
-115 180 222
-131 180 222
-148 180 222
-164 180 222
-180 180 222
-197 180 222
-205 180 222
-222 180 222
-238 180 222
-255 197 230
-255 205 230
-0 205 246
-16 205 246
-49 189 230
-82 189 222
-98 189 222
-115 189 222
-131 197 222
-148 197 222
-164 197 222
-180 197 222
-197 197 230
-213 197 230
-230 197 230
-238 205 230
-255 213 230
-255 222 238
-0 230 246
-16 222 246
-49 213 230
-82 213 222
-98 205 222
-115 213 222
-131 205 222
-148 205 222
-164 205 222
-180 213 222
-197 213 230
-222 222 230
-230 222 230
-246 222 230
-255 230 238
-255 238 246
-0 246 246
-16 246 246
-49 230 230
-82 222 222
-98 222 222
-115 222 222
-131 222 222
-148 222 222
-164 222 222
-180 222 222
-197 230 230
-222 230 230
-238 230 230
-246 238 238
-255 246 246
-255 255 255
-0 255 238
-32 246 222
-65 238 222
-82 238 222
-98 238 222
-115 238 222
-131 238 222
-148 238 222
-164 238 222
-180 238 222
-205 238 230
-222 246 230
-238 246 238
-246 246 238
-255 246 246
-255 255 255
-16 255 222
-49 255 222
-65 255 222
-82 255 222
-98 255 222
-123 255 222
-139 255 222
-156 255 222
-172 255 222
-197 255 230
-213 255 230
-230 255 238
-246 255 246
-246 255 246
-255 255 246
-255 255 255
-49 255 213
-65 255 213
-82 255 213
-98 255 222
-115 255 213
-131 255 222
-148 255 222
-164 255 222
-189 255 230
-205 255 230
-222 255 238
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/45.pal b/graphics/misc/sunny_day/45.pal
deleted file mode 100644
index f63f8a7b4..000000000
--- a/graphics/misc/sunny_day/45.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 255
-16 0 255
-41 0 255
-57 0 255
-82 0 255
-98 0 255
-115 0 255
-139 0 255
-156 0 255
-180 0 255
-197 0 255
-213 0 255
-238 0 255
-255 0 255
-255 16 246
-255 49 230
-0 24 255
-32 32 246
-41 32 246
-65 32 246
-82 32 246
-98 32 246
-115 32 246
-139 32 246
-156 32 246
-172 32 246
-189 32 246
-205 32 246
-222 32 246
-246 32 246
-255 49 238
-255 65 230
-0 41 255
-32 49 246
-65 65 238
-82 65 238
-90 65 238
-115 65 238
-123 65 238
-139 65 238
-156 65 238
-172 65 238
-189 65 238
-205 65 238
-222 65 238
-238 65 238
-255 65 238
-255 82 230
-0 57 255
-32 65 246
-65 82 238
-82 82 238
-98 82 238
-115 82 238
-123 82 238
-139 82 238
-164 82 238
-172 82 238
-189 82 238
-205 82 238
-222 82 238
-238 82 238
-255 82 238
-255 98 230
-0 82 255
-32 82 246
-65 98 238
-82 98 238
-98 98 238
-115 98 238
-131 98 238
-139 98 238
-156 98 238
-172 98 238
-189 98 238
-205 98 238
-222 98 238
-238 98 238
-255 98 238
-255 115 230
-0 98 255
-32 98 246
-65 115 238
-82 115 238
-98 115 238
-115 115 238
-131 115 238
-148 115 238
-164 115 238
-180 115 238
-189 115 238
-205 115 238
-222 115 238
-238 115 238
-255 123 238
-255 131 230
-0 123 255
-32 123 246
-65 131 238
-82 131 238
-98 131 238
-115 131 238
-131 131 238
-148 131 238
-164 131 238
-180 131 238
-189 131 238
-205 131 238
-222 131 238
-238 131 238
-255 139 238
-255 148 238
-0 139 255
-32 139 246
-65 148 238
-82 148 238
-98 148 238
-115 148 238
-131 148 238
-148 148 238
-164 148 238
-180 148 238
-197 148 238
-205 148 238
-222 148 238
-238 148 238
-255 156 238
-255 164 238
-0 156 255
-32 156 246
-65 164 238
-82 164 238
-98 164 238
-115 164 238
-131 164 238
-148 164 238
-164 164 238
-180 164 238
-197 164 238
-205 164 238
-222 164 238
-238 164 238
-255 172 238
-255 189 238
-0 180 255
-32 172 246
-65 172 238
-82 172 238
-98 180 238
-115 180 238
-131 180 238
-148 180 238
-164 180 238
-180 180 238
-197 180 238
-213 180 238
-222 180 238
-238 180 238
-255 197 238
-255 205 238
-0 197 255
-32 189 246
-65 189 238
-82 189 238
-98 189 238
-115 197 238
-131 197 238
-148 197 238
-164 197 238
-180 197 238
-205 205 238
-222 205 238
-230 205 238
-238 205 238
-255 213 246
-255 222 246
-0 222 255
-32 213 246
-65 205 238
-82 205 238
-98 205 238
-115 205 238
-131 205 238
-148 205 238
-164 213 238
-180 213 238
-205 222 238
-222 222 246
-230 222 246
-246 222 246
-255 230 246
-255 238 246
-0 238 255
-32 230 246
-65 222 238
-82 222 238
-98 222 238
-115 222 238
-131 222 238
-148 222 238
-164 222 238
-180 222 238
-205 230 238
-222 230 246
-238 238 246
-246 238 246
-255 246 246
-255 255 255
-0 255 255
-32 246 246
-65 238 238
-82 238 238
-98 238 238
-115 238 238
-131 238 238
-148 238 238
-164 238 238
-180 238 238
-205 238 238
-222 246 246
-238 246 246
-255 246 246
-255 255 255
-255 255 255
-16 255 238
-49 255 238
-65 255 238
-82 255 238
-98 255 238
-123 255 238
-139 255 238
-156 255 238
-172 255 238
-197 255 238
-213 255 246
-230 255 246
-246 255 246
-255 255 255
-255 255 255
-255 255 255
-49 255 230
-65 255 230
-82 255 230
-98 255 230
-115 255 230
-131 255 230
-148 255 230
-164 255 238
-189 255 238
-205 255 238
-222 255 246
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/46.pal b/graphics/misc/sunny_day/46.pal
deleted file mode 100644
index 856a0743a..000000000
--- a/graphics/misc/sunny_day/46.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-16 16 255
-32 16 255
-49 16 255
-65 16 255
-90 16 255
-98 16 255
-115 16 255
-139 16 255
-156 16 255
-172 16 255
-189 16 255
-205 16 255
-222 16 255
-238 16 255
-255 16 255
-255 49 246
-16 41 255
-49 49 255
-65 49 255
-82 49 255
-90 49 255
-115 49 255
-123 49 255
-139 49 255
-156 49 255
-172 49 255
-189 49 255
-205 49 255
-222 49 255
-238 49 255
-255 49 255
-255 65 246
-16 57 255
-49 65 255
-65 65 255
-82 65 255
-98 65 255
-115 65 255
-123 65 255
-139 65 255
-164 65 255
-172 65 255
-189 65 255
-205 65 255
-222 65 255
-238 65 255
-255 65 255
-255 82 246
-16 74 255
-49 82 255
-65 82 255
-82 82 255
-98 82 255
-115 82 255
-131 82 255
-139 82 255
-164 82 255
-172 82 255
-189 82 255
-205 82 255
-222 82 255
-238 82 255
-255 82 255
-255 98 246
-16 90 255
-49 98 255
-65 98 255
-82 98 255
-98 98 255
-115 98 255
-131 98 255
-148 98 255
-156 98 255
-180 98 255
-189 98 255
-205 98 255
-222 98 255
-238 98 255
-255 98 255
-255 115 246
-16 106 255
-49 115 255
-65 115 255
-82 115 255
-98 115 255
-123 123 255
-131 123 255
-148 123 255
-164 123 255
-180 123 255
-189 123 255
-205 123 255
-222 123 255
-238 123 255
-255 123 255
-255 131 246
-16 123 255
-49 131 255
-65 131 255
-82 131 255
-98 131 255
-123 131 255
-139 139 255
-148 139 255
-164 139 255
-180 139 255
-197 139 255
-205 139 255
-222 139 255
-238 139 255
-255 139 255
-255 148 246
-16 139 255
-49 148 255
-65 148 255
-82 148 255
-98 148 255
-123 148 255
-139 156 255
-156 156 255
-164 156 255
-180 156 255
-197 156 255
-205 156 255
-222 156 255
-238 156 255
-255 156 255
-255 164 246
-16 156 255
-49 164 255
-65 164 255
-82 164 255
-98 164 255
-123 164 255
-139 164 255
-156 172 255
-172 172 255
-180 172 255
-197 172 255
-213 172 255
-222 172 255
-238 172 255
-255 172 255
-255 189 246
-16 172 255
-49 172 255
-65 172 255
-82 180 255
-98 180 255
-123 180 255
-139 180 255
-156 180 255
-172 180 255
-197 197 255
-205 197 255
-222 197 255
-230 197 255
-238 197 255
-255 197 255
-255 205 246
-16 189 255
-49 197 255
-65 189 255
-82 189 255
-98 189 255
-123 197 255
-139 197 255
-156 197 255
-172 197 255
-197 205 255
-213 213 255
-222 213 255
-230 213 255
-246 213 255
-255 213 255
-255 222 255
-16 213 255
-49 205 255
-65 205 255
-82 205 255
-98 205 255
-123 205 255
-139 213 255
-156 213 255
-172 213 255
-197 222 255
-213 222 255
-230 230 255
-238 230 255
-246 230 255
-255 230 255
-255 238 255
-16 230 255
-49 222 255
-65 222 255
-82 222 255
-98 222 255
-123 222 255
-139 222 255
-156 222 255
-172 222 255
-197 230 255
-213 230 255
-230 238 255
-246 246 255
-246 246 255
-255 246 255
-255 255 255
-16 246 255
-49 238 255
-65 238 255
-82 238 255
-98 238 255
-123 238 255
-139 238 255
-156 238 255
-172 238 255
-197 238 255
-213 246 255
-230 246 255
-246 246 255
-255 255 255
-255 255 255
-255 255 255
-16 255 255
-49 255 255
-65 255 255
-82 255 255
-98 255 255
-123 255 255
-139 255 255
-156 255 255
-172 255 255
-197 255 255
-213 255 255
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-49 255 238
-65 255 246
-82 255 246
-98 255 246
-115 255 246
-131 255 246
-148 255 246
-164 255 246
-189 255 246
-205 255 246
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/47.pal b/graphics/misc/sunny_day/47.pal
deleted file mode 100644
index 1dfa69803..000000000
--- a/graphics/misc/sunny_day/47.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-49 49 255
-57 49 255
-74 49 255
-82 49 255
-98 49 255
-115 49 255
-123 49 255
-139 49 255
-156 49 255
-172 49 255
-180 49 255
-197 49 255
-213 49 255
-230 49 255
-238 49 255
-255 49 255
-49 57 255
-65 65 255
-74 65 255
-90 65 255
-98 65 255
-115 65 255
-131 65 255
-148 65 255
-164 65 255
-172 65 255
-189 65 255
-197 65 255
-213 65 255
-230 65 255
-246 65 255
-255 65 255
-49 74 255
-65 82 255
-82 82 255
-90 82 255
-106 82 255
-115 82 255
-131 82 255
-148 82 255
-156 82 255
-172 82 255
-189 82 255
-205 82 255
-213 82 255
-230 82 255
-246 82 255
-255 82 255
-49 90 255
-65 90 255
-82 90 255
-98 98 255
-106 98 255
-123 98 255
-139 98 255
-148 98 255
-164 98 255
-180 98 255
-189 98 255
-205 98 255
-222 98 255
-230 98 255
-246 98 255
-255 98 255
-49 98 255
-65 106 255
-82 106 255
-98 106 255
-115 115 255
-123 115 255
-139 115 255
-156 115 255
-164 115 255
-180 115 255
-189 115 255
-205 115 255
-213 115 255
-230 115 255
-246 115 255
-255 115 255
-49 115 255
-65 123 255
-82 123 255
-98 123 255
-115 131 255
-131 131 255
-139 131 255
-156 131 255
-164 131 255
-180 131 255
-197 131 255
-205 131 255
-222 131 255
-230 131 255
-246 131 255
-255 131 255
-49 131 255
-65 131 255
-82 139 255
-98 139 255
-115 139 255
-131 139 255
-148 148 255
-156 148 255
-172 148 255
-180 148 255
-197 148 255
-205 148 255
-222 148 255
-230 148 255
-246 148 255
-255 148 255
-49 148 255
-65 148 255
-82 148 255
-98 148 255
-115 156 255
-131 156 255
-148 156 255
-164 164 255
-172 164 255
-189 164 255
-197 164 255
-213 164 255
-222 164 255
-238 164 255
-246 164 255
-255 164 255
-49 156 255
-65 164 255
-82 164 255
-98 164 255
-115 164 255
-131 172 255
-148 172 255
-164 180 255
-189 189 255
-197 189 255
-213 189 255
-222 189 255
-230 189 255
-238 189 255
-246 189 255
-255 189 255
-49 172 255
-65 180 255
-82 180 255
-98 180 255
-115 180 255
-131 180 255
-148 180 255
-164 189 255
-189 205 255
-205 205 255
-213 205 255
-222 205 255
-230 205 255
-238 205 255
-246 205 255
-255 205 255
-49 189 255
-65 189 255
-82 189 255
-98 189 255
-115 197 255
-131 197 255
-148 197 255
-164 197 255
-189 213 255
-205 213 255
-222 222 255
-230 222 255
-238 222 255
-246 222 255
-255 222 255
-255 222 255
-49 205 255
-65 205 255
-82 205 255
-98 205 255
-115 205 255
-131 205 255
-148 213 255
-164 213 255
-189 222 255
-205 222 255
-222 230 255
-238 238 255
-246 238 255
-246 238 255
-255 238 255
-255 238 255
-49 213 255
-65 222 255
-82 213 255
-98 222 255
-115 222 255
-131 222 255
-148 222 255
-164 222 255
-189 230 255
-205 230 255
-222 238 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 230 255
-65 230 255
-82 230 255
-98 230 255
-115 230 255
-131 230 255
-148 238 255
-164 238 255
-189 238 255
-205 238 255
-222 246 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 246 255
-65 246 255
-82 246 255
-98 246 255
-115 246 255
-131 246 255
-148 246 255
-164 246 255
-189 246 255
-205 246 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 255 255
-65 255 255
-82 255 255
-98 255 255
-115 255 255
-131 255 255
-148 255 255
-164 255 255
-189 255 255
-205 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/48.pal b/graphics/misc/sunny_day/48.pal
deleted file mode 100644
index 06eb9906f..000000000
--- a/graphics/misc/sunny_day/48.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 8
-24 8 8
-41 8 8
-57 8 8
-74 8 8
-90 8 8
-106 8 8
-172 0 0
-189 0 0
-205 0 0
-222 0 0
-238 0 0
-255 0 0
-255 8 8
-255 24 24
-255 57 57
-8 24 8
-24 24 8
-41 24 8
-57 24 8
-74 24 8
-90 24 8
-106 24 8
-172 16 0
-189 16 0
-205 16 0
-222 16 0
-238 16 0
-255 16 0
-255 24 8
-255 41 24
-255 65 57
-8 41 8
-24 41 8
-41 41 8
-57 41 8
-74 41 8
-90 41 8
-106 41 8
-172 49 0
-189 41 0
-205 41 0
-222 41 0
-238 32 0
-255 32 0
-255 49 8
-255 57 24
-255 82 57
-8 57 8
-24 57 8
-41 57 8
-57 57 8
-74 57 8
-90 57 8
-106 57 8
-172 65 0
-189 65 0
-205 65 0
-222 57 0
-238 57 0
-255 57 0
-255 65 8
-255 74 24
-255 90 57
-8 74 8
-24 74 8
-41 74 8
-57 74 8
-74 74 8
-90 74 8
-106 74 8
-172 98 0
-189 90 0
-205 90 0
-222 82 0
-238 82 0
-255 82 0
-255 82 8
-255 90 24
-255 106 57
-8 90 8
-24 90 8
-41 90 8
-57 90 8
-74 90 8
-90 90 8
-106 90 8
-172 123 0
-189 115 0
-205 115 0
-222 106 0
-238 106 0
-255 98 0
-255 98 8
-255 106 24
-255 123 57
-8 106 8
-24 106 8
-41 106 8
-57 106 8
-74 106 8
-90 106 8
-106 106 8
-172 148 0
-189 139 0
-205 131 0
-222 131 0
-238 123 0
-255 123 0
-255 123 8
-255 123 24
-255 131 57
-0 172 0
-24 172 0
-49 172 0
-74 172 0
-98 172 0
-123 172 0
-148 172 0
-172 172 0
-189 164 0
-205 156 0
-222 148 0
-238 148 0
-255 148 0
-255 139 8
-255 139 24
-255 148 57
-0 189 0
-24 189 0
-41 189 0
-74 189 0
-90 189 0
-115 189 0
-139 189 0
-164 189 0
-189 189 0
-205 180 0
-222 172 0
-238 172 0
-255 164 0
-255 156 8
-255 156 24
-255 164 57
-0 205 0
-16 205 0
-41 205 0
-65 205 0
-90 205 0
-115 205 0
-139 205 0
-164 205 0
-189 205 0
-205 205 0
-222 197 0
-238 189 0
-255 189 0
-255 180 8
-255 172 24
-255 172 57
-0 222 0
-16 222 0
-41 222 0
-65 222 0
-90 222 0
-106 222 0
-131 222 0
-156 222 0
-180 222 0
-197 222 0
-222 222 0
-238 213 0
-255 205 0
-255 197 8
-255 189 24
-255 189 57
-0 238 0
-16 238 0
-41 238 0
-65 238 0
-82 238 0
-106 238 0
-131 238 0
-148 238 0
-172 238 0
-197 238 0
-222 238 0
-238 238 0
-255 230 0
-255 213 8
-255 205 24
-255 197 57
-0 255 0
-16 255 0
-41 255 0
-57 255 0
-82 255 0
-106 255 0
-123 255 0
-148 255 0
-172 255 0
-189 255 0
-213 255 0
-238 255 0
-255 255 0
-255 238 8
-255 222 24
-255 213 57
-8 255 8
-32 255 8
-49 255 8
-65 255 8
-90 255 8
-106 255 8
-123 255 8
-148 255 8
-164 255 8
-180 255 8
-197 255 8
-222 255 8
-238 255 8
-255 255 8
-255 238 24
-255 230 57
-24 255 24
-49 255 24
-65 255 24
-82 255 24
-98 255 24
-115 255 24
-131 255 24
-139 255 24
-164 255 24
-180 255 24
-197 255 24
-213 255 24
-230 255 24
-246 255 24
-255 255 24
-255 238 57
-57 255 57
-65 255 57
-82 255 57
-98 255 57
-106 255 57
-123 255 57
-139 255 57
-148 255 57
-164 255 57
-180 255 57
-189 255 57
-205 255 57
-222 255 57
-230 255 57
-246 255 57
-255 255 57
diff --git a/graphics/misc/sunny_day/49.pal b/graphics/misc/sunny_day/49.pal
deleted file mode 100644
index 0f477a389..000000000
--- a/graphics/misc/sunny_day/49.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 24
-24 8 24
-41 8 24
-57 8 24
-74 8 24
-90 8 24
-106 8 24
-172 0 24
-189 0 24
-205 0 16
-222 0 16
-238 0 16
-255 0 16
-255 8 32
-255 24 49
-255 57 65
-8 24 24
-24 24 24
-41 24 24
-57 24 24
-74 24 24
-90 24 24
-148 16 16
-164 16 16
-189 16 16
-205 16 16
-222 8 8
-246 8 8
-246 24 24
-246 41 41
-255 57 57
-255 74 74
-8 41 24
-24 41 24
-41 41 24
-57 41 24
-74 41 24
-90 41 24
-148 41 16
-164 41 16
-189 41 16
-205 41 16
-222 32 8
-246 32 8
-246 41 24
-246 49 41
-255 74 57
-255 82 74
-8 57 24
-24 57 24
-41 57 24
-57 57 24
-74 57 24
-90 57 24
-148 65 16
-164 65 16
-189 65 16
-205 65 16
-222 57 8
-246 49 8
-246 57 24
-246 65 41
-255 90 57
-255 98 74
-8 74 24
-24 74 24
-41 74 24
-57 74 24
-74 74 24
-90 74 24
-148 98 16
-164 90 16
-189 90 16
-205 82 16
-222 82 8
-246 74 8
-246 82 24
-246 90 41
-255 98 57
-255 106 74
-8 90 24
-24 90 24
-41 90 24
-57 90 24
-74 90 24
-90 90 24
-148 123 16
-164 115 16
-189 115 16
-205 106 16
-222 106 8
-246 98 8
-246 98 24
-246 106 41
-255 115 57
-255 123 74
-8 106 24
-16 148 16
-49 148 16
-74 148 16
-98 148 16
-123 148 16
-148 148 16
-164 139 16
-189 131 16
-205 131 16
-222 131 8
-246 123 8
-246 123 24
-246 123 41
-255 131 57
-255 139 74
-0 172 16
-16 164 16
-41 164 16
-65 164 16
-90 164 16
-115 164 16
-139 164 16
-164 164 16
-189 156 16
-205 156 16
-222 148 8
-246 148 8
-246 139 24
-246 139 41
-255 148 57
-255 148 74
-0 189 16
-16 189 16
-41 189 16
-65 189 16
-90 189 16
-115 189 16
-139 189 16
-164 189 16
-189 189 16
-205 180 16
-222 172 8
-246 172 8
-246 164 24
-246 156 41
-255 164 57
-255 164 74
-0 205 16
-16 205 16
-41 205 16
-65 205 16
-90 205 16
-106 205 16
-131 205 16
-156 205 16
-180 205 16
-205 205 16
-222 197 8
-246 189 8
-246 180 24
-246 172 41
-255 180 57
-255 180 74
-0 222 16
-8 222 8
-32 222 8
-57 222 8
-82 222 8
-106 222 8
-131 222 8
-156 222 8
-180 222 8
-205 222 8
-222 222 8
-246 213 8
-246 205 24
-246 197 41
-255 197 57
-255 189 74
-0 238 16
-8 246 8
-32 246 8
-57 246 8
-82 246 8
-106 246 8
-123 246 8
-148 246 8
-172 246 8
-197 246 8
-222 246 8
-246 246 8
-246 222 24
-246 213 41
-255 205 57
-255 205 74
-0 255 16
-24 246 24
-49 246 24
-65 246 24
-90 246 24
-106 246 24
-131 246 24
-148 246 24
-164 246 24
-189 246 24
-205 246 24
-230 246 24
-246 246 24
-246 230 41
-255 222 57
-255 222 74
-8 255 24
-41 246 41
-57 246 41
-74 246 41
-90 246 41
-106 246 41
-123 246 41
-139 246 41
-164 246 41
-180 246 41
-197 246 41
-213 246 41
-230 246 41
-246 246 41
-255 238 57
-255 230 74
-24 255 41
-57 255 57
-74 255 57
-90 255 57
-106 255 57
-123 255 57
-131 255 57
-148 255 57
-164 255 57
-180 255 57
-197 255 57
-213 255 57
-230 255 57
-246 255 57
-255 255 57
-255 246 74
-57 255 65
-74 255 74
-90 255 74
-98 255 74
-115 255 74
-131 255 74
-139 255 74
-156 255 74
-164 255 74
-180 255 74
-197 255 74
-205 255 74
-222 255 74
-230 255 74
-246 255 74
-255 255 74
diff --git a/graphics/misc/sunny_day/5.pal b/graphics/misc/sunny_day/5.pal
deleted file mode 100644
index c275f5dc9..000000000
--- a/graphics/misc/sunny_day/5.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 90
-24 8 90
-41 8 90
-57 8 90
-74 8 90
-90 8 90
-106 8 90
-139 0 98
-156 0 98
-172 0 98
-189 0 90
-205 0 98
-222 0 90
-238 0 90
-255 0 90
-255 24 106
-8 24 90
-24 24 90
-41 24 90
-57 24 90
-74 24 90
-90 24 90
-115 16 98
-131 16 98
-156 16 98
-172 16 90
-189 16 90
-205 16 90
-222 16 90
-238 16 90
-246 32 98
-255 41 106
-8 41 90
-24 41 90
-41 41 98
-57 41 98
-74 41 98
-98 41 98
-115 41 98
-131 41 98
-148 32 90
-172 32 90
-189 32 90
-205 32 90
-222 32 90
-230 49 106
-246 49 98
-255 57 106
-8 57 90
-24 57 90
-41 57 98
-57 57 98
-74 57 98
-98 57 98
-115 57 98
-131 57 90
-148 57 90
-164 57 90
-189 49 90
-205 57 90
-213 65 98
-230 65 98
-246 65 98
-255 74 106
-8 74 90
-24 74 90
-41 82 98
-57 74 98
-74 74 98
-98 74 98
-115 74 90
-131 74 90
-148 74 90
-164 74 90
-180 74 90
-197 82 98
-213 82 98
-230 82 98
-246 82 98
-255 90 106
-8 90 90
-24 90 90
-41 98 98
-57 98 98
-74 98 98
-90 90 90
-115 90 90
-131 90 90
-148 90 90
-164 90 90
-180 98 98
-197 98 98
-213 98 98
-230 98 98
-246 106 106
-255 106 106
-8 106 90
-16 115 98
-41 115 98
-57 115 90
-74 115 90
-90 115 90
-115 115 90
-131 115 90
-148 106 90
-164 106 90
-180 115 98
-197 115 98
-213 115 98
-230 115 98
-246 115 106
-255 123 106
-0 139 98
-16 131 98
-41 131 90
-57 131 90
-74 131 90
-90 131 90
-115 131 90
-131 131 90
-148 131 90
-164 131 90
-180 131 98
-197 131 98
-213 131 98
-230 131 98
-246 131 106
-255 139 106
-0 156 98
-16 156 98
-32 148 90
-57 148 90
-74 148 90
-90 148 90
-106 148 90
-131 148 90
-148 148 90
-164 148 90
-180 148 98
-197 148 98
-213 148 98
-230 148 98
-246 148 106
-255 148 106
-0 172 90
-16 172 90
-32 172 90
-57 164 90
-74 164 90
-90 164 90
-106 164 90
-131 164 90
-148 164 90
-164 164 90
-180 164 98
-197 164 98
-213 164 98
-230 164 98
-246 164 106
-255 164 106
-0 189 90
-16 189 90
-32 189 90
-49 189 90
-74 180 90
-98 180 98
-115 180 98
-131 180 98
-148 180 98
-164 180 98
-180 180 98
-197 180 98
-213 180 98
-230 180 98
-246 180 106
-255 180 106
-0 205 90
-16 205 90
-32 205 90
-57 205 90
-82 197 98
-98 197 98
-115 197 98
-131 197 98
-148 197 98
-164 197 98
-180 197 98
-197 197 98
-213 197 98
-230 197 98
-246 197 106
-255 197 106
-0 222 90
-16 222 90
-32 222 90
-65 213 98
-82 213 98
-98 213 98
-115 213 98
-139 213 98
-148 213 98
-164 213 98
-180 213 98
-197 213 98
-213 213 98
-230 213 98
-246 213 106
-255 213 106
-0 238 90
-16 238 90
-49 230 98
-65 230 98
-82 230 98
-98 230 98
-123 230 98
-131 230 98
-156 230 98
-164 230 98
-180 230 98
-197 230 98
-213 230 98
-230 230 98
-246 230 106
-255 230 106
-0 255 90
-32 246 98
-49 246 98
-65 246 98
-82 246 98
-106 246 106
-123 246 106
-139 246 106
-148 246 106
-172 246 106
-189 246 106
-197 246 106
-213 246 106
-230 246 106
-246 246 106
-255 238 106
-24 255 98
-41 255 106
-57 255 98
-74 255 106
-90 255 106
-106 255 106
-123 255 106
-139 255 106
-156 255 106
-172 255 106
-180 255 106
-197 255 106
-213 255 106
-230 255 106
-246 255 106
-255 255 106
diff --git a/graphics/misc/sunny_day/50.pal b/graphics/misc/sunny_day/50.pal
deleted file mode 100644
index e162a20fa..000000000
--- a/graphics/misc/sunny_day/50.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 41
-24 8 41
-41 8 41
-57 8 41
-74 8 41
-90 8 41
-106 8 41
-172 0 49
-189 0 41
-205 0 41
-222 0 41
-238 0 41
-255 0 41
-255 8 49
-255 24 65
-255 57 82
-8 24 41
-24 24 41
-41 24 41
-57 24 41
-74 24 41
-90 24 41
-148 16 49
-164 16 41
-189 16 41
-205 16 41
-222 8 32
-246 8 32
-246 24 49
-246 41 57
-255 57 74
-255 74 90
-8 41 41
-24 41 41
-41 41 41
-57 41 41
-74 41 41
-123 41 41
-139 41 41
-164 41 41
-180 32 32
-205 32 32
-222 32 32
-230 41 41
-230 57 57
-238 74 74
-255 74 74
-255 90 90
-8 57 41
-24 57 41
-41 57 41
-57 57 41
-74 57 41
-123 65 41
-139 65 41
-164 57 41
-180 57 32
-205 57 32
-222 57 32
-230 65 41
-230 74 57
-238 90 74
-255 90 74
-255 98 90
-8 74 41
-24 74 41
-41 74 41
-57 74 41
-74 74 41
-123 98 41
-139 90 41
-164 90 41
-180 82 32
-205 82 32
-222 82 32
-230 82 41
-230 90 57
-238 98 74
-255 98 74
-255 115 90
-8 90 41
-24 90 41
-41 123 41
-74 123 41
-98 123 41
-123 123 41
-139 115 41
-164 115 41
-180 106 32
-205 106 32
-222 98 32
-230 98 41
-230 106 57
-238 115 74
-255 123 74
-255 123 90
-8 106 41
-16 148 41
-41 139 41
-65 139 41
-90 139 41
-115 139 41
-139 139 41
-164 139 41
-180 131 32
-205 131 32
-222 123 32
-230 123 41
-230 123 57
-238 131 74
-255 131 74
-255 139 90
-0 172 49
-16 164 41
-41 164 41
-65 164 41
-90 164 41
-115 164 41
-139 164 41
-164 164 41
-180 156 32
-205 148 32
-222 148 32
-230 148 41
-230 139 57
-238 148 74
-255 148 74
-255 148 90
-0 189 41
-16 189 41
-32 180 32
-57 180 32
-82 180 32
-106 180 32
-131 180 32
-156 180 32
-180 180 32
-205 172 32
-222 172 32
-230 164 41
-230 156 57
-238 164 74
-255 164 74
-255 164 90
-0 205 41
-16 205 41
-32 205 32
-57 205 32
-82 205 32
-106 205 32
-131 205 32
-156 205 32
-180 205 32
-205 205 32
-222 197 32
-230 180 41
-230 172 57
-238 180 74
-255 180 74
-255 180 90
-0 222 41
-8 222 32
-32 222 32
-57 222 32
-82 222 32
-106 222 32
-123 222 32
-148 222 32
-172 222 32
-197 222 32
-222 222 32
-230 205 41
-230 197 57
-238 197 74
-255 189 74
-255 189 90
-0 238 32
-8 246 32
-41 230 41
-65 230 41
-82 230 41
-106 230 41
-123 230 41
-148 230 41
-164 230 41
-189 230 41
-205 230 41
-230 230 41
-230 213 57
-238 205 74
-255 213 74
-255 205 90
-0 255 32
-24 246 41
-57 230 57
-74 230 57
-90 230 57
-106 230 57
-123 230 57
-139 230 57
-164 230 57
-180 230 57
-197 230 57
-213 230 57
-230 230 57
-238 222 74
-255 222 74
-255 213 90
-8 255 49
-41 246 49
-74 238 74
-90 238 74
-106 238 74
-123 238 74
-131 238 74
-148 238 74
-164 238 74
-180 238 74
-197 238 74
-213 238 74
-230 238 74
-238 238 74
-255 238 74
-255 230 90
-24 255 57
-57 255 74
-74 255 74
-90 255 74
-106 255 74
-123 255 74
-131 255 74
-148 255 74
-164 255 74
-180 255 74
-197 255 74
-213 255 74
-230 255 74
-238 255 74
-255 255 74
-255 246 90
-57 255 82
-74 255 82
-90 255 90
-106 255 90
-115 255 90
-131 255 90
-139 255 90
-156 255 90
-172 255 90
-180 255 90
-197 255 90
-205 255 90
-222 255 90
-230 255 90
-246 255 90
-255 255 90
diff --git a/graphics/misc/sunny_day/51.pal b/graphics/misc/sunny_day/51.pal
deleted file mode 100644
index c168d1896..000000000
--- a/graphics/misc/sunny_day/51.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 57
-24 8 57
-41 8 57
-57 8 57
-74 8 57
-90 8 57
-106 8 57
-172 0 74
-189 0 74
-205 0 65
-222 0 65
-238 0 65
-255 0 57
-255 8 65
-255 24 82
-255 57 98
-8 24 57
-24 24 57
-41 24 57
-57 24 57
-74 24 57
-90 24 57
-148 16 74
-164 16 65
-189 16 65
-205 16 65
-222 8 57
-246 8 57
-246 24 65
-246 41 74
-255 57 90
-255 74 98
-8 41 57
-24 41 57
-41 41 57
-57 41 57
-74 41 57
-123 41 74
-139 41 65
-164 41 65
-180 32 57
-205 32 57
-222 32 57
-230 41 65
-230 57 74
-238 74 90
-255 74 90
-255 90 106
-8 57 57
-24 57 57
-41 57 57
-57 57 57
-98 65 65
-123 65 65
-139 57 57
-156 57 57
-180 57 57
-197 57 57
-205 57 57
-213 74 74
-230 90 90
-238 90 90
-255 90 90
-255 106 106
-8 74 57
-24 74 57
-41 74 57
-65 98 65
-98 98 65
-123 90 65
-139 90 57
-156 82 57
-180 82 57
-197 74 57
-205 82 57
-213 90 74
-230 98 90
-238 106 90
-255 106 90
-255 115 106
-8 90 57
-24 90 57
-41 123 65
-65 123 65
-90 123 65
-123 123 65
-139 115 57
-156 106 57
-180 106 57
-197 98 57
-205 106 57
-213 106 74
-230 115 90
-238 115 90
-255 123 90
-255 131 106
-8 106 57
-16 148 65
-41 139 65
-57 139 57
-90 139 57
-115 139 57
-139 139 57
-156 131 57
-180 131 57
-197 123 57
-205 123 57
-213 123 74
-230 131 90
-238 131 90
-255 139 90
-255 148 106
-0 172 65
-16 164 65
-41 164 57
-57 156 57
-82 156 57
-106 156 57
-131 156 57
-156 156 57
-180 156 57
-197 148 57
-205 148 57
-213 139 74
-230 148 90
-238 148 90
-255 148 90
-255 156 106
-0 189 65
-16 189 65
-32 180 57
-57 180 57
-82 180 57
-106 180 57
-131 180 57
-156 180 57
-180 180 57
-197 172 57
-205 164 57
-213 164 74
-230 164 90
-238 164 90
-255 164 90
-255 164 106
-0 205 65
-16 205 65
-32 205 57
-57 197 57
-82 197 57
-106 197 57
-123 197 57
-148 197 57
-172 197 57
-197 197 57
-205 189 57
-213 180 74
-230 180 90
-238 180 90
-255 180 90
-255 180 106
-0 222 57
-8 222 57
-32 222 57
-57 205 57
-82 205 57
-106 205 57
-123 205 57
-148 205 57
-164 205 57
-189 205 57
-205 205 57
-213 197 74
-230 197 90
-238 197 90
-255 197 90
-255 189 106
-0 238 57
-8 246 49
-41 230 65
-74 213 74
-90 213 74
-106 213 74
-123 213 74
-139 213 74
-164 213 74
-180 213 74
-197 213 74
-213 213 74
-230 213 90
-238 205 90
-255 205 90
-255 205 106
-0 255 57
-24 246 57
-57 230 74
-90 230 90
-106 230 90
-123 230 90
-131 230 90
-148 230 90
-164 230 90
-180 230 90
-197 230 90
-213 230 90
-230 230 90
-238 222 90
-255 222 90
-255 222 106
-8 255 65
-41 246 65
-74 238 90
-90 238 90
-106 238 90
-123 238 90
-131 238 90
-148 238 90
-164 238 90
-180 238 90
-197 238 90
-213 238 90
-230 238 90
-238 238 90
-255 238 90
-255 230 106
-24 255 74
-57 255 90
-74 255 90
-90 255 90
-106 255 90
-123 255 90
-139 255 90
-156 255 90
-172 255 90
-180 255 90
-197 255 90
-213 255 90
-222 255 90
-238 255 90
-255 255 90
-255 246 106
-57 255 90
-74 255 98
-90 255 98
-106 255 106
-123 255 106
-131 255 106
-148 255 106
-156 255 106
-172 255 106
-180 255 106
-197 255 106
-205 255 106
-222 255 106
-230 255 106
-246 255 106
-255 255 106
diff --git a/graphics/misc/sunny_day/52.pal b/graphics/misc/sunny_day/52.pal
deleted file mode 100644
index 4589fe0fc..000000000
--- a/graphics/misc/sunny_day/52.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 74
-24 8 74
-41 8 74
-57 8 74
-74 8 74
-90 8 74
-106 8 74
-172 0 98
-189 0 90
-205 0 90
-222 0 90
-238 0 82
-255 0 82
-255 8 90
-255 24 98
-255 57 106
-8 24 74
-24 24 74
-41 24 74
-57 24 74
-74 24 74
-90 24 74
-148 16 98
-164 16 90
-189 16 90
-205 16 90
-222 8 82
-246 8 82
-246 24 90
-246 41 90
-255 57 106
-255 74 115
-8 41 74
-24 41 74
-41 41 74
-57 41 74
-74 41 74
-123 41 98
-139 41 90
-164 41 90
-180 32 82
-205 32 82
-222 32 82
-230 41 82
-230 57 90
-238 74 106
-255 74 106
-255 90 115
-8 57 74
-24 57 74
-41 57 74
-65 65 98
-98 65 98
-123 65 90
-139 57 90
-156 57 82
-180 57 82
-197 57 82
-205 57 82
-213 74 90
-230 90 106
-238 90 106
-255 90 106
-255 106 123
-8 74 74
-24 74 74
-41 74 74
-65 98 98
-98 90 90
-115 82 82
-139 82 82
-156 74 74
-180 74 74
-189 82 82
-197 90 90
-213 98 98
-230 106 106
-238 106 106
-255 106 106
-255 123 123
-8 90 74
-24 90 74
-41 123 98
-65 123 90
-82 115 82
-115 115 82
-139 106 82
-156 106 74
-180 98 74
-189 98 82
-197 106 90
-213 115 98
-230 115 106
-238 123 106
-255 123 106
-255 131 123
-8 106 74
-16 148 98
-41 139 90
-57 139 90
-82 139 82
-106 139 82
-139 139 82
-156 131 74
-180 123 74
-189 123 82
-197 123 90
-213 131 98
-230 131 106
-238 139 106
-255 139 106
-255 148 123
-0 172 98
-16 164 90
-41 164 90
-57 156 82
-74 156 74
-106 156 74
-131 156 74
-156 156 74
-180 148 74
-189 148 82
-197 139 90
-213 148 98
-230 148 106
-238 148 106
-255 148 106
-255 156 123
-0 189 90
-16 189 90
-32 180 82
-57 180 82
-74 180 74
-98 180 74
-123 180 74
-148 180 74
-180 180 74
-189 164 82
-197 156 90
-213 164 98
-230 164 106
-238 164 106
-255 164 106
-255 172 123
-0 205 90
-16 205 82
-32 205 82
-57 197 74
-82 189 82
-106 189 82
-123 189 82
-148 189 82
-164 189 82
-189 189 82
-197 180 90
-213 180 98
-230 180 106
-238 180 106
-255 180 106
-255 180 123
-0 222 82
-8 222 82
-32 222 82
-57 205 82
-90 197 90
-106 197 90
-123 197 90
-139 197 90
-164 197 90
-180 197 90
-197 197 90
-213 197 98
-230 197 106
-238 197 106
-255 197 106
-255 197 123
-0 238 82
-8 246 74
-41 230 82
-74 213 90
-98 213 98
-115 213 98
-131 213 98
-148 213 98
-164 213 98
-180 213 98
-197 213 98
-213 213 98
-230 213 106
-238 213 106
-255 205 106
-255 205 123
-0 255 82
-24 246 82
-57 230 90
-90 230 98
-106 230 106
-123 230 106
-131 230 106
-148 230 106
-164 230 106
-180 230 106
-197 230 106
-213 230 106
-230 230 106
-238 222 106
-255 222 106
-255 222 123
-8 255 82
-41 246 90
-74 238 98
-90 238 106
-106 238 106
-123 238 106
-139 238 106
-148 238 106
-164 238 106
-180 238 106
-197 238 106
-213 238 106
-230 238 106
-238 238 106
-255 238 106
-255 230 123
-24 255 90
-57 255 98
-74 255 98
-90 255 106
-106 255 106
-123 255 106
-139 255 106
-156 255 106
-164 255 106
-180 255 106
-197 255 106
-213 255 106
-230 255 106
-238 255 106
-255 255 106
-255 246 123
-57 255 106
-74 255 106
-90 255 115
-106 255 115
-123 255 123
-139 255 123
-148 255 123
-164 255 123
-172 255 123
-189 255 123
-197 255 123
-205 255 123
-222 255 123
-230 255 123
-246 255 123
-255 255 123
diff --git a/graphics/misc/sunny_day/53.pal b/graphics/misc/sunny_day/53.pal
deleted file mode 100644
index 833a15511..000000000
--- a/graphics/misc/sunny_day/53.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 90
-24 8 90
-41 8 90
-57 8 90
-74 8 90
-90 8 90
-106 8 90
-172 0 123
-189 0 115
-205 0 115
-222 0 106
-238 0 106
-255 0 106
-255 8 106
-255 24 115
-255 57 123
-8 24 90
-24 24 90
-41 24 90
-57 24 90
-74 24 90
-90 24 90
-148 16 123
-164 16 115
-189 16 115
-205 16 106
-222 8 106
-246 8 106
-246 24 106
-246 41 106
-255 57 123
-255 74 131
-8 41 90
-24 41 90
-41 41 123
-65 41 123
-98 41 123
-123 41 123
-139 41 115
-164 41 115
-180 32 106
-205 32 106
-222 32 106
-230 41 106
-230 57 106
-238 74 123
-255 74 123
-255 90 131
-8 57 90
-24 57 90
-41 74 123
-65 65 123
-90 65 123
-123 65 123
-139 57 115
-156 57 106
-180 57 106
-197 57 106
-205 57 106
-213 74 106
-230 90 123
-238 90 123
-255 90 123
-255 106 131
-8 74 90
-24 74 90
-41 98 123
-65 90 123
-82 82 115
-115 82 115
-139 82 106
-156 74 106
-180 74 98
-189 82 106
-197 90 106
-213 98 115
-230 106 123
-238 106 123
-255 106 123
-255 123 139
-8 90 90
-24 90 90
-41 123 123
-65 123 123
-82 115 115
-115 106 106
-131 98 98
-156 98 98
-172 98 98
-180 106 106
-197 115 115
-213 115 115
-230 123 123
-238 123 123
-255 131 131
-255 139 139
-8 106 90
-16 148 123
-41 139 115
-57 139 115
-82 139 106
-98 131 98
-131 131 98
-156 123 98
-172 123 98
-180 123 106
-197 131 115
-213 131 115
-230 131 123
-238 139 123
-255 139 131
-255 148 139
-0 172 123
-16 164 115
-41 164 115
-57 156 106
-74 156 106
-98 156 98
-123 156 98
-156 156 98
-172 148 98
-180 139 106
-197 148 115
-213 148 115
-230 148 123
-238 156 123
-255 156 131
-255 164 139
-0 189 115
-16 189 115
-32 180 106
-57 180 106
-74 180 98
-98 172 98
-123 172 98
-148 172 98
-172 172 98
-180 164 106
-197 164 115
-213 164 115
-230 164 123
-238 164 123
-255 164 131
-255 172 139
-0 205 115
-16 205 106
-32 205 106
-57 197 98
-82 189 98
-106 180 106
-123 180 106
-139 180 106
-164 180 106
-180 180 106
-197 180 115
-213 180 115
-230 180 123
-238 180 123
-255 180 131
-255 189 139
-0 222 106
-8 222 106
-32 222 98
-57 205 106
-90 197 106
-115 197 115
-131 197 115
-148 197 115
-164 197 115
-180 197 115
-197 197 115
-213 197 115
-230 197 123
-238 197 123
-255 197 131
-255 197 139
-0 238 106
-8 246 98
-41 230 98
-74 213 106
-98 213 115
-115 213 115
-131 213 115
-148 213 115
-164 213 115
-180 213 115
-197 213 115
-213 213 115
-230 213 123
-238 213 123
-255 213 131
-255 205 139
-0 255 98
-24 246 98
-57 230 106
-90 230 115
-106 230 115
-123 230 123
-139 230 123
-156 230 123
-164 230 123
-180 230 123
-197 230 123
-213 230 123
-230 230 123
-238 222 123
-255 222 131
-255 222 139
-8 255 98
-41 246 106
-74 238 115
-90 238 115
-106 238 123
-123 238 123
-139 238 123
-156 238 123
-172 238 123
-180 238 123
-197 238 123
-213 238 123
-230 238 123
-238 238 123
-255 238 131
-255 230 139
-24 255 106
-57 255 115
-74 255 123
-90 255 123
-106 255 123
-131 255 131
-139 255 131
-156 255 131
-172 255 131
-180 255 131
-197 255 131
-213 255 131
-230 255 131
-238 255 131
-255 255 131
-255 246 139
-57 255 123
-74 255 123
-90 255 123
-106 255 131
-123 255 131
-139 255 139
-156 255 139
-164 255 139
-172 255 139
-189 255 139
-197 255 139
-213 255 139
-222 255 139
-238 255 139
-246 255 139
-255 255 139
diff --git a/graphics/misc/sunny_day/54.pal b/graphics/misc/sunny_day/54.pal
deleted file mode 100644
index cfe2f15c7..000000000
--- a/graphics/misc/sunny_day/54.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 106
-24 8 106
-41 8 106
-57 8 106
-74 8 106
-90 8 106
-106 8 106
-172 0 148
-189 0 139
-205 0 139
-222 0 131
-238 0 131
-255 0 123
-255 8 123
-255 24 131
-255 57 139
-8 24 106
-16 16 148
-41 16 148
-65 16 148
-98 16 148
-123 16 148
-148 16 148
-164 16 139
-189 16 139
-205 16 131
-222 8 131
-246 8 123
-246 24 131
-246 41 123
-255 57 131
-255 74 139
-8 41 106
-16 49 148
-41 41 139
-65 41 139
-90 41 139
-115 41 139
-139 41 139
-164 41 139
-180 32 131
-205 32 131
-222 32 123
-230 41 123
-230 57 123
-238 74 131
-255 74 131
-255 90 139
-8 57 106
-16 74 148
-41 65 139
-57 57 139
-90 57 139
-115 57 139
-139 57 139
-156 57 131
-180 57 131
-197 57 123
-205 57 123
-213 74 123
-230 90 131
-238 90 131
-255 90 139
-255 106 148
-8 74 106
-16 98 148
-41 90 139
-57 90 139
-82 82 139
-106 82 139
-139 82 139
-156 74 131
-180 74 123
-189 82 123
-197 90 123
-213 98 131
-230 106 131
-238 106 139
-255 106 139
-255 123 148
-8 90 106
-16 123 148
-41 115 139
-57 115 139
-82 106 139
-98 98 131
-131 98 131
-156 98 123
-172 98 123
-180 106 123
-197 115 131
-213 115 131
-230 123 139
-238 123 139
-255 131 139
-255 139 156
-8 106 106
-16 148 148
-41 139 139
-57 139 139
-82 139 139
-98 131 131
-131 115 115
-148 115 115
-164 123 123
-180 131 131
-197 131 131
-213 131 131
-230 139 139
-238 139 139
-255 148 148
-255 156 156
-0 172 148
-16 164 139
-41 164 139
-57 156 131
-74 156 131
-98 156 123
-115 148 115
-148 148 115
-164 139 123
-180 148 131
-197 148 131
-213 148 131
-230 148 139
-238 156 139
-255 156 148
-255 164 156
-0 189 139
-16 189 131
-32 180 131
-57 180 131
-74 180 123
-98 172 123
-123 164 123
-139 164 123
-164 164 123
-180 164 131
-197 164 131
-213 164 131
-230 164 139
-238 172 139
-255 172 148
-255 180 156
-0 205 131
-16 205 131
-32 205 131
-57 197 123
-82 189 123
-106 180 123
-131 180 131
-148 180 131
-164 180 131
-180 180 131
-197 180 131
-213 180 131
-230 180 139
-238 180 139
-255 189 148
-255 189 156
-0 222 131
-8 222 131
-32 222 123
-57 205 123
-90 197 123
-115 197 131
-131 197 131
-148 197 131
-164 197 131
-180 197 131
-197 197 131
-213 197 131
-230 197 139
-238 197 139
-255 197 148
-255 205 156
-0 238 123
-8 246 123
-41 230 123
-74 213 123
-98 213 131
-115 213 131
-131 213 131
-148 213 131
-164 213 131
-180 213 131
-197 213 131
-213 213 131
-230 213 139
-238 213 139
-255 213 148
-255 213 156
-0 255 123
-24 246 123
-57 230 123
-90 230 131
-106 230 131
-123 230 131
-139 230 139
-156 230 139
-164 230 139
-180 230 139
-197 230 139
-213 230 139
-230 230 139
-238 222 139
-255 230 148
-255 222 156
-8 255 123
-41 246 123
-74 238 131
-90 238 131
-106 238 139
-123 238 139
-139 238 139
-156 238 139
-172 238 139
-180 238 139
-197 238 139
-213 238 139
-230 238 139
-238 238 139
-255 238 148
-255 238 156
-24 255 123
-57 255 131
-74 255 131
-90 255 139
-106 255 139
-131 255 139
-148 255 148
-156 255 148
-172 255 148
-189 255 148
-197 255 148
-213 255 148
-230 255 148
-238 255 148
-255 255 148
-255 246 156
-57 255 131
-74 255 139
-90 255 139
-106 255 148
-123 255 148
-139 255 148
-156 255 156
-172 255 156
-180 255 156
-189 255 156
-205 255 156
-213 255 156
-222 255 156
-238 255 156
-246 255 156
-255 255 156
diff --git a/graphics/misc/sunny_day/55.pal b/graphics/misc/sunny_day/55.pal
deleted file mode 100644
index c1b30ed9e..000000000
--- a/graphics/misc/sunny_day/55.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 172
-16 0 172
-49 0 172
-65 0 172
-98 0 172
-123 0 172
-148 0 172
-172 0 172
-189 0 164
-205 0 164
-222 0 156
-238 0 148
-255 0 148
-255 8 148
-255 24 139
-255 57 148
-0 24 172
-16 16 164
-41 16 164
-65 16 164
-90 16 164
-115 16 164
-139 16 164
-164 16 164
-189 16 164
-205 16 156
-222 8 156
-246 8 148
-246 24 148
-246 41 139
-255 57 148
-255 74 156
-0 49 172
-16 41 164
-41 41 164
-57 41 164
-90 41 164
-115 41 164
-139 41 164
-164 41 164
-180 32 156
-205 32 156
-222 32 148
-230 41 148
-230 57 139
-238 74 148
-255 74 148
-255 90 156
-0 74 172
-16 65 164
-41 65 164
-57 57 156
-82 57 156
-106 57 156
-131 57 156
-156 57 156
-180 57 156
-197 57 148
-205 57 148
-213 74 139
-230 90 148
-238 90 148
-255 90 156
-255 106 156
-0 98 172
-16 90 164
-41 90 164
-57 82 156
-74 74 156
-106 74 156
-131 74 156
-156 74 156
-180 74 148
-189 82 148
-197 90 139
-213 98 148
-230 106 148
-238 106 148
-255 106 156
-255 123 164
-0 123 172
-16 115 164
-41 115 164
-57 106 156
-74 106 156
-98 98 156
-123 98 156
-156 98 156
-172 98 148
-180 106 139
-197 115 148
-213 115 148
-230 123 156
-238 123 156
-255 131 156
-255 139 164
-0 148 172
-16 139 164
-41 139 164
-57 131 156
-74 131 156
-98 123 156
-115 115 148
-148 115 148
-164 123 139
-180 131 148
-197 131 148
-213 131 148
-230 139 156
-238 139 156
-255 148 156
-255 156 172
-0 172 172
-16 164 164
-41 164 164
-57 156 156
-74 156 156
-98 156 156
-115 148 148
-148 139 139
-172 148 148
-180 148 148
-197 148 148
-213 148 148
-230 156 156
-238 156 156
-255 164 164
-255 172 172
-0 189 164
-16 189 156
-32 180 156
-57 180 156
-74 180 148
-98 172 148
-123 164 139
-148 172 148
-172 172 148
-180 164 148
-197 164 148
-213 164 148
-230 164 156
-238 172 156
-255 172 164
-255 180 172
-0 205 156
-16 205 156
-32 205 148
-57 197 148
-82 189 148
-106 180 139
-131 180 148
-148 180 148
-164 180 148
-180 180 148
-197 180 148
-213 180 148
-230 180 156
-238 180 156
-255 189 164
-255 197 172
-0 222 148
-8 222 148
-32 222 148
-57 205 148
-90 197 139
-115 197 148
-131 197 148
-148 197 148
-164 197 148
-180 197 148
-197 197 148
-213 197 148
-230 197 156
-238 197 156
-255 197 164
-255 205 172
-0 238 148
-8 246 148
-41 230 148
-74 213 139
-98 213 148
-115 213 148
-131 213 148
-148 213 148
-164 213 148
-180 213 148
-197 213 148
-213 213 148
-230 213 156
-238 213 156
-255 213 164
-255 213 172
-0 255 148
-24 246 139
-57 230 139
-90 230 148
-106 230 148
-123 230 148
-139 230 148
-156 230 156
-172 230 156
-180 230 156
-197 230 156
-213 230 156
-230 230 156
-238 222 156
-255 230 164
-255 230 172
-8 255 139
-41 246 139
-74 238 148
-90 238 148
-106 238 148
-123 238 156
-139 238 156
-156 238 156
-172 238 156
-189 238 156
-197 238 156
-213 238 156
-230 238 156
-238 238 156
-255 238 164
-255 238 172
-24 255 139
-57 255 148
-74 255 148
-90 255 148
-106 255 148
-131 255 156
-148 255 156
-164 255 164
-172 255 164
-189 255 164
-205 255 164
-213 255 164
-230 255 164
-238 255 164
-255 255 164
-255 246 172
-57 255 148
-74 255 148
-90 255 148
-106 255 156
-123 255 156
-139 255 164
-156 255 164
-172 255 172
-189 255 172
-197 255 172
-205 255 172
-213 255 172
-230 255 172
-238 255 172
-246 255 172
-255 255 172
diff --git a/graphics/misc/sunny_day/56.pal b/graphics/misc/sunny_day/56.pal
deleted file mode 100644
index eb5b90f0c..000000000
--- a/graphics/misc/sunny_day/56.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 189
-16 0 189
-41 0 189
-65 0 189
-90 0 189
-115 0 189
-139 0 189
-164 0 189
-189 0 189
-205 0 189
-222 0 180
-238 0 172
-255 0 172
-255 8 164
-255 24 164
-255 57 164
-0 24 189
-16 16 189
-41 16 189
-65 16 189
-90 16 189
-115 16 189
-131 16 189
-156 16 189
-189 16 189
-205 16 180
-222 8 180
-246 8 172
-246 24 164
-246 41 164
-255 57 164
-255 74 164
-0 41 189
-16 41 189
-32 32 180
-57 32 180
-82 32 180
-106 32 180
-131 32 180
-156 32 180
-180 32 180
-205 32 180
-222 32 172
-230 41 164
-230 57 164
-238 74 164
-255 74 164
-255 90 172
-0 74 189
-16 65 189
-32 57 180
-57 57 180
-82 57 180
-106 57 180
-131 57 180
-156 57 180
-180 57 180
-197 57 172
-205 57 164
-213 74 164
-230 90 164
-238 90 164
-255 90 172
-255 106 172
-0 90 189
-16 90 189
-32 82 180
-57 82 180
-74 74 180
-98 74 180
-123 74 180
-148 74 180
-180 74 180
-189 82 164
-197 90 164
-213 98 164
-230 106 164
-238 106 164
-255 106 164
-255 123 172
-0 115 189
-16 115 189
-32 106 180
-57 106 180
-74 98 180
-98 98 172
-123 98 172
-148 98 172
-172 98 172
-180 106 164
-197 115 164
-213 115 164
-230 123 164
-238 123 172
-255 131 172
-255 139 172
-0 139 189
-16 139 189
-32 131 180
-57 131 180
-74 123 180
-98 123 172
-123 123 164
-139 123 164
-164 123 164
-180 131 164
-197 131 164
-213 131 164
-230 139 164
-238 139 172
-255 148 172
-255 156 180
-0 164 189
-16 164 189
-32 156 180
-57 156 180
-74 148 180
-98 148 172
-123 139 164
-148 148 172
-172 148 172
-180 148 164
-197 148 164
-213 148 164
-230 156 172
-238 156 172
-255 164 172
-255 172 189
-0 189 189
-16 189 189
-32 180 180
-57 180 180
-74 180 180
-98 172 172
-123 164 164
-148 172 172
-172 164 164
-189 164 164
-197 164 164
-213 164 164
-230 172 172
-238 172 172
-255 180 180
-255 205 205
-0 205 180
-16 205 180
-32 205 172
-57 197 172
-82 189 164
-106 180 164
-131 180 164
-148 180 164
-164 189 164
-189 189 164
-197 180 164
-213 180 164
-230 189 172
-238 189 172
-255 189 180
-255 205 205
-0 222 172
-8 222 172
-32 222 172
-57 205 164
-90 197 156
-115 197 164
-131 197 164
-148 197 164
-164 197 164
-180 197 164
-197 197 164
-213 197 164
-230 197 172
-238 197 172
-255 205 180
-255 222 205
-0 238 172
-8 246 172
-41 230 164
-74 213 164
-98 213 164
-115 213 164
-131 213 164
-148 213 164
-164 213 164
-180 213 164
-197 213 164
-213 213 164
-230 213 172
-238 213 172
-255 213 180
-255 222 205
-0 255 164
-24 246 164
-57 230 156
-90 230 164
-106 230 164
-123 230 164
-139 230 164
-156 230 164
-172 230 172
-189 230 172
-197 230 172
-213 230 172
-230 230 172
-238 230 172
-255 230 180
-255 230 205
-8 255 156
-41 246 156
-74 238 164
-90 238 164
-106 238 164
-123 238 164
-139 238 172
-156 238 172
-172 238 172
-189 238 172
-205 238 172
-213 238 172
-230 238 172
-238 238 172
-255 238 180
-255 238 205
-24 255 156
-57 255 164
-74 255 164
-90 255 164
-106 255 164
-131 255 164
-148 255 172
-164 255 172
-180 255 180
-189 255 180
-205 255 180
-213 255 180
-230 255 180
-238 255 180
-255 255 180
-255 246 205
-57 255 164
-74 255 164
-90 255 164
-106 255 164
-123 255 172
-139 255 172
-156 255 180
-172 255 180
-205 255 205
-213 255 205
-222 255 205
-230 255 205
-238 255 205
-246 255 205
-255 255 205
-255 255 205
diff --git a/graphics/misc/sunny_day/57.pal b/graphics/misc/sunny_day/57.pal
deleted file mode 100644
index 90584e92e..000000000
--- a/graphics/misc/sunny_day/57.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 205
-16 0 205
-41 0 205
-65 0 205
-90 0 205
-115 0 205
-131 0 205
-156 0 205
-180 0 205
-205 0 205
-222 0 197
-238 0 197
-255 0 189
-255 8 180
-255 24 180
-255 57 180
-0 16 205
-16 16 205
-41 16 205
-65 16 205
-82 16 205
-106 16 205
-131 16 205
-156 16 205
-180 16 205
-205 16 205
-222 8 205
-246 8 197
-246 24 189
-246 41 180
-255 57 180
-255 74 180
-0 41 205
-16 41 205
-32 32 205
-57 32 205
-82 32 205
-106 32 205
-131 32 205
-148 32 205
-172 32 205
-205 32 205
-222 32 197
-230 41 189
-230 57 180
-238 74 180
-255 74 180
-255 90 180
-0 65 205
-16 65 205
-32 57 205
-57 57 197
-74 57 197
-98 57 197
-123 57 197
-148 57 197
-172 57 197
-197 57 197
-205 57 189
-213 74 180
-230 90 180
-238 90 180
-255 90 180
-255 106 180
-0 90 205
-16 90 205
-32 82 205
-57 82 197
-82 82 189
-98 82 189
-123 82 189
-148 82 189
-164 82 189
-189 82 189
-197 90 180
-213 98 180
-230 106 180
-238 106 180
-255 106 180
-255 123 189
-0 115 205
-16 106 205
-32 106 205
-57 106 197
-82 106 189
-106 106 180
-123 106 180
-139 106 180
-164 106 180
-180 106 180
-197 115 180
-213 115 180
-230 123 180
-238 123 180
-255 131 180
-255 139 189
-0 139 205
-16 131 205
-32 131 205
-57 123 197
-82 123 189
-106 123 180
-131 131 180
-148 131 180
-164 131 180
-180 131 180
-197 131 180
-213 131 180
-230 139 180
-238 139 180
-255 148 189
-255 156 189
-0 164 205
-16 156 205
-32 156 205
-57 148 197
-82 148 189
-106 139 180
-131 148 180
-148 148 180
-164 148 180
-180 148 180
-197 148 180
-213 148 180
-230 156 180
-238 156 189
-255 164 189
-255 172 197
-0 189 205
-16 180 205
-32 180 205
-57 172 197
-82 164 189
-106 164 180
-131 164 180
-148 164 180
-164 164 189
-189 164 189
-197 164 180
-213 164 180
-230 172 189
-238 172 189
-255 180 189
-255 205 213
-0 205 205
-16 205 205
-32 205 205
-57 197 197
-82 189 189
-106 180 180
-131 180 180
-148 180 180
-164 189 189
-189 180 180
-197 180 180
-213 180 180
-230 189 189
-238 189 189
-255 205 205
-255 222 222
-0 222 197
-8 222 197
-32 222 197
-57 205 189
-90 197 180
-115 197 180
-131 197 180
-148 197 180
-164 197 180
-180 197 180
-197 197 180
-213 197 180
-230 197 189
-238 205 189
-255 213 205
-255 222 222
-0 238 189
-8 246 189
-41 230 180
-74 213 180
-98 213 180
-115 213 180
-131 213 180
-148 213 180
-164 213 180
-180 213 180
-197 213 180
-213 213 180
-230 213 189
-238 213 189
-255 222 205
-255 230 222
-0 255 189
-24 246 180
-57 230 172
-90 230 180
-106 230 180
-123 230 180
-139 230 180
-156 230 180
-172 230 189
-189 230 189
-197 230 189
-213 230 189
-230 230 189
-238 230 189
-255 230 205
-255 238 222
-8 255 180
-41 246 172
-74 238 180
-90 238 180
-106 238 180
-123 238 180
-139 238 180
-156 238 180
-172 238 189
-189 238 189
-205 238 189
-213 238 189
-230 238 189
-238 238 189
-255 246 205
-255 246 222
-24 255 172
-57 255 180
-74 255 180
-90 255 180
-106 255 180
-131 255 180
-148 255 189
-164 255 189
-180 255 189
-205 255 205
-213 255 205
-222 255 205
-238 255 205
-246 255 205
-255 255 205
-255 255 222
-57 255 172
-74 255 180
-90 255 180
-106 255 180
-123 255 180
-139 255 189
-156 255 189
-172 255 197
-205 255 205
-222 255 222
-222 255 222
-230 255 222
-238 255 222
-246 255 222
-255 255 222
-255 255 222
diff --git a/graphics/misc/sunny_day/58.pal b/graphics/misc/sunny_day/58.pal
deleted file mode 100644
index 6c208a4aa..000000000
--- a/graphics/misc/sunny_day/58.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 222
-16 0 222
-41 0 222
-57 0 222
-82 0 222
-106 0 222
-131 0 222
-148 0 222
-172 0 222
-197 0 222
-222 0 222
-238 0 222
-255 0 213
-255 8 197
-255 24 197
-255 57 189
-0 16 222
-8 8 222
-32 8 222
-57 8 222
-82 8 222
-106 8 222
-131 8 222
-148 8 222
-172 8 222
-197 8 222
-222 8 222
-246 8 222
-246 24 205
-246 41 197
-255 57 197
-255 74 197
-0 41 222
-8 32 222
-32 32 222
-57 32 222
-82 32 222
-98 32 222
-123 32 222
-148 32 222
-172 32 222
-197 32 222
-222 32 222
-230 41 205
-230 57 197
-238 74 197
-255 74 197
-255 90 197
-0 65 222
-8 57 222
-32 57 222
-57 57 205
-82 57 205
-106 57 205
-123 57 205
-148 57 205
-164 57 205
-189 57 205
-205 57 205
-213 74 197
-230 90 197
-238 90 197
-255 90 197
-255 106 197
-0 90 222
-8 82 222
-32 82 222
-57 82 205
-90 90 197
-106 90 197
-123 90 197
-139 90 197
-156 90 197
-180 90 197
-197 90 197
-213 98 197
-230 106 197
-238 106 197
-255 106 197
-255 123 197
-0 106 222
-8 106 222
-32 106 222
-57 106 205
-90 106 197
-115 115 197
-131 115 197
-148 115 197
-164 115 197
-180 115 197
-197 115 197
-213 115 197
-230 123 197
-238 123 197
-255 131 197
-255 139 197
-0 131 222
-8 131 222
-32 123 222
-57 123 205
-90 123 197
-115 131 197
-131 131 197
-148 131 197
-164 131 197
-180 131 197
-197 131 197
-213 131 197
-230 139 197
-238 139 197
-255 148 197
-255 156 205
-0 156 222
-8 156 222
-32 148 222
-57 148 205
-90 139 197
-115 148 197
-131 148 197
-148 148 197
-164 148 197
-180 148 197
-197 148 197
-213 148 197
-230 156 197
-238 156 197
-255 164 205
-255 172 205
-0 180 222
-8 180 222
-32 172 222
-57 164 205
-90 164 197
-115 164 197
-131 164 197
-148 164 197
-164 164 197
-180 164 197
-197 164 197
-213 164 197
-230 172 197
-238 172 205
-255 180 205
-255 205 222
-0 197 222
-8 205 222
-32 197 222
-57 189 205
-90 180 197
-115 180 197
-131 180 197
-148 180 197
-164 180 197
-180 180 197
-197 180 197
-213 180 197
-230 189 197
-238 189 205
-255 205 213
-255 222 222
-0 222 222
-8 222 222
-32 222 222
-57 205 205
-90 197 197
-115 197 197
-131 197 197
-148 197 197
-164 197 197
-180 197 197
-205 197 197
-213 197 197
-230 205 205
-246 213 213
-255 222 222
-255 238 238
-0 238 213
-8 246 213
-41 230 205
-74 213 197
-98 213 197
-115 213 197
-131 213 197
-148 213 197
-164 213 197
-180 213 197
-197 213 197
-213 213 197
-230 213 205
-246 222 213
-255 230 222
-255 238 238
-0 255 205
-24 246 205
-57 230 197
-90 230 197
-106 230 197
-123 230 197
-139 230 197
-156 230 197
-172 230 197
-189 230 197
-205 230 205
-213 230 205
-230 230 205
-246 238 213
-255 238 222
-255 246 238
-8 255 197
-41 246 197
-74 238 197
-90 238 197
-106 238 197
-123 238 197
-139 238 197
-156 238 197
-172 238 197
-189 238 205
-213 246 213
-222 246 213
-238 246 213
-246 246 213
-255 246 222
-255 246 238
-24 255 189
-57 255 197
-74 255 189
-90 255 197
-106 255 197
-131 255 197
-148 255 197
-164 255 197
-180 255 205
-205 255 213
-222 255 222
-230 255 222
-238 255 222
-246 255 222
-255 255 222
-255 255 238
-57 255 189
-74 255 189
-90 255 189
-106 255 189
-123 255 197
-139 255 197
-156 255 205
-172 255 205
-205 255 222
-222 255 222
-238 255 238
-238 255 238
-246 255 238
-246 255 238
-255 255 238
-255 255 238
diff --git a/graphics/misc/sunny_day/59.pal b/graphics/misc/sunny_day/59.pal
deleted file mode 100644
index fc5d96b1f..000000000
--- a/graphics/misc/sunny_day/59.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 238
-16 0 238
-32 0 238
-57 0 238
-82 0 238
-106 0 238
-123 0 238
-148 0 238
-172 0 238
-189 0 238
-213 0 238
-238 0 238
-255 0 238
-255 8 222
-255 24 213
-255 57 205
-0 16 238
-8 8 246
-32 8 246
-49 8 246
-74 8 246
-98 8 246
-123 8 246
-148 8 246
-172 8 246
-189 8 246
-213 8 246
-246 8 246
-246 24 230
-246 41 213
-255 57 213
-255 74 205
-0 41 238
-8 32 246
-41 41 230
-65 41 230
-82 41 230
-98 41 230
-123 41 230
-148 41 230
-164 41 230
-180 41 230
-205 41 230
-230 41 230
-230 57 213
-238 74 213
-255 74 213
-255 90 205
-0 65 238
-8 57 246
-41 65 230
-74 74 213
-90 74 213
-106 74 213
-123 74 213
-139 74 213
-164 74 213
-180 74 213
-197 74 213
-213 74 213
-230 90 213
-238 90 213
-255 90 213
-255 106 205
-0 82 238
-8 82 246
-41 82 230
-74 90 213
-98 98 213
-115 98 213
-131 98 213
-148 98 213
-164 98 213
-180 98 213
-197 98 213
-213 98 213
-230 106 213
-238 106 213
-255 106 213
-255 123 205
-0 106 238
-8 106 246
-41 106 230
-74 106 213
-98 115 213
-115 115 213
-131 115 213
-148 115 213
-164 115 213
-180 115 213
-197 115 213
-213 115 213
-230 123 213
-238 123 213
-255 131 213
-255 139 213
-0 131 238
-8 123 246
-41 123 230
-74 123 213
-98 131 213
-115 131 213
-131 131 213
-148 131 213
-164 131 213
-180 131 213
-197 131 213
-213 131 213
-230 139 213
-238 139 213
-255 148 213
-255 156 213
-0 148 238
-8 148 246
-41 148 230
-74 139 213
-98 148 213
-115 148 213
-131 148 213
-148 148 213
-164 148 213
-180 148 213
-197 148 213
-213 148 213
-230 156 213
-238 156 213
-255 164 213
-255 172 213
-0 172 238
-8 172 246
-41 164 230
-74 164 213
-98 164 213
-115 164 213
-131 164 213
-148 164 213
-164 164 213
-180 164 213
-197 164 213
-213 164 213
-230 172 213
-238 172 213
-255 180 213
-255 205 230
-0 197 238
-8 197 246
-41 189 230
-74 180 213
-98 180 213
-115 180 213
-131 180 213
-148 180 213
-164 180 213
-180 180 213
-197 180 213
-213 180 213
-230 189 213
-238 189 213
-255 205 222
-255 222 230
-0 222 238
-8 222 246
-41 205 230
-74 197 213
-98 197 213
-115 197 213
-131 197 213
-148 197 213
-164 197 213
-180 197 213
-197 197 213
-213 197 213
-230 205 213
-246 213 222
-255 222 230
-255 238 238
-0 238 238
-8 246 246
-41 230 230
-74 213 213
-98 213 213
-115 213 213
-131 213 213
-148 213 213
-164 213 213
-180 213 213
-197 213 213
-222 213 213
-238 222 222
-246 230 230
-255 238 238
-255 255 255
-0 255 230
-24 246 222
-57 230 213
-90 230 213
-106 230 213
-123 230 213
-139 230 213
-156 230 213
-172 230 213
-189 230 213
-205 230 213
-222 238 222
-238 238 222
-246 238 230
-255 246 238
-255 255 255
-8 255 213
-41 246 213
-74 238 205
-90 238 205
-106 238 213
-123 238 213
-139 238 213
-156 238 213
-172 238 213
-189 238 213
-213 246 222
-230 246 230
-238 246 230
-246 246 230
-255 246 238
-255 255 255
-24 255 205
-57 255 205
-74 255 213
-90 255 205
-106 255 205
-131 255 213
-148 255 213
-164 255 213
-180 255 213
-205 255 222
-222 255 230
-238 255 238
-246 255 238
-246 255 238
-255 255 238
-255 255 255
-57 255 197
-74 255 205
-90 255 205
-106 255 205
-123 255 205
-139 255 205
-156 255 213
-172 255 213
-205 255 222
-222 255 230
-238 255 238
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/6.pal b/graphics/misc/sunny_day/6.pal
deleted file mode 100644
index b11f0695d..000000000
--- a/graphics/misc/sunny_day/6.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 106
-24 8 106
-41 8 106
-57 8 106
-74 8 106
-90 8 106
-106 8 106
-139 0 115
-156 0 115
-172 0 115
-189 0 115
-205 0 115
-222 0 115
-238 0 115
-255 0 106
-255 24 115
-8 24 106
-16 16 115
-41 16 115
-57 16 115
-74 16 115
-98 16 115
-115 16 115
-131 16 115
-156 16 115
-172 16 115
-189 16 115
-205 16 115
-222 16 115
-238 16 106
-246 32 115
-255 41 123
-8 41 106
-16 41 115
-41 41 115
-57 41 115
-74 41 115
-98 41 115
-115 41 115
-131 41 115
-148 32 115
-172 32 115
-189 32 115
-205 32 115
-222 32 106
-230 49 115
-246 49 115
-255 57 123
-8 57 106
-16 57 115
-41 57 115
-57 57 115
-74 57 115
-90 57 115
-115 57 115
-131 57 115
-148 57 115
-164 57 115
-189 49 106
-205 57 106
-213 65 115
-230 65 115
-246 65 123
-255 74 123
-8 74 106
-16 82 115
-41 74 115
-57 74 115
-74 74 115
-90 74 115
-115 74 115
-131 74 115
-148 74 115
-164 74 106
-180 74 106
-197 82 115
-213 82 115
-230 82 123
-246 82 115
-255 90 123
-8 90 106
-16 98 115
-41 98 115
-57 98 115
-74 90 115
-90 90 115
-115 90 115
-131 90 115
-148 90 106
-164 90 106
-180 98 115
-197 98 115
-213 98 115
-230 98 123
-246 106 123
-255 106 123
-8 106 106
-16 115 115
-41 115 115
-57 115 115
-74 115 115
-90 115 115
-115 115 115
-131 106 106
-148 106 106
-164 115 115
-180 115 115
-197 115 115
-213 115 115
-230 123 123
-246 123 123
-255 123 123
-0 139 115
-16 131 115
-41 131 115
-57 131 115
-74 131 115
-90 131 115
-106 131 106
-131 131 106
-148 131 106
-164 131 115
-180 131 115
-197 131 115
-213 131 115
-230 131 123
-246 131 123
-255 139 123
-0 156 115
-16 156 115
-32 148 115
-57 148 106
-74 148 115
-90 148 106
-106 148 106
-131 148 106
-148 148 106
-164 148 115
-180 148 115
-197 148 115
-213 148 115
-230 148 123
-246 156 123
-255 156 123
-0 172 115
-16 172 115
-32 172 115
-57 164 115
-74 164 106
-90 164 106
-115 164 115
-131 164 115
-148 164 115
-164 164 115
-180 164 115
-197 164 115
-213 164 115
-230 164 123
-246 164 123
-255 172 123
-0 189 106
-16 189 115
-32 189 115
-49 189 106
-74 180 106
-98 180 115
-115 180 115
-131 180 115
-148 180 115
-164 180 115
-180 180 115
-197 180 115
-213 180 115
-230 180 123
-246 180 123
-255 180 123
-0 205 106
-16 205 115
-32 205 106
-57 205 106
-82 197 115
-98 197 115
-115 197 115
-131 197 115
-148 197 115
-164 197 115
-180 197 115
-197 197 115
-213 197 115
-230 197 123
-246 197 123
-255 197 123
-0 222 115
-16 222 106
-32 222 106
-65 213 115
-82 213 115
-98 213 115
-115 213 115
-131 213 115
-148 213 115
-164 213 115
-180 213 115
-197 213 115
-213 213 115
-230 213 123
-246 213 123
-255 213 123
-0 238 106
-16 238 106
-49 230 115
-65 230 115
-82 230 115
-98 230 115
-123 230 123
-139 230 123
-156 230 123
-164 230 123
-189 230 123
-197 230 123
-213 230 123
-230 230 123
-246 230 123
-255 230 123
-0 255 106
-32 246 115
-49 246 115
-65 246 115
-82 246 115
-106 246 115
-123 246 123
-139 246 123
-156 246 123
-172 246 123
-180 246 123
-197 246 123
-213 246 123
-230 246 123
-246 246 123
-255 246 123
-24 255 115
-41 255 115
-57 255 115
-74 255 123
-90 255 123
-106 255 123
-123 255 123
-139 255 123
-156 255 123
-172 255 123
-189 255 123
-205 255 123
-213 255 123
-230 255 123
-246 255 123
-255 255 123
diff --git a/graphics/misc/sunny_day/60.pal b/graphics/misc/sunny_day/60.pal
deleted file mode 100644
index ebb714dd4..000000000
--- a/graphics/misc/sunny_day/60.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 255
-16 0 255
-32 0 255
-57 0 255
-82 0 255
-98 0 255
-123 0 255
-148 0 255
-164 0 255
-189 0 255
-205 0 255
-230 0 255
-255 0 255
-255 8 238
-255 24 230
-255 57 222
-0 16 255
-24 24 246
-41 24 246
-57 24 246
-82 24 246
-98 24 246
-123 24 246
-139 24 246
-164 24 246
-180 24 246
-205 24 246
-222 24 246
-246 24 246
-246 41 230
-255 57 230
-255 74 222
-0 41 255
-24 49 246
-57 57 230
-74 57 230
-90 57 230
-106 57 230
-123 57 230
-139 57 230
-156 57 230
-172 57 230
-197 57 230
-213 57 230
-230 57 230
-238 74 230
-255 74 230
-255 90 222
-0 57 255
-24 65 246
-57 74 230
-90 90 230
-98 90 230
-115 90 230
-131 90 230
-148 90 230
-164 90 230
-180 90 230
-197 90 230
-213 90 230
-230 90 230
-238 90 230
-255 90 222
-255 106 222
-0 82 255
-24 90 246
-57 90 230
-90 106 230
-106 106 230
-115 106 230
-131 106 230
-148 106 230
-164 106 230
-180 106 230
-197 106 230
-213 106 230
-230 106 230
-238 106 230
-255 106 230
-255 123 222
-0 106 255
-24 106 246
-57 106 230
-90 123 230
-106 123 230
-123 123 230
-131 123 230
-148 123 230
-164 123 230
-180 123 230
-197 123 230
-213 123 230
-230 123 230
-238 123 230
-255 131 230
-255 139 222
-0 123 255
-24 131 246
-57 123 230
-90 131 230
-106 131 230
-123 139 230
-139 139 230
-148 139 230
-164 139 230
-180 139 230
-197 139 230
-213 139 230
-230 139 230
-238 139 230
-255 148 230
-255 156 222
-0 148 255
-24 148 246
-57 139 230
-90 148 230
-106 148 230
-123 156 230
-139 156 230
-156 156 230
-164 156 230
-180 156 230
-197 156 230
-213 156 230
-230 156 230
-238 156 230
-255 164 230
-255 172 230
-0 172 255
-24 164 246
-57 164 230
-90 164 230
-106 164 230
-123 164 230
-139 164 230
-156 172 230
-172 172 230
-189 172 230
-197 172 230
-213 172 230
-230 172 230
-238 172 230
-255 180 230
-255 205 238
-0 189 255
-24 189 246
-57 180 230
-90 180 230
-106 180 230
-123 180 230
-139 180 230
-156 180 230
-172 189 230
-189 189 230
-197 189 230
-213 189 230
-230 189 230
-238 189 230
-255 205 238
-255 222 238
-0 213 255
-24 205 246
-57 197 230
-90 197 230
-106 197 230
-123 197 230
-139 197 230
-156 197 230
-172 197 230
-189 197 230
-205 205 230
-213 205 230
-230 205 230
-246 213 238
-255 222 238
-255 238 246
-0 238 255
-24 230 246
-57 213 230
-90 213 230
-106 213 230
-123 213 230
-139 213 230
-156 213 230
-172 213 230
-189 213 230
-205 213 230
-222 222 238
-238 222 238
-246 230 238
-255 238 246
-255 255 255
-0 255 255
-24 246 246
-57 230 230
-90 230 230
-106 230 230
-123 230 230
-139 230 230
-156 230 230
-172 230 230
-189 230 230
-205 230 230
-222 238 238
-238 238 238
-246 246 246
-255 255 255
-255 255 255
-8 255 238
-41 246 230
-74 238 222
-90 238 222
-106 238 222
-123 238 222
-139 238 222
-156 238 222
-172 238 230
-189 238 230
-213 246 238
-230 246 238
-246 246 246
-246 246 246
-255 255 255
-255 255 255
-24 255 222
-57 255 222
-74 255 222
-90 255 222
-106 255 222
-131 255 222
-148 255 230
-164 255 230
-180 255 230
-205 255 230
-222 255 238
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-57 255 213
-74 255 222
-90 255 213
-106 255 222
-123 255 222
-139 255 222
-156 255 222
-172 255 230
-205 255 230
-222 255 238
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/61.pal b/graphics/misc/sunny_day/61.pal
deleted file mode 100644
index 7ceed14e1..000000000
--- a/graphics/misc/sunny_day/61.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 255
-24 8 255
-49 8 255
-65 8 255
-82 8 255
-98 8 255
-123 8 255
-139 8 255
-156 8 255
-180 8 255
-197 8 255
-213 8 255
-238 8 255
-255 8 255
-255 24 246
-255 57 230
-8 32 255
-41 41 246
-49 41 246
-65 41 246
-90 41 246
-106 41 246
-123 41 246
-139 41 246
-156 41 246
-172 41 246
-197 41 246
-213 41 246
-230 41 246
-246 41 246
-255 57 246
-255 74 230
-8 49 255
-41 57 246
-74 74 238
-90 74 238
-98 74 238
-115 74 238
-131 74 238
-148 74 238
-164 74 238
-180 74 238
-197 74 238
-205 74 238
-222 74 238
-238 74 238
-255 74 238
-255 90 230
-8 65 255
-41 74 246
-74 90 238
-90 90 238
-106 90 238
-115 90 238
-131 90 238
-148 90 238
-164 90 238
-180 90 238
-197 90 238
-205 90 238
-222 90 238
-238 90 238
-255 90 238
-255 106 230
-8 90 255
-41 90 246
-74 106 238
-90 106 238
-106 106 238
-123 106 238
-139 106 238
-148 106 238
-164 106 238
-180 106 238
-197 106 238
-213 106 238
-222 106 238
-238 106 238
-255 106 238
-255 123 230
-8 106 255
-41 106 246
-74 123 238
-90 123 238
-106 123 238
-123 123 238
-139 123 238
-156 123 238
-164 123 238
-180 123 238
-197 123 238
-213 123 238
-222 123 238
-238 123 238
-255 131 238
-255 139 238
-8 123 255
-41 123 246
-74 131 238
-90 131 238
-106 139 238
-123 139 238
-139 139 238
-156 139 238
-172 139 238
-180 139 238
-197 139 238
-213 139 238
-222 139 238
-238 139 238
-255 148 238
-255 156 238
-8 148 255
-41 139 246
-74 148 238
-90 148 238
-106 148 238
-123 156 238
-139 156 238
-156 156 238
-172 156 238
-180 156 238
-197 156 238
-213 156 238
-222 156 238
-238 156 238
-255 164 238
-255 172 238
-8 164 255
-41 164 246
-74 164 238
-90 164 238
-106 164 238
-123 172 238
-139 172 238
-156 172 238
-172 172 238
-189 172 238
-197 172 238
-213 172 238
-230 172 238
-238 172 238
-255 180 238
-255 205 246
-8 180 255
-41 180 246
-74 180 238
-90 180 238
-106 180 238
-123 180 238
-139 180 238
-156 189 238
-172 189 238
-189 189 238
-205 189 238
-213 189 238
-230 189 238
-238 189 238
-255 205 246
-255 222 246
-8 197 255
-41 197 246
-74 197 238
-90 197 238
-106 197 238
-123 197 238
-139 197 238
-156 197 238
-172 205 238
-189 205 238
-213 213 246
-222 213 246
-238 213 246
-246 213 246
-255 222 246
-255 238 246
-8 222 255
-41 213 246
-74 213 238
-90 213 238
-106 213 238
-123 213 238
-139 213 238
-156 213 238
-172 213 238
-189 213 238
-213 222 246
-230 230 246
-238 230 246
-246 230 246
-255 238 246
-255 255 255
-8 238 255
-41 230 246
-74 230 238
-90 230 238
-106 230 238
-123 230 238
-139 230 238
-156 230 238
-172 230 238
-189 230 238
-213 238 246
-230 238 246
-246 246 246
-246 246 246
-255 255 255
-255 255 255
-8 255 255
-41 246 246
-74 238 238
-90 238 238
-106 238 238
-123 238 238
-139 238 238
-156 238 238
-172 238 238
-189 238 238
-213 246 246
-230 246 246
-246 246 246
-255 255 255
-255 255 255
-255 255 255
-24 255 238
-57 255 238
-74 255 238
-90 255 238
-106 255 238
-131 255 238
-148 255 238
-164 255 238
-180 255 238
-205 255 246
-222 255 246
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-57 255 230
-74 255 230
-90 255 230
-106 255 230
-123 255 230
-139 255 230
-156 255 238
-172 255 238
-205 255 238
-222 255 246
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/62.pal b/graphics/misc/sunny_day/62.pal
deleted file mode 100644
index 6bd460ecd..000000000
--- a/graphics/misc/sunny_day/62.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-24 24 255
-41 24 255
-57 24 255
-74 24 255
-90 24 255
-106 24 255
-123 24 255
-139 24 255
-156 24 255
-172 24 255
-189 24 255
-205 24 255
-222 24 255
-238 24 255
-255 24 255
-255 57 246
-24 49 255
-57 57 255
-74 57 255
-90 57 255
-98 57 255
-115 57 255
-131 57 255
-148 57 255
-164 57 255
-180 57 255
-197 57 255
-205 57 255
-222 57 255
-238 57 255
-255 57 255
-255 74 246
-24 65 255
-57 74 255
-74 74 255
-90 74 255
-98 74 255
-123 74 255
-131 74 255
-148 74 255
-164 74 255
-180 74 255
-189 74 255
-213 74 255
-222 74 255
-238 74 255
-255 74 255
-255 90 246
-24 82 255
-57 90 255
-74 90 255
-90 90 255
-106 90 255
-123 90 255
-139 90 255
-148 90 255
-164 90 255
-180 90 255
-197 90 255
-205 90 255
-222 90 255
-238 90 255
-255 90 255
-255 106 246
-24 98 255
-57 106 255
-74 106 255
-90 106 255
-106 106 255
-123 106 255
-139 106 255
-148 106 255
-164 106 255
-180 106 255
-197 106 255
-205 106 255
-222 106 255
-238 106 255
-255 106 255
-255 123 246
-24 115 255
-57 123 255
-74 123 255
-90 123 255
-106 123 255
-131 131 255
-139 131 255
-156 131 255
-164 131 255
-180 131 255
-197 131 255
-213 131 255
-222 131 255
-238 131 255
-255 131 255
-255 139 246
-24 131 255
-57 131 255
-74 131 255
-90 139 255
-106 139 255
-131 139 255
-148 148 255
-156 148 255
-172 148 255
-189 148 255
-197 148 255
-213 148 255
-230 148 255
-238 148 255
-255 148 255
-255 156 246
-24 139 255
-57 148 255
-74 148 255
-90 156 255
-106 156 255
-131 156 255
-148 156 255
-164 164 255
-172 164 255
-189 164 255
-197 164 255
-213 164 255
-230 164 255
-238 164 255
-255 164 255
-255 172 246
-24 164 255
-57 164 255
-74 164 255
-90 172 255
-106 164 255
-131 172 255
-148 172 255
-164 172 255
-180 180 255
-189 180 255
-205 180 255
-213 180 255
-230 180 255
-238 180 255
-255 180 255
-255 205 255
-24 180 255
-57 180 255
-74 180 255
-90 180 255
-106 180 255
-131 180 255
-148 189 255
-164 189 255
-180 189 255
-205 205 255
-213 205 255
-222 205 255
-230 205 255
-246 205 255
-255 205 255
-255 222 255
-24 197 255
-57 197 255
-74 197 255
-90 197 255
-106 197 255
-131 197 255
-148 197 255
-164 205 255
-180 205 255
-205 213 255
-222 222 255
-230 222 255
-238 222 255
-246 222 255
-255 222 255
-255 238 255
-24 213 255
-57 213 255
-74 213 255
-90 213 255
-106 213 255
-131 213 255
-148 213 255
-164 213 255
-180 213 255
-205 222 255
-222 230 255
-238 238 255
-246 238 255
-246 238 255
-255 238 255
-255 255 255
-24 230 255
-57 230 255
-74 230 255
-90 222 255
-106 230 255
-131 230 255
-148 230 255
-164 230 255
-180 230 255
-205 238 255
-222 238 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-24 246 255
-57 246 255
-74 238 255
-90 238 255
-106 238 255
-131 238 255
-148 238 255
-164 238 255
-180 238 255
-205 246 255
-222 246 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-24 255 255
-57 255 255
-74 255 255
-90 255 255
-106 255 255
-131 255 255
-148 255 255
-164 255 255
-180 255 255
-205 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-57 255 238
-74 255 246
-90 255 246
-106 255 246
-123 255 246
-139 255 246
-156 255 246
-172 255 246
-205 255 246
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/63.pal b/graphics/misc/sunny_day/63.pal
deleted file mode 100644
index 8cf52aa11..000000000
--- a/graphics/misc/sunny_day/63.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-57 57 255
-65 57 255
-82 57 255
-90 57 255
-106 57 255
-123 57 255
-131 57 255
-148 57 255
-164 57 255
-172 57 255
-189 57 255
-197 57 255
-213 57 255
-230 57 255
-238 57 255
-255 57 255
-57 65 255
-74 74 255
-82 74 255
-98 74 255
-106 74 255
-123 74 255
-139 74 255
-148 74 255
-164 74 255
-180 74 255
-189 74 255
-205 74 255
-222 74 255
-230 74 255
-246 74 255
-255 74 255
-57 82 255
-74 90 255
-90 90 255
-98 90 255
-115 90 255
-123 90 255
-139 90 255
-148 90 255
-164 90 255
-180 90 255
-189 90 255
-205 90 255
-213 90 255
-230 90 255
-246 90 255
-255 90 255
-57 98 255
-74 98 255
-90 106 255
-106 106 255
-115 106 255
-131 106 255
-148 106 255
-156 106 255
-164 106 255
-180 106 255
-189 106 255
-205 106 255
-222 106 255
-230 106 255
-246 106 255
-255 106 255
-57 106 255
-74 115 255
-90 115 255
-106 123 255
-123 123 255
-131 123 255
-148 123 255
-156 123 255
-172 123 255
-180 123 255
-197 123 255
-205 123 255
-222 123 255
-230 123 255
-246 123 255
-255 123 255
-57 123 255
-74 131 255
-90 131 255
-106 131 255
-123 139 255
-139 139 255
-148 139 255
-164 139 255
-172 139 255
-189 139 255
-197 139 255
-205 139 255
-222 139 255
-230 139 255
-246 139 255
-255 139 255
-57 139 255
-74 139 255
-90 139 255
-106 148 255
-123 148 255
-139 156 255
-156 156 255
-164 156 255
-180 156 255
-189 156 255
-205 156 255
-213 156 255
-222 156 255
-238 156 255
-246 156 255
-255 156 255
-57 148 255
-74 156 255
-90 156 255
-106 156 255
-123 164 255
-139 164 255
-156 172 255
-172 172 255
-180 172 255
-197 172 255
-205 172 255
-213 172 255
-230 172 255
-238 172 255
-246 172 255
-255 172 255
-57 164 255
-74 164 255
-90 172 255
-106 172 255
-123 172 255
-139 172 255
-156 180 255
-172 189 255
-205 205 255
-205 205 255
-222 205 255
-222 205 255
-230 205 255
-238 205 255
-246 205 255
-255 205 255
-57 180 255
-74 180 255
-90 180 255
-106 180 255
-123 189 255
-139 189 255
-156 189 255
-172 197 255
-205 213 255
-222 222 255
-222 222 255
-230 222 255
-238 222 255
-246 222 255
-255 222 255
-255 222 255
-57 189 255
-74 197 255
-90 197 255
-106 197 255
-123 197 255
-139 197 255
-156 205 255
-172 205 255
-205 222 255
-222 222 255
-238 238 255
-238 238 255
-246 238 255
-246 238 255
-255 238 255
-255 238 255
-57 205 255
-74 205 255
-90 205 255
-106 205 255
-123 205 255
-139 213 255
-156 213 255
-172 213 255
-205 230 255
-222 230 255
-238 238 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-57 222 255
-74 222 255
-90 222 255
-106 222 255
-123 222 255
-139 222 255
-156 222 255
-172 230 255
-205 238 255
-222 238 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-57 230 255
-74 230 255
-90 230 255
-106 230 255
-123 230 255
-139 238 255
-156 238 255
-172 238 255
-205 246 255
-222 246 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-57 246 255
-74 246 255
-90 246 255
-106 246 255
-123 246 255
-139 246 255
-156 246 255
-172 246 255
-205 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-57 255 255
-74 255 255
-90 255 255
-106 255 255
-123 255 255
-139 255 255
-156 255 255
-172 255 255
-205 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/64.pal b/graphics/misc/sunny_day/64.pal
deleted file mode 100644
index f516a8fee..000000000
--- a/graphics/misc/sunny_day/64.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 8
-24 8 8
-41 8 8
-57 8 8
-74 8 8
-90 8 8
-106 8 8
-180 0 0
-197 0 0
-213 0 0
-230 0 0
-255 0 0
-255 8 8
-255 24 24
-255 41 41
-255 65 65
-8 24 8
-24 24 8
-41 24 8
-57 24 8
-74 24 8
-90 24 8
-106 24 8
-180 24 0
-197 16 0
-213 16 0
-230 16 0
-255 16 0
-255 24 8
-255 41 24
-255 49 41
-255 74 65
-8 41 8
-24 41 8
-41 41 8
-57 41 8
-74 41 8
-90 41 8
-106 41 8
-180 49 0
-197 49 0
-213 41 0
-230 41 0
-255 41 0
-255 41 8
-255 57 24
-255 65 41
-255 90 65
-8 57 8
-24 57 8
-41 57 8
-57 57 8
-74 57 8
-90 57 8
-106 57 8
-180 74 0
-197 74 0
-213 65 0
-230 65 0
-255 65 0
-255 65 8
-255 74 24
-255 82 41
-255 98 65
-8 74 8
-24 74 8
-41 74 8
-57 74 8
-74 74 8
-90 74 8
-106 74 8
-180 98 0
-197 98 0
-213 90 0
-230 90 0
-255 82 0
-255 82 8
-255 90 24
-255 98 41
-255 115 65
-8 90 8
-24 90 8
-41 90 8
-57 90 8
-74 90 8
-90 90 8
-106 90 8
-180 123 0
-197 123 0
-213 115 0
-230 115 0
-255 106 0
-255 106 8
-255 106 24
-255 115 41
-255 123 65
-8 106 8
-24 106 8
-41 106 8
-57 106 8
-74 106 8
-90 106 8
-106 106 8
-180 156 0
-197 148 0
-213 139 0
-230 131 0
-255 131 0
-255 131 8
-255 131 24
-255 131 41
-255 139 65
-0 180 0
-24 180 0
-49 180 0
-74 180 0
-106 180 0
-131 180 0
-156 180 0
-180 180 0
-197 172 0
-213 164 0
-230 156 0
-255 156 0
-255 148 8
-255 148 24
-255 148 41
-255 156 65
-0 197 0
-24 197 0
-49 197 0
-74 197 0
-98 197 0
-123 197 0
-148 197 0
-172 197 0
-197 197 0
-213 189 0
-230 180 0
-255 180 0
-255 172 8
-255 164 24
-255 164 41
-255 164 65
-0 213 0
-24 213 0
-49 213 0
-65 213 0
-98 213 0
-123 213 0
-139 213 0
-172 213 0
-197 213 0
-213 213 0
-230 205 0
-255 197 0
-255 197 8
-255 180 24
-255 180 41
-255 180 65
-0 230 0
-16 230 0
-41 230 0
-65 230 0
-90 230 0
-115 230 0
-139 230 0
-164 230 0
-189 230 0
-213 230 0
-230 230 0
-255 222 0
-255 213 8
-255 197 24
-255 189 41
-255 189 65
-0 255 0
-24 255 0
-41 255 0
-65 255 0
-90 255 0
-115 255 0
-139 255 0
-156 255 0
-180 255 0
-205 255 0
-230 255 0
-255 255 0
-255 230 8
-255 222 24
-255 213 41
-255 205 65
-8 255 8
-24 255 8
-49 255 8
-65 255 8
-90 255 8
-106 255 8
-131 255 8
-156 255 8
-172 255 8
-197 255 8
-213 255 8
-238 255 8
-255 255 8
-255 238 24
-255 222 41
-255 213 65
-24 255 24
-41 255 24
-57 255 24
-74 255 24
-98 255 24
-115 255 24
-131 255 24
-156 255 24
-164 255 24
-189 255 24
-205 255 24
-222 255 24
-246 255 24
-255 255 24
-255 238 41
-255 230 65
-41 255 41
-57 255 41
-74 255 41
-90 255 41
-106 255 41
-123 255 41
-131 255 41
-148 255 41
-164 255 41
-180 255 41
-197 255 41
-213 255 41
-230 255 41
-246 255 41
-255 255 41
-255 246 65
-65 255 65
-82 255 65
-90 255 65
-106 255 65
-115 255 65
-131 255 65
-139 255 65
-156 255 65
-172 255 65
-180 255 65
-197 255 65
-205 255 65
-222 255 65
-230 255 65
-246 255 65
-255 255 65
diff --git a/graphics/misc/sunny_day/65.pal b/graphics/misc/sunny_day/65.pal
deleted file mode 100644
index 23c42e13f..000000000
--- a/graphics/misc/sunny_day/65.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 24
-24 8 24
-41 8 24
-57 8 24
-74 8 24
-90 8 24
-106 8 24
-180 0 24
-197 0 24
-213 0 24
-230 0 16
-255 0 24
-255 8 24
-255 24 41
-255 41 57
-255 65 82
-8 24 24
-24 24 24
-41 24 24
-57 24 24
-74 24 24
-90 24 24
-156 16 16
-180 16 16
-197 16 16
-213 16 16
-238 8 8
-246 16 16
-246 32 32
-255 49 49
-255 65 65
-255 82 82
-8 41 24
-24 41 24
-41 41 24
-57 41 24
-74 41 24
-90 41 24
-156 49 16
-180 41 16
-197 41 16
-213 41 16
-238 32 8
-246 32 16
-246 49 32
-255 57 49
-255 82 65
-255 98 82
-8 57 24
-24 57 24
-41 57 24
-57 57 24
-74 57 24
-90 57 24
-156 74 16
-180 65 16
-197 65 16
-213 65 16
-238 57 8
-246 57 16
-246 65 32
-255 74 49
-255 98 65
-255 106 82
-8 74 24
-24 74 24
-41 74 24
-57 74 24
-74 74 24
-90 74 24
-156 98 16
-180 98 16
-197 90 16
-213 90 16
-238 82 8
-246 82 16
-246 90 32
-255 98 49
-255 106 65
-255 115 82
-8 90 24
-24 90 24
-41 90 24
-57 90 24
-74 90 24
-90 90 24
-156 131 16
-180 123 16
-197 115 16
-213 115 16
-238 106 8
-246 106 16
-246 106 32
-255 106 49
-255 123 65
-255 131 82
-8 106 24
-16 156 16
-49 156 16
-74 156 16
-106 156 16
-131 156 16
-156 156 16
-180 148 16
-197 139 16
-213 139 16
-238 131 8
-246 131 16
-246 131 32
-255 131 49
-255 139 65
-255 148 82
-0 180 24
-16 180 16
-41 180 16
-74 180 16
-98 180 16
-123 180 16
-148 180 16
-180 180 16
-197 172 16
-213 164 16
-238 156 8
-246 148 16
-246 148 32
-255 148 49
-255 156 65
-255 156 82
-0 197 16
-16 197 16
-41 197 16
-74 197 16
-90 197 16
-123 197 16
-148 197 16
-172 197 16
-197 197 16
-213 189 16
-238 180 8
-246 172 16
-246 164 32
-255 164 49
-255 172 65
-255 172 82
-0 213 16
-16 213 16
-41 213 16
-65 213 16
-90 213 16
-115 213 16
-139 213 16
-164 213 16
-189 213 16
-213 213 16
-238 213 8
-246 197 16
-246 189 32
-255 180 49
-255 180 65
-255 180 82
-0 230 16
-8 238 8
-32 238 8
-65 238 8
-82 238 8
-115 238 8
-139 238 8
-164 238 8
-189 238 8
-213 238 8
-238 238 8
-246 222 16
-246 205 32
-255 197 49
-255 197 65
-255 197 82
-0 255 16
-16 246 16
-41 246 16
-65 246 16
-82 246 16
-106 246 16
-131 246 16
-156 246 16
-180 246 16
-197 246 16
-222 246 16
-246 246 16
-246 230 32
-255 213 49
-255 213 65
-255 205 82
-8 255 24
-32 246 32
-49 246 32
-74 246 32
-90 246 32
-115 246 32
-131 246 32
-148 246 32
-172 246 32
-189 246 32
-205 246 32
-230 246 32
-246 246 32
-255 230 49
-255 230 65
-255 222 82
-24 255 41
-49 255 49
-65 255 49
-82 255 49
-98 255 49
-115 255 49
-131 255 49
-148 255 49
-164 255 49
-180 255 49
-197 255 49
-213 255 49
-238 255 49
-255 255 49
-255 246 65
-255 230 82
-41 255 49
-65 255 65
-82 255 65
-98 255 65
-115 255 65
-123 255 65
-139 255 65
-156 255 65
-172 255 65
-189 255 65
-197 255 65
-213 255 65
-230 255 65
-246 255 65
-255 255 65
-255 246 82
-65 255 74
-82 255 82
-98 255 82
-106 255 82
-123 255 82
-139 255 82
-148 255 82
-156 255 82
-172 255 82
-189 255 82
-197 255 82
-205 255 82
-222 255 82
-238 255 82
-246 255 82
-255 255 82
diff --git a/graphics/misc/sunny_day/66.pal b/graphics/misc/sunny_day/66.pal
deleted file mode 100644
index 1a76a24d1..000000000
--- a/graphics/misc/sunny_day/66.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 41
-24 8 41
-41 8 41
-57 8 41
-74 8 41
-90 8 41
-106 8 41
-180 0 49
-197 0 49
-213 0 49
-230 0 41
-255 0 41
-255 8 49
-255 24 57
-255 41 74
-255 65 90
-8 24 41
-24 24 41
-41 24 41
-57 24 41
-74 24 41
-90 24 41
-156 16 49
-180 16 41
-197 16 41
-213 16 41
-238 8 32
-246 16 41
-246 32 49
-255 49 65
-255 65 82
-255 82 98
-8 41 41
-24 41 41
-41 41 41
-57 41 41
-74 41 41
-131 49 49
-156 41 41
-172 41 41
-197 32 32
-213 32 32
-222 41 41
-230 49 49
-238 65 65
-246 82 82
-255 82 82
-255 98 98
-8 57 41
-24 57 41
-41 57 41
-57 57 41
-74 57 41
-131 74 49
-156 74 41
-172 65 41
-197 57 32
-213 57 32
-222 57 41
-230 65 49
-238 74 65
-246 90 82
-255 98 82
-255 106 98
-8 74 41
-24 74 41
-41 74 41
-57 74 41
-74 74 41
-131 98 49
-156 98 41
-172 90 41
-197 82 32
-213 82 32
-222 82 41
-230 90 49
-238 90 65
-246 106 82
-255 106 82
-255 123 98
-8 90 41
-24 90 41
-49 131 49
-74 131 49
-106 131 49
-131 131 49
-156 123 41
-172 115 41
-197 115 32
-213 106 32
-222 106 41
-230 106 49
-238 115 65
-246 123 82
-255 123 82
-255 131 98
-8 106 41
-16 156 49
-41 156 41
-74 156 41
-98 156 41
-123 156 41
-156 156 41
-172 148 41
-197 139 32
-213 131 32
-222 131 41
-230 131 49
-238 131 65
-246 139 82
-255 139 82
-255 148 98
-0 180 49
-16 180 41
-41 172 41
-65 172 41
-90 172 41
-123 172 41
-148 172 41
-172 172 41
-197 164 32
-213 156 32
-222 156 41
-230 148 49
-238 148 65
-246 156 82
-255 156 82
-255 156 98
-0 197 49
-16 197 41
-32 197 32
-65 197 32
-90 197 32
-115 197 32
-139 197 32
-164 197 32
-197 197 32
-213 189 32
-222 180 41
-230 164 49
-238 164 65
-246 164 82
-255 172 82
-255 172 98
-0 213 41
-16 213 41
-32 213 32
-57 213 32
-90 213 32
-115 213 32
-139 213 32
-164 213 32
-189 213 32
-213 213 32
-222 197 41
-230 189 49
-238 180 65
-246 180 82
-255 180 82
-255 180 98
-0 230 41
-8 238 32
-41 222 41
-65 222 41
-82 222 41
-106 222 41
-131 222 41
-156 222 41
-180 222 41
-205 222 41
-222 222 41
-230 205 49
-238 197 65
-246 197 82
-255 197 82
-255 197 98
-0 255 41
-16 246 32
-49 230 49
-74 230 49
-90 230 49
-106 230 49
-131 230 49
-156 230 49
-172 230 49
-189 230 49
-213 230 49
-230 230 49
-238 213 65
-246 213 82
-255 213 82
-255 205 98
-8 255 41
-32 246 49
-65 238 65
-82 238 65
-98 238 65
-115 238 65
-131 238 65
-148 238 65
-164 238 65
-180 238 65
-197 238 65
-222 238 65
-238 238 65
-246 230 82
-255 230 82
-255 222 98
-24 255 57
-49 255 57
-82 246 82
-98 246 82
-106 246 82
-123 246 82
-139 246 82
-156 246 82
-172 246 82
-180 246 82
-197 246 82
-213 246 82
-230 246 82
-246 246 82
-255 238 82
-255 230 98
-41 255 65
-65 255 82
-82 255 82
-98 255 82
-115 255 82
-123 255 82
-139 255 82
-156 255 82
-172 255 82
-189 255 82
-197 255 82
-213 255 82
-230 255 82
-246 255 82
-255 255 82
-255 246 98
-65 255 90
-82 255 98
-98 255 98
-115 255 98
-123 255 98
-139 255 98
-148 255 98
-164 255 98
-172 255 98
-189 255 98
-197 255 98
-213 255 98
-222 255 98
-238 255 98
-246 255 98
-255 255 98
diff --git a/graphics/misc/sunny_day/67.pal b/graphics/misc/sunny_day/67.pal
deleted file mode 100644
index d7eb5fe5f..000000000
--- a/graphics/misc/sunny_day/67.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 57
-24 8 57
-41 8 57
-57 8 57
-74 8 57
-90 8 57
-106 8 57
-180 0 74
-197 0 74
-213 0 65
-230 0 65
-255 0 65
-255 8 65
-255 24 74
-255 41 90
-255 65 106
-8 24 57
-24 24 57
-41 24 57
-57 24 57
-74 24 57
-90 24 57
-156 16 74
-180 16 74
-197 16 74
-213 16 65
-238 8 65
-246 16 65
-246 32 74
-255 49 82
-255 65 98
-255 82 106
-8 41 57
-24 41 57
-41 41 57
-57 41 57
-74 41 57
-131 49 74
-156 41 74
-172 41 65
-197 32 65
-213 32 57
-222 41 65
-230 49 74
-238 65 82
-246 82 98
-255 82 98
-255 98 115
-8 57 57
-24 57 57
-41 57 57
-57 57 57
-106 74 74
-131 65 65
-148 65 65
-172 57 57
-189 57 57
-205 57 57
-213 65 65
-222 74 74
-230 90 90
-246 98 98
-255 98 98
-255 115 115
-8 74 57
-24 74 57
-41 74 57
-74 106 74
-106 106 74
-131 98 65
-148 90 65
-172 90 57
-189 82 57
-205 82 57
-213 90 65
-222 90 74
-230 106 90
-246 106 98
-255 115 98
-255 123 115
-8 90 57
-24 90 57
-49 131 74
-65 131 65
-98 131 65
-131 131 65
-148 123 65
-172 115 57
-189 106 57
-205 106 57
-213 106 65
-222 115 74
-230 123 90
-246 123 98
-255 123 98
-255 139 115
-8 106 57
-16 156 74
-41 156 74
-65 148 65
-90 148 65
-123 148 65
-148 148 65
-172 139 57
-189 131 57
-205 131 57
-213 131 65
-222 131 74
-230 139 90
-246 139 98
-255 139 98
-255 156 115
-0 180 74
-16 180 65
-41 172 65
-57 172 57
-90 172 57
-115 172 57
-139 172 57
-172 172 57
-189 164 57
-205 156 57
-213 148 65
-222 148 74
-230 156 90
-246 156 98
-255 156 98
-255 164 115
-0 197 74
-16 197 65
-32 197 57
-57 189 57
-82 189 57
-106 189 57
-139 189 57
-164 189 57
-189 189 57
-205 180 57
-213 172 65
-222 164 74
-230 172 90
-246 172 98
-255 172 98
-255 172 115
-0 213 65
-16 213 65
-32 213 57
-57 205 57
-82 205 57
-106 205 57
-131 205 57
-156 205 57
-180 205 57
-205 205 57
-213 189 65
-222 180 74
-230 180 90
-246 180 98
-255 180 98
-255 189 115
-0 230 65
-8 238 57
-41 222 57
-65 213 65
-90 213 65
-115 213 65
-131 213 65
-156 213 65
-172 213 65
-197 213 65
-213 213 65
-222 197 74
-230 197 90
-246 197 98
-255 197 98
-255 197 115
-0 255 65
-16 246 57
-49 230 65
-74 222 74
-98 222 74
-115 222 74
-131 222 74
-148 222 74
-164 222 74
-180 222 74
-205 222 74
-222 222 74
-230 213 90
-246 213 98
-255 213 98
-255 205 115
-8 255 65
-32 246 65
-65 238 74
-90 230 90
-106 230 90
-123 230 90
-139 230 90
-156 230 90
-172 230 90
-189 230 90
-205 230 90
-213 230 90
-230 230 90
-246 230 98
-255 230 98
-255 222 115
-24 255 74
-49 255 74
-82 246 90
-98 246 98
-115 246 98
-123 246 98
-139 246 98
-156 246 98
-172 246 98
-189 246 98
-197 246 98
-213 246 98
-230 246 98
-246 246 98
-255 238 98
-255 230 115
-41 255 82
-65 255 98
-82 255 98
-98 255 98
-115 255 98
-131 255 98
-148 255 98
-156 255 98
-172 255 98
-189 255 98
-197 255 98
-213 255 98
-230 255 98
-246 255 98
-255 255 98
-255 246 115
-65 255 98
-82 255 106
-98 255 106
-115 255 115
-131 255 115
-139 255 115
-156 255 115
-164 255 115
-172 255 115
-189 255 115
-197 255 115
-213 255 115
-222 255 115
-238 255 115
-246 255 115
-255 255 115
diff --git a/graphics/misc/sunny_day/68.pal b/graphics/misc/sunny_day/68.pal
deleted file mode 100644
index b325c14ad..000000000
--- a/graphics/misc/sunny_day/68.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 74
-24 8 74
-41 8 74
-57 8 74
-74 8 74
-90 8 74
-106 8 74
-180 0 106
-197 0 98
-213 0 98
-230 0 90
-255 0 90
-255 8 90
-255 24 98
-255 41 106
-255 65 115
-8 24 74
-24 24 74
-41 24 74
-57 24 74
-74 24 74
-90 24 74
-156 16 106
-180 16 98
-197 16 90
-213 16 90
-238 8 82
-246 16 82
-246 32 90
-255 49 98
-255 65 115
-255 82 123
-8 41 74
-24 41 74
-41 41 74
-57 41 74
-74 41 74
-131 49 106
-156 41 98
-172 41 90
-197 32 90
-213 32 90
-222 41 82
-230 49 90
-238 65 98
-246 82 106
-255 82 115
-255 98 123
-8 57 74
-24 57 74
-41 57 74
-74 74 106
-106 74 106
-131 65 98
-148 65 90
-172 57 90
-189 57 82
-205 57 82
-213 65 90
-222 74 98
-230 90 106
-246 98 115
-255 98 115
-255 115 131
-8 74 74
-24 74 74
-41 74 74
-74 106 106
-106 90 90
-123 90 90
-148 82 82
-164 82 82
-180 82 82
-197 90 90
-205 90 90
-213 106 106
-230 106 106
-246 115 115
-255 115 115
-255 131 131
-8 90 74
-24 90 74
-49 131 98
-65 131 98
-90 123 90
-123 123 90
-148 115 82
-164 106 82
-180 106 82
-197 106 90
-205 106 90
-213 123 106
-230 123 106
-246 131 115
-255 131 115
-255 148 131
-8 106 74
-16 156 98
-41 156 98
-65 148 90
-82 148 82
-115 148 82
-148 148 82
-164 139 82
-180 131 82
-197 131 90
-205 131 90
-213 139 106
-230 139 106
-246 139 115
-255 148 115
-255 156 131
-0 180 98
-16 180 98
-41 172 90
-57 172 90
-82 164 82
-106 164 82
-139 164 82
-164 164 82
-180 156 82
-197 148 90
-205 148 90
-213 156 106
-230 156 106
-246 156 115
-255 156 115
-255 164 131
-0 197 98
-16 197 90
-32 197 82
-57 189 82
-82 180 82
-106 180 82
-131 180 82
-156 180 82
-180 180 82
-197 172 90
-205 164 90
-213 172 106
-230 172 106
-246 172 115
-255 172 115
-255 180 131
-0 213 90
-16 213 90
-32 213 82
-57 205 82
-90 197 90
-106 197 90
-131 197 90
-148 197 90
-172 197 90
-197 197 90
-205 180 90
-213 180 106
-230 189 106
-246 189 115
-255 189 115
-255 189 131
-0 230 90
-8 238 82
-41 222 82
-65 213 90
-90 205 90
-115 205 90
-131 205 90
-148 205 90
-164 205 90
-189 205 90
-205 205 90
-213 197 106
-230 197 106
-246 197 115
-255 197 115
-255 197 131
-0 255 82
-16 246 82
-49 230 90
-74 222 90
-106 213 106
-123 213 106
-139 213 106
-156 213 106
-172 213 106
-189 213 106
-205 213 106
-213 213 106
-230 213 106
-246 213 115
-255 213 115
-255 213 131
-8 255 82
-32 246 90
-65 238 90
-90 230 106
-106 230 106
-123 230 106
-139 230 106
-156 230 106
-172 230 106
-189 230 106
-197 230 106
-213 230 106
-230 230 106
-246 230 115
-255 230 115
-255 222 131
-24 255 90
-49 255 98
-82 246 106
-98 246 106
-115 246 115
-131 246 115
-148 246 115
-156 246 115
-172 246 115
-189 246 115
-197 246 115
-213 246 115
-230 246 115
-246 246 115
-255 238 115
-255 230 131
-41 255 98
-65 255 106
-82 255 106
-98 255 115
-115 255 115
-131 255 115
-148 255 115
-164 255 115
-172 255 115
-189 255 115
-205 255 115
-213 255 115
-230 255 115
-246 255 115
-255 255 115
-255 246 131
-65 255 115
-82 255 115
-98 255 123
-115 255 123
-131 255 131
-148 255 131
-156 255 131
-172 255 131
-180 255 131
-189 255 131
-205 255 131
-213 255 131
-222 255 131
-238 255 131
-246 255 131
-255 255 131
diff --git a/graphics/misc/sunny_day/69.pal b/graphics/misc/sunny_day/69.pal
deleted file mode 100644
index 0612a7182..000000000
--- a/graphics/misc/sunny_day/69.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 90
-24 8 90
-41 8 90
-57 8 90
-74 8 90
-90 8 90
-106 8 90
-180 0 131
-197 0 123
-213 0 123
-230 0 115
-255 0 115
-255 8 106
-255 24 115
-255 41 123
-255 65 131
-8 24 90
-24 24 90
-41 24 90
-57 24 90
-74 24 90
-90 24 90
-156 16 131
-180 16 123
-197 16 123
-213 16 115
-238 8 115
-246 16 106
-246 32 115
-255 49 115
-255 65 123
-255 82 139
-8 41 90
-24 41 90
-49 49 131
-74 49 131
-98 49 131
-131 49 131
-156 41 123
-172 41 123
-197 32 115
-213 32 115
-222 41 106
-230 49 106
-238 65 115
-246 82 123
-255 82 123
-255 98 139
-8 57 90
-24 57 90
-49 74 131
-65 65 131
-98 65 131
-131 65 131
-148 65 123
-172 57 115
-189 57 106
-205 57 106
-213 65 115
-222 74 115
-230 90 123
-246 98 123
-255 98 131
-255 115 139
-8 74 90
-24 74 90
-49 106 131
-65 98 131
-90 90 123
-123 90 123
-148 82 115
-164 82 106
-180 82 106
-197 90 106
-205 90 115
-213 106 123
-230 106 123
-246 115 131
-255 115 131
-255 131 148
-8 90 90
-24 90 90
-49 131 131
-65 131 131
-90 123 123
-123 106 106
-148 106 106
-164 98 98
-172 106 106
-189 106 106
-205 123 123
-213 123 123
-230 123 123
-246 131 131
-255 139 139
-255 148 148
-8 106 90
-16 156 131
-41 156 123
-65 148 123
-82 148 115
-106 148 106
-148 148 106
-164 131 98
-172 131 106
-189 131 106
-205 139 123
-213 139 123
-230 139 123
-246 148 131
-255 148 139
-255 156 148
-0 180 123
-16 180 123
-41 172 115
-57 172 115
-82 164 106
-98 164 98
-131 164 98
-164 164 98
-172 148 106
-189 148 106
-205 156 123
-213 156 123
-230 156 123
-246 156 131
-255 164 139
-255 172 148
-0 197 123
-16 197 115
-32 197 115
-57 189 106
-82 180 106
-106 172 106
-131 172 106
-148 172 106
-172 172 106
-189 172 106
-205 172 123
-213 172 123
-230 172 123
-246 172 131
-255 172 139
-255 180 148
-0 213 115
-16 213 115
-32 213 106
-57 205 106
-90 197 106
-106 189 106
-131 189 106
-148 189 106
-172 189 106
-189 189 106
-205 189 123
-213 180 123
-230 189 123
-246 189 131
-255 189 139
-255 189 148
-0 230 115
-8 238 106
-41 222 106
-65 213 106
-90 205 106
-123 205 123
-139 205 123
-156 205 123
-172 205 123
-189 205 123
-205 205 123
-213 197 123
-230 197 123
-246 197 131
-255 205 139
-255 205 148
-0 255 106
-16 246 106
-49 230 106
-74 222 115
-106 213 123
-123 213 123
-139 213 123
-156 213 123
-172 213 123
-189 213 123
-205 213 123
-213 213 123
-230 213 123
-246 213 131
-255 213 139
-255 213 148
-8 255 106
-32 246 106
-65 238 115
-90 230 123
-106 230 123
-123 230 123
-139 230 123
-156 230 123
-172 230 123
-189 230 123
-205 230 123
-213 230 123
-230 230 123
-246 230 131
-255 230 139
-255 222 148
-24 255 106
-49 255 106
-82 246 123
-98 246 123
-115 246 131
-131 246 131
-148 246 131
-156 246 131
-172 246 131
-189 246 131
-205 246 131
-213 246 131
-230 246 131
-246 246 131
-255 238 139
-255 238 148
-41 255 115
-65 255 123
-82 255 123
-98 255 123
-115 255 131
-139 255 139
-148 255 139
-164 255 139
-172 255 139
-189 255 139
-205 255 139
-213 255 139
-230 255 139
-246 255 139
-255 255 139
-255 246 148
-65 255 123
-82 255 131
-98 255 131
-115 255 139
-131 255 148
-148 255 148
-164 255 148
-172 255 148
-180 255 148
-197 255 148
-205 255 148
-213 255 148
-230 255 148
-238 255 148
-246 255 148
-255 255 148
diff --git a/graphics/misc/sunny_day/7.pal b/graphics/misc/sunny_day/7.pal
deleted file mode 100644
index 0aa339668..000000000
--- a/graphics/misc/sunny_day/7.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 139
-16 0 139
-41 0 139
-57 0 139
-74 0 139
-98 0 139
-115 0 139
-139 0 139
-156 0 139
-172 0 131
-189 0 131
-205 0 131
-222 0 131
-238 0 131
-255 0 131
-255 24 131
-0 24 139
-16 16 131
-41 16 131
-57 16 131
-74 16 131
-98 16 131
-115 16 131
-131 16 131
-156 16 131
-172 16 131
-189 16 131
-205 16 131
-222 16 131
-238 16 131
-246 32 131
-255 41 139
-0 41 139
-16 41 131
-41 41 131
-57 41 131
-74 41 131
-90 41 131
-115 41 131
-131 41 131
-148 32 131
-172 32 131
-189 32 131
-205 32 131
-222 32 131
-230 49 139
-246 49 131
-255 57 131
-0 57 139
-16 57 131
-41 57 131
-57 57 131
-74 57 131
-90 57 131
-115 57 131
-131 57 131
-148 57 131
-164 57 131
-189 49 131
-205 57 131
-213 65 131
-230 65 131
-246 65 131
-255 74 139
-0 82 139
-16 74 131
-41 74 131
-57 74 131
-74 74 131
-90 74 131
-115 74 131
-131 74 131
-148 74 131
-164 74 131
-180 74 131
-197 82 131
-213 82 131
-230 82 131
-246 82 131
-255 90 139
-0 98 139
-16 98 131
-41 98 131
-57 90 131
-74 90 131
-90 90 131
-115 90 131
-131 90 131
-148 90 131
-164 90 131
-180 98 131
-197 98 131
-213 98 139
-230 98 131
-246 106 139
-255 106 139
-0 115 139
-16 115 131
-41 115 131
-57 115 131
-74 115 131
-90 115 131
-106 106 131
-131 106 131
-148 106 131
-164 115 131
-180 115 131
-197 115 131
-213 115 131
-230 123 139
-246 123 139
-255 123 139
-0 139 139
-16 131 131
-41 131 131
-57 131 131
-74 131 131
-90 131 131
-106 131 131
-131 131 131
-148 131 131
-164 131 131
-180 139 139
-197 131 131
-213 139 139
-230 139 139
-246 139 139
-255 139 139
-0 156 131
-16 156 131
-32 148 131
-57 148 131
-74 148 131
-90 148 131
-106 148 131
-131 148 131
-148 148 131
-164 148 131
-180 148 139
-197 148 131
-213 148 139
-230 148 139
-246 156 139
-255 156 139
-0 172 131
-16 172 131
-32 172 131
-57 164 131
-74 164 131
-90 164 131
-115 164 131
-131 164 131
-148 164 131
-164 164 131
-180 164 139
-197 164 131
-213 164 139
-230 164 139
-246 172 139
-255 172 139
-0 189 131
-16 189 131
-32 189 131
-49 189 131
-74 180 131
-98 180 131
-115 180 131
-139 180 139
-148 180 139
-164 180 139
-180 180 139
-197 180 131
-213 180 139
-230 180 139
-246 180 139
-255 189 139
-0 205 123
-16 205 123
-32 205 131
-57 205 131
-82 197 131
-98 197 131
-115 197 131
-131 197 131
-148 197 131
-164 197 131
-180 197 131
-197 197 131
-213 197 139
-230 197 139
-246 197 139
-255 197 139
-0 222 123
-16 222 123
-32 222 131
-65 213 131
-82 213 131
-98 213 131
-115 213 131
-139 213 139
-156 213 139
-164 213 139
-180 213 139
-197 213 139
-213 213 139
-230 213 139
-246 213 139
-255 213 139
-0 238 131
-16 238 131
-49 230 131
-65 230 131
-82 230 131
-98 230 131
-123 230 131
-139 230 139
-156 230 139
-164 230 139
-180 230 139
-197 230 139
-213 230 139
-230 230 139
-246 230 139
-255 230 139
-0 255 131
-32 246 131
-49 246 131
-65 246 131
-82 246 131
-106 246 131
-123 246 131
-139 246 139
-156 246 139
-172 246 139
-189 246 139
-205 246 139
-213 246 139
-230 246 139
-246 246 139
-255 246 139
-24 255 131
-41 255 131
-57 255 131
-74 255 131
-90 255 139
-106 255 139
-123 255 139
-139 255 139
-156 255 139
-172 255 139
-189 255 139
-197 255 139
-213 255 139
-230 255 139
-246 255 139
-255 255 139
diff --git a/graphics/misc/sunny_day/70.pal b/graphics/misc/sunny_day/70.pal
deleted file mode 100644
index 7c949a9ec..000000000
--- a/graphics/misc/sunny_day/70.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 106
-24 8 106
-41 8 106
-57 8 106
-74 8 106
-90 8 106
-106 8 106
-180 0 156
-197 0 148
-213 0 139
-230 0 139
-255 0 139
-255 8 131
-255 24 131
-255 41 131
-255 65 139
-8 24 106
-16 16 156
-49 16 156
-74 16 156
-98 16 156
-131 16 156
-156 16 156
-180 16 148
-197 16 148
-213 16 139
-238 8 139
-246 16 131
-246 32 131
-255 49 131
-255 65 139
-255 82 148
-8 41 106
-16 49 156
-41 41 156
-74 41 156
-98 41 156
-123 41 156
-156 41 156
-172 41 148
-197 32 139
-213 32 139
-222 41 131
-230 49 131
-238 65 131
-246 82 139
-255 82 139
-255 98 148
-8 57 106
-16 74 156
-41 74 156
-65 65 148
-90 65 148
-123 65 148
-148 65 148
-172 57 139
-189 57 139
-205 57 131
-213 65 131
-222 74 131
-230 90 139
-246 98 139
-255 98 148
-255 115 156
-8 74 106
-16 106 156
-41 98 156
-65 90 148
-82 82 148
-115 82 148
-148 82 148
-164 82 139
-180 82 131
-197 90 131
-205 90 131
-213 106 139
-230 106 139
-246 115 148
-255 115 148
-255 131 156
-8 90 106
-16 131 156
-41 123 156
-65 123 148
-82 115 148
-106 106 148
-148 106 148
-164 98 131
-172 106 131
-189 106 131
-205 123 139
-213 123 139
-230 123 139
-246 131 148
-255 139 148
-255 148 164
-8 106 106
-16 156 156
-41 156 156
-65 148 148
-82 148 148
-106 148 148
-139 123 123
-156 123 123
-172 123 123
-189 139 139
-205 139 139
-213 139 139
-230 148 148
-246 148 148
-255 156 156
-255 164 164
-0 180 156
-16 180 148
-41 172 148
-57 172 139
-82 164 139
-98 164 131
-123 156 123
-156 156 123
-172 148 123
-189 156 139
-205 156 139
-213 156 139
-230 156 148
-246 164 148
-255 164 156
-255 180 164
-0 197 148
-16 197 139
-32 197 139
-57 189 131
-82 180 131
-106 172 131
-123 172 123
-148 172 123
-172 172 123
-189 172 139
-205 172 139
-213 172 139
-230 172 148
-246 172 148
-255 180 156
-255 189 164
-0 213 139
-16 213 139
-32 213 131
-57 205 131
-90 197 131
-106 189 131
-139 189 139
-156 189 139
-172 189 139
-189 189 139
-205 189 139
-213 189 139
-230 189 148
-246 189 148
-255 189 156
-255 197 164
-0 230 131
-8 238 131
-41 222 131
-65 213 131
-90 205 131
-123 205 139
-139 205 139
-156 205 139
-172 205 139
-189 205 139
-205 205 139
-213 197 139
-230 197 148
-246 205 148
-255 205 156
-255 205 164
-0 255 131
-16 246 131
-49 230 131
-74 222 131
-106 213 139
-123 213 139
-139 213 139
-156 213 139
-172 213 139
-189 213 139
-205 213 139
-213 213 139
-230 213 148
-246 213 148
-255 213 156
-255 222 164
-8 255 131
-32 246 131
-65 238 131
-90 230 139
-106 230 139
-123 230 139
-148 230 148
-156 230 148
-172 230 148
-189 230 148
-205 230 148
-213 230 148
-230 230 148
-246 230 148
-255 230 156
-255 230 164
-24 255 131
-49 255 131
-82 246 139
-98 246 139
-115 246 139
-131 246 148
-148 246 148
-164 246 148
-180 246 148
-189 246 148
-205 246 148
-213 246 148
-230 246 148
-246 246 148
-255 238 156
-255 238 164
-41 255 131
-65 255 139
-82 255 139
-98 255 139
-115 255 148
-139 255 148
-156 255 156
-164 255 156
-180 255 156
-189 255 156
-205 255 156
-222 255 156
-230 255 156
-246 255 156
-255 255 156
-255 246 164
-65 255 139
-82 255 148
-98 255 148
-115 255 156
-131 255 156
-148 255 156
-164 255 164
-180 255 164
-189 255 164
-197 255 164
-205 255 164
-222 255 164
-230 255 164
-238 255 164
-246 255 164
-255 255 164
diff --git a/graphics/misc/sunny_day/71.pal b/graphics/misc/sunny_day/71.pal
deleted file mode 100644
index 3e7ca2368..000000000
--- a/graphics/misc/sunny_day/71.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 180
-24 0 180
-49 0 180
-74 0 180
-98 0 180
-123 0 180
-156 0 180
-180 0 180
-197 0 172
-213 0 172
-230 0 164
-255 0 156
-255 8 156
-255 24 156
-255 41 148
-255 65 156
-0 24 180
-16 16 180
-41 16 180
-65 16 180
-98 16 180
-123 16 180
-148 16 180
-180 16 180
-197 16 172
-213 16 164
-238 8 164
-246 16 156
-246 32 148
-255 49 148
-255 65 156
-255 82 156
-0 49 180
-16 41 180
-41 41 172
-65 41 172
-90 41 172
-115 41 172
-148 41 172
-172 41 172
-197 32 164
-213 32 164
-222 41 156
-230 49 156
-238 65 148
-246 82 156
-255 82 156
-255 98 164
-0 74 180
-16 74 180
-41 65 172
-57 57 172
-90 57 172
-115 57 172
-139 57 172
-172 57 172
-189 57 164
-205 57 156
-213 65 156
-222 74 148
-230 90 156
-246 98 156
-255 98 156
-255 115 164
-0 106 180
-16 98 180
-41 90 172
-57 90 172
-82 82 164
-106 82 164
-139 82 164
-164 82 164
-180 82 156
-197 90 148
-205 90 148
-213 106 156
-230 106 156
-246 115 156
-255 115 164
-255 131 172
-0 131 180
-16 123 180
-41 123 172
-57 115 172
-82 106 164
-98 98 164
-131 98 164
-164 98 164
-172 106 148
-189 106 148
-205 123 156
-213 123 156
-230 123 156
-246 131 156
-255 139 164
-255 148 172
-0 156 180
-16 148 180
-41 148 172
-57 139 172
-82 139 164
-98 131 164
-123 123 156
-156 123 156
-172 123 148
-189 139 156
-205 139 156
-213 139 156
-230 148 156
-246 148 164
-255 156 164
-255 164 180
-0 180 180
-16 180 180
-41 172 172
-57 172 172
-82 164 164
-98 164 164
-123 156 156
-156 139 139
-172 148 148
-189 148 148
-205 156 156
-222 156 156
-230 164 164
-246 164 164
-255 172 172
-255 180 180
-0 197 172
-16 197 172
-32 197 164
-57 189 164
-82 180 156
-106 172 148
-123 172 148
-148 172 148
-172 172 148
-189 172 148
-205 172 156
-222 172 156
-230 172 164
-246 180 164
-255 180 172
-255 197 180
-0 213 164
-16 213 164
-32 213 156
-57 205 156
-90 197 148
-106 189 148
-139 189 156
-148 189 148
-172 189 148
-189 189 148
-205 189 156
-222 189 156
-230 189 164
-246 189 164
-255 197 172
-255 205 180
-0 230 156
-8 238 156
-41 222 156
-65 213 148
-90 205 148
-123 205 156
-139 205 156
-156 205 156
-172 205 156
-189 205 156
-205 205 156
-222 205 156
-230 205 164
-246 205 164
-255 205 172
-255 213 180
-0 255 156
-16 246 148
-49 230 148
-74 222 148
-106 213 156
-123 213 156
-139 213 156
-156 222 156
-172 222 156
-189 222 156
-205 222 156
-222 222 156
-230 213 164
-246 213 164
-255 222 172
-255 222 180
-8 255 148
-32 246 148
-65 238 148
-90 230 156
-106 230 156
-123 230 156
-148 230 156
-164 230 164
-172 230 164
-189 230 164
-205 230 164
-213 230 164
-230 230 164
-246 230 164
-255 230 172
-255 230 180
-24 255 148
-49 255 148
-82 246 156
-98 246 156
-115 246 156
-131 246 156
-148 246 164
-164 246 164
-180 246 164
-189 246 164
-205 246 164
-213 246 164
-230 246 164
-246 246 164
-255 246 172
-255 238 180
-41 255 148
-65 255 156
-82 255 156
-98 255 156
-115 255 156
-139 255 164
-156 255 164
-172 255 172
-180 255 172
-197 255 172
-205 255 172
-222 255 172
-230 255 172
-246 255 172
-255 255 172
-255 246 180
-65 255 156
-82 255 156
-98 255 156
-115 255 164
-131 255 164
-148 255 172
-164 255 180
-180 255 180
-197 255 180
-205 255 180
-213 255 180
-222 255 180
-230 255 180
-238 255 180
-246 255 180
-255 255 180
diff --git a/graphics/misc/sunny_day/72.pal b/graphics/misc/sunny_day/72.pal
deleted file mode 100644
index e5109a114..000000000
--- a/graphics/misc/sunny_day/72.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 197
-16 0 197
-49 0 197
-74 0 197
-98 0 197
-123 0 197
-148 0 197
-172 0 197
-197 0 197
-213 0 197
-230 0 189
-255 0 180
-255 8 172
-255 24 164
-255 41 164
-255 65 172
-0 24 197
-16 16 197
-41 16 197
-65 16 197
-90 16 197
-115 16 197
-139 16 197
-172 16 197
-197 16 197
-213 16 189
-238 8 189
-246 16 180
-246 32 172
-255 49 164
-255 65 172
-255 82 172
-0 49 197
-16 41 197
-32 32 197
-57 32 197
-82 32 197
-115 32 197
-139 32 197
-164 32 197
-197 32 197
-213 32 189
-222 41 180
-230 49 172
-238 65 164
-246 82 172
-255 82 172
-255 98 172
-0 74 197
-16 74 197
-32 65 197
-57 57 189
-82 57 189
-106 57 189
-131 57 189
-164 57 189
-189 57 189
-205 57 180
-213 65 172
-222 74 164
-230 90 172
-246 98 172
-255 98 172
-255 115 172
-0 98 197
-16 90 197
-32 90 197
-57 82 189
-82 82 180
-106 82 180
-131 82 180
-156 82 180
-180 82 180
-197 90 172
-205 90 164
-213 106 172
-230 106 172
-246 115 172
-255 115 172
-255 131 180
-0 123 197
-16 123 197
-32 115 197
-57 106 189
-82 106 180
-106 106 172
-131 106 172
-148 106 172
-172 106 172
-189 106 172
-205 123 172
-213 123 172
-230 123 172
-246 131 172
-255 139 172
-255 148 180
-0 148 197
-16 148 197
-32 139 197
-57 139 189
-82 131 180
-106 131 172
-123 123 172
-148 123 172
-172 123 172
-189 139 172
-205 139 172
-213 139 172
-230 148 172
-246 148 180
-255 156 180
-255 164 189
-0 172 197
-16 172 197
-32 164 197
-57 164 189
-82 156 180
-106 148 172
-123 148 172
-148 148 172
-172 148 172
-189 148 172
-205 156 172
-222 156 172
-230 164 172
-246 164 180
-255 172 180
-255 180 197
-0 197 197
-16 197 197
-32 197 197
-57 189 189
-82 180 180
-106 172 172
-123 172 172
-148 172 172
-180 164 164
-189 164 164
-205 172 172
-222 172 172
-230 180 180
-246 180 180
-255 189 189
-255 213 213
-0 213 189
-16 213 189
-32 213 189
-57 205 180
-90 197 172
-106 189 172
-139 189 172
-148 189 172
-164 189 164
-189 189 164
-205 189 172
-222 189 172
-230 189 180
-246 197 180
-255 197 189
-255 222 213
-0 230 180
-8 238 180
-41 222 180
-65 213 172
-90 205 164
-123 205 172
-139 205 172
-156 205 172
-172 205 172
-189 205 172
-205 205 172
-222 205 172
-230 205 180
-246 205 180
-255 213 189
-255 222 213
-0 255 180
-16 246 172
-49 230 164
-74 222 164
-106 213 172
-123 213 172
-139 213 172
-156 222 172
-172 222 172
-189 222 172
-205 222 172
-222 222 172
-230 222 180
-246 222 180
-255 222 189
-255 230 213
-8 255 172
-32 246 164
-65 238 164
-90 230 172
-106 230 172
-123 230 172
-148 230 172
-164 230 172
-180 230 180
-189 230 180
-205 230 180
-222 230 180
-230 230 180
-246 230 180
-255 230 189
-255 238 213
-24 255 164
-49 255 164
-82 246 164
-98 246 172
-115 246 172
-131 246 172
-148 246 172
-164 246 180
-180 246 180
-197 246 180
-205 246 180
-222 246 180
-230 246 180
-246 246 180
-255 246 189
-255 246 213
-41 255 164
-65 255 172
-82 255 172
-98 255 172
-115 255 172
-139 255 172
-156 255 180
-172 255 180
-189 255 189
-197 255 189
-213 255 189
-222 255 189
-230 255 189
-246 255 189
-255 255 189
-255 255 213
-65 255 164
-82 255 172
-98 255 172
-115 255 172
-131 255 180
-148 255 180
-164 255 189
-180 255 197
-213 255 213
-222 255 213
-230 255 213
-230 255 213
-238 255 213
-246 255 213
-255 255 213
-255 255 213
diff --git a/graphics/misc/sunny_day/73.pal b/graphics/misc/sunny_day/73.pal
deleted file mode 100644
index 07b6ba465..000000000
--- a/graphics/misc/sunny_day/73.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 213
-16 0 213
-41 0 213
-65 0 213
-90 0 213
-115 0 213
-139 0 213
-164 0 213
-189 0 213
-213 0 213
-230 0 213
-255 0 205
-255 8 197
-255 24 189
-255 41 180
-255 65 180
-0 24 213
-16 16 213
-41 16 213
-65 16 213
-90 16 213
-115 16 213
-139 16 213
-164 16 213
-189 16 213
-213 16 213
-238 8 213
-246 16 197
-246 32 189
-255 49 180
-255 65 189
-255 82 189
-0 49 213
-16 41 213
-32 32 213
-57 32 213
-82 32 213
-106 32 213
-131 32 213
-156 32 213
-189 32 213
-213 32 213
-222 41 205
-230 49 189
-238 65 180
-246 82 180
-255 82 189
-255 98 189
-0 65 213
-16 65 213
-32 57 213
-57 57 205
-82 57 205
-106 57 205
-131 57 205
-156 57 205
-180 57 205
-205 57 205
-213 65 197
-222 74 180
-230 90 189
-246 98 189
-255 98 189
-255 115 189
-0 98 213
-16 90 213
-32 90 213
-57 82 205
-90 90 197
-106 90 197
-131 90 197
-148 90 197
-172 90 197
-197 90 197
-205 90 189
-213 106 189
-230 106 189
-246 115 189
-255 115 189
-255 131 189
-0 123 213
-16 115 213
-32 115 213
-57 106 205
-90 106 197
-106 106 189
-131 106 189
-148 106 189
-172 106 189
-189 106 189
-205 123 189
-213 123 189
-230 123 189
-246 131 189
-255 139 189
-255 148 197
-0 139 213
-16 139 213
-32 139 213
-57 131 205
-90 131 197
-106 131 189
-139 139 189
-156 139 189
-172 139 189
-189 139 189
-205 139 189
-213 139 189
-230 148 189
-246 148 189
-255 156 189
-255 164 197
-0 172 213
-16 164 213
-32 164 213
-57 156 205
-90 148 197
-106 148 189
-139 156 189
-148 148 189
-172 148 189
-189 148 189
-205 156 189
-222 156 189
-230 164 189
-246 164 189
-255 172 197
-255 180 205
-0 197 213
-16 189 213
-32 189 213
-57 180 205
-90 172 197
-106 172 189
-139 172 189
-148 172 189
-164 164 189
-189 164 189
-205 172 189
-222 172 189
-230 180 189
-246 180 197
-255 189 197
-255 213 222
-0 213 213
-16 213 213
-32 213 213
-57 205 205
-90 197 197
-106 189 189
-139 189 189
-148 189 189
-164 189 189
-197 180 180
-205 189 189
-222 189 189
-230 197 197
-246 197 197
-255 213 213
-255 230 230
-0 230 205
-8 238 213
-41 222 197
-65 213 189
-90 205 180
-123 205 189
-139 205 189
-156 205 189
-172 205 189
-189 205 189
-205 205 189
-222 205 189
-230 205 197
-246 213 197
-255 222 213
-255 230 230
-0 255 197
-16 246 197
-49 230 189
-74 222 180
-106 213 180
-123 213 180
-139 213 189
-156 222 189
-172 222 189
-189 222 189
-205 222 189
-222 222 189
-230 222 197
-246 222 197
-255 230 213
-255 238 230
-8 255 197
-32 246 189
-65 238 180
-90 230 180
-106 230 189
-123 230 189
-148 230 189
-164 230 189
-180 230 189
-197 230 197
-205 230 197
-222 230 197
-230 230 197
-246 230 197
-255 238 213
-255 246 230
-24 255 180
-49 255 180
-82 246 180
-98 246 180
-115 246 189
-131 246 189
-148 246 189
-164 246 189
-180 246 197
-197 246 197
-213 246 197
-222 246 197
-230 246 197
-246 246 197
-255 246 213
-255 246 230
-41 255 180
-65 255 180
-82 255 180
-98 255 180
-115 255 189
-139 255 189
-156 255 189
-172 255 197
-189 255 197
-213 255 213
-222 255 213
-230 255 213
-238 255 213
-246 255 213
-255 255 213
-255 255 230
-65 255 180
-82 255 180
-98 255 180
-115 255 189
-131 255 189
-148 255 189
-164 255 197
-180 255 205
-213 255 222
-230 255 230
-230 255 230
-238 255 230
-246 255 230
-246 255 230
-255 255 230
-255 255 230
diff --git a/graphics/misc/sunny_day/74.pal b/graphics/misc/sunny_day/74.pal
deleted file mode 100644
index f77fe0534..000000000
--- a/graphics/misc/sunny_day/74.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 230
-16 0 230
-41 0 230
-65 0 230
-90 0 230
-115 0 230
-131 0 230
-156 0 230
-180 0 230
-205 0 230
-230 0 230
-255 0 230
-255 8 213
-255 24 205
-255 41 197
-255 65 197
-0 16 230
-8 8 238
-32 8 238
-57 8 238
-82 8 238
-106 8 238
-131 8 238
-156 8 238
-180 8 238
-213 8 238
-238 8 238
-246 16 222
-246 32 205
-255 49 197
-255 65 197
-255 82 197
-0 41 230
-8 32 238
-41 41 222
-57 41 222
-82 41 222
-106 41 222
-131 41 222
-156 41 222
-180 41 222
-197 41 222
-222 41 222
-230 49 213
-238 65 197
-246 82 197
-255 82 197
-255 98 197
-0 65 230
-8 65 238
-41 65 222
-65 65 213
-90 65 213
-106 65 213
-131 65 213
-148 65 213
-172 65 213
-189 65 213
-213 65 213
-222 74 205
-230 90 205
-246 98 197
-255 98 197
-255 115 197
-0 90 230
-8 82 238
-41 82 222
-65 90 213
-90 90 205
-106 90 205
-131 90 205
-148 90 205
-164 90 205
-180 90 205
-205 90 205
-213 106 205
-230 106 197
-246 115 197
-255 115 205
-255 131 205
-0 115 230
-8 115 238
-41 106 222
-65 115 213
-90 115 205
-123 123 205
-139 123 205
-156 123 205
-172 123 205
-189 123 205
-205 123 205
-213 123 205
-230 123 205
-246 131 205
-255 139 205
-255 148 205
-0 139 230
-8 139 238
-41 131 222
-65 131 213
-90 131 205
-123 139 205
-139 139 205
-156 139 205
-172 139 205
-189 139 205
-205 139 205
-213 139 205
-230 148 205
-246 148 205
-255 156 205
-255 164 205
-0 164 230
-8 164 238
-41 156 222
-65 156 213
-90 148 205
-123 156 205
-139 156 205
-156 156 205
-172 156 205
-189 156 205
-205 156 205
-222 156 205
-230 164 205
-246 164 205
-255 172 205
-255 180 213
-0 189 230
-8 189 238
-41 180 222
-65 172 213
-90 164 205
-123 172 205
-139 172 205
-156 172 205
-172 172 205
-189 172 205
-205 172 205
-222 172 205
-230 180 205
-246 180 205
-255 189 213
-255 213 230
-0 213 230
-8 213 238
-41 205 222
-65 197 213
-90 189 205
-123 189 205
-139 189 205
-156 189 205
-172 189 205
-189 189 205
-205 189 205
-222 189 205
-230 197 205
-246 197 213
-255 213 222
-255 230 230
-0 230 230
-8 238 238
-41 222 222
-65 213 213
-90 205 205
-123 205 205
-139 205 205
-156 205 205
-172 205 205
-189 205 205
-205 197 197
-222 205 205
-238 205 205
-246 222 222
-255 230 230
-255 246 246
-0 255 222
-16 246 222
-49 230 205
-74 222 197
-106 213 197
-123 213 197
-139 213 197
-156 222 205
-172 222 205
-189 222 205
-205 222 205
-222 222 205
-238 222 205
-246 230 222
-255 238 230
-255 246 246
-8 255 213
-32 246 205
-65 238 197
-90 230 197
-106 230 197
-123 230 197
-148 230 197
-164 230 205
-180 230 205
-197 230 205
-205 238 205
-222 238 205
-238 238 205
-246 238 222
-255 246 230
-255 255 246
-24 255 197
-49 255 197
-82 246 197
-98 246 197
-115 246 197
-131 246 197
-148 246 205
-164 246 205
-180 246 205
-197 246 213
-222 246 222
-230 246 222
-238 246 222
-246 246 222
-255 246 230
-255 255 246
-41 255 189
-65 255 197
-82 255 197
-98 255 197
-115 255 197
-139 255 205
-156 255 205
-172 255 205
-189 255 213
-213 255 222
-230 255 230
-238 255 230
-246 255 230
-246 255 230
-255 255 230
-255 255 246
-65 255 189
-82 255 197
-98 255 197
-115 255 197
-131 255 197
-148 255 205
-164 255 205
-180 255 213
-213 255 222
-230 255 230
-246 255 246
-246 255 246
-255 255 246
-255 255 246
-255 255 246
-255 255 246
diff --git a/graphics/misc/sunny_day/75.pal b/graphics/misc/sunny_day/75.pal
deleted file mode 100644
index 98e07acb6..000000000
--- a/graphics/misc/sunny_day/75.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 255
-16 0 255
-41 0 255
-65 0 255
-82 0 255
-106 0 255
-131 0 255
-156 0 255
-180 0 255
-197 0 255
-222 0 255
-255 0 255
-255 8 238
-255 24 222
-255 41 213
-255 65 205
-0 24 255
-16 16 246
-32 16 246
-57 16 246
-82 16 246
-106 16 246
-131 16 246
-148 16 246
-172 16 246
-197 16 246
-222 16 246
-246 16 246
-246 32 230
-255 49 213
-255 65 213
-255 82 205
-0 41 255
-16 41 246
-49 49 230
-65 49 230
-90 49 230
-106 49 230
-131 49 230
-148 49 230
-164 49 230
-189 49 230
-205 49 230
-230 49 230
-238 65 222
-246 82 213
-255 82 213
-255 98 213
-0 65 255
-16 65 246
-49 74 230
-74 74 222
-90 74 222
-115 74 222
-131 74 222
-148 74 222
-164 74 222
-180 74 222
-197 74 222
-222 74 222
-230 90 213
-246 98 213
-255 98 213
-255 115 213
-0 90 255
-16 82 246
-49 90 230
-74 98 222
-106 106 213
-123 106 213
-139 106 213
-156 106 213
-172 106 213
-180 106 213
-197 106 213
-213 106 213
-230 106 213
-246 115 213
-255 115 213
-255 131 213
-0 115 255
-16 106 246
-49 106 230
-74 115 222
-106 123 213
-123 123 213
-139 123 213
-156 123 213
-172 123 213
-180 123 213
-197 123 213
-213 123 213
-230 123 213
-246 131 213
-255 139 213
-255 148 213
-0 139 255
-16 131 246
-49 131 230
-74 131 222
-106 139 213
-123 139 213
-139 139 213
-156 139 213
-172 139 213
-189 139 213
-197 139 213
-213 139 213
-230 148 213
-246 148 213
-255 156 222
-255 164 222
-0 156 255
-16 156 246
-49 156 230
-74 148 222
-106 156 213
-123 156 213
-139 156 213
-156 156 222
-172 156 222
-189 156 222
-205 156 222
-222 156 222
-230 164 213
-246 164 213
-255 172 222
-255 180 222
-0 180 255
-16 180 246
-49 172 230
-74 164 222
-106 172 213
-123 172 213
-139 172 213
-156 172 222
-172 172 222
-189 172 222
-205 172 222
-222 172 222
-230 180 222
-246 180 222
-255 189 222
-255 213 230
-0 205 255
-16 197 246
-49 189 230
-74 180 222
-106 189 213
-123 189 213
-139 189 213
-156 189 222
-172 189 222
-189 189 222
-205 189 222
-222 189 222
-230 197 222
-246 197 222
-255 213 230
-255 230 238
-0 230 255
-16 222 246
-49 213 230
-74 205 222
-106 205 213
-123 205 213
-139 205 213
-156 205 222
-172 205 222
-189 205 222
-205 205 222
-222 205 222
-238 205 222
-246 222 230
-255 230 238
-255 246 246
-0 255 255
-16 246 246
-49 230 230
-74 222 222
-106 213 213
-123 213 213
-139 213 213
-156 222 222
-172 222 222
-189 222 222
-205 222 222
-222 222 222
-238 230 230
-246 238 238
-255 246 246
-255 255 255
-8 255 230
-32 246 230
-65 238 213
-90 230 213
-106 230 213
-123 230 213
-148 230 213
-164 230 213
-180 230 222
-197 230 222
-205 238 222
-230 238 230
-238 238 230
-246 246 238
-255 246 246
-255 255 255
-24 255 222
-49 255 213
-82 246 213
-98 246 213
-115 246 213
-131 246 213
-148 246 213
-164 246 213
-180 246 222
-197 246 222
-222 246 230
-238 246 238
-246 246 238
-246 246 238
-255 255 246
-255 255 255
-41 255 213
-65 255 213
-82 255 213
-98 255 213
-115 255 213
-139 255 213
-156 255 213
-172 255 222
-189 255 222
-213 255 230
-230 255 238
-246 255 246
-255 255 246
-255 255 246
-255 255 246
-255 255 255
-65 255 205
-82 255 205
-98 255 205
-115 255 205
-131 255 213
-148 255 213
-164 255 222
-180 255 222
-213 255 230
-230 255 238
-246 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/76.pal b/graphics/misc/sunny_day/76.pal
deleted file mode 100644
index 4c9939c5e..000000000
--- a/graphics/misc/sunny_day/76.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 255
-24 8 255
-41 8 255
-65 8 255
-82 8 255
-106 8 255
-131 8 255
-148 8 255
-172 8 255
-197 8 255
-213 8 255
-230 8 255
-255 8 255
-255 24 246
-255 41 230
-255 65 222
-8 24 255
-32 32 246
-49 32 246
-65 32 246
-90 32 246
-106 32 246
-131 32 246
-148 32 246
-164 32 246
-189 32 246
-205 32 246
-230 32 246
-246 32 246
-255 49 238
-255 65 230
-255 82 222
-8 49 255
-32 49 246
-65 65 238
-74 65 238
-90 65 238
-115 65 238
-131 65 238
-148 65 238
-164 65 238
-180 65 238
-197 65 238
-213 65 238
-238 65 238
-246 82 230
-255 82 230
-255 98 222
-8 65 255
-32 74 246
-65 82 238
-90 90 230
-106 90 230
-123 90 230
-139 90 230
-156 90 230
-172 90 230
-180 90 230
-197 90 230
-213 90 230
-230 90 230
-246 98 230
-255 98 230
-255 115 222
-8 90 255
-32 90 246
-65 98 238
-90 106 230
-106 106 230
-123 106 230
-139 106 230
-156 106 230
-172 106 230
-189 106 230
-197 106 230
-213 106 230
-230 106 230
-246 115 230
-255 115 230
-255 131 222
-8 106 255
-32 115 246
-65 115 238
-90 123 230
-106 123 230
-123 123 230
-139 123 230
-156 123 230
-172 123 230
-189 123 230
-197 123 230
-213 123 230
-230 123 230
-246 131 230
-255 139 230
-255 148 230
-8 131 255
-32 131 246
-65 131 238
-90 139 230
-106 139 230
-123 139 230
-148 148 230
-156 148 230
-172 148 230
-189 148 230
-197 148 230
-213 148 230
-230 148 230
-246 148 230
-255 156 230
-255 164 230
-8 156 255
-32 148 246
-65 148 238
-90 156 230
-106 156 230
-123 156 230
-148 156 230
-164 164 230
-172 164 230
-189 164 230
-205 164 230
-213 164 230
-230 164 230
-246 164 230
-255 172 230
-255 180 230
-8 172 255
-32 172 246
-65 164 238
-90 172 230
-106 172 230
-123 172 230
-148 172 230
-164 172 230
-180 180 230
-189 180 230
-205 180 230
-222 180 230
-230 180 230
-246 180 230
-255 189 230
-255 213 238
-8 197 255
-32 189 246
-65 180 238
-90 189 230
-106 189 230
-123 189 230
-148 189 230
-164 189 230
-180 189 230
-197 197 230
-205 197 230
-222 197 230
-230 197 230
-246 197 230
-255 213 238
-255 230 246
-8 213 255
-32 205 246
-65 197 238
-90 205 230
-106 197 230
-123 205 230
-148 205 230
-164 205 230
-180 205 230
-197 205 230
-205 205 238
-222 205 238
-238 205 238
-246 222 238
-255 230 246
-255 246 255
-8 238 255
-32 230 246
-65 222 238
-90 213 230
-106 213 230
-123 213 230
-148 213 230
-164 213 230
-180 222 230
-197 222 230
-205 222 238
-230 230 238
-238 230 238
-246 238 246
-255 246 255
-255 255 255
-8 255 255
-32 246 246
-65 238 238
-90 230 230
-106 230 230
-123 230 230
-148 230 230
-164 230 230
-180 230 230
-197 230 230
-205 238 238
-230 238 238
-246 246 246
-255 246 246
-255 255 255
-255 255 255
-24 255 238
-49 255 230
-82 246 230
-98 246 230
-115 246 230
-131 246 230
-148 246 230
-164 246 230
-180 246 230
-197 246 230
-222 246 238
-238 246 246
-246 255 246
-255 255 246
-255 255 255
-255 255 255
-41 255 222
-65 255 230
-82 255 230
-98 255 230
-115 255 230
-139 255 230
-156 255 230
-172 255 230
-189 255 230
-213 255 238
-230 255 246
-246 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-65 255 213
-82 255 222
-98 255 222
-115 255 222
-131 255 222
-148 255 222
-164 255 230
-180 255 230
-213 255 238
-230 255 246
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/77.pal b/graphics/misc/sunny_day/77.pal
deleted file mode 100644
index dbd7b65fd..000000000
--- a/graphics/misc/sunny_day/77.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-24 24 255
-41 24 255
-57 24 255
-74 24 255
-90 24 255
-106 24 255
-131 24 255
-148 24 255
-164 24 255
-180 24 255
-197 24 255
-222 24 255
-238 24 255
-255 24 255
-255 41 246
-255 65 230
-24 41 255
-49 49 255
-57 49 255
-74 49 255
-98 49 255
-106 49 255
-131 49 255
-148 49 255
-164 49 255
-180 49 255
-197 49 255
-213 49 255
-230 49 255
-255 49 255
-255 65 246
-255 82 238
-24 57 255
-49 65 255
-82 82 246
-90 82 246
-106 82 246
-123 82 246
-139 82 246
-156 82 246
-164 82 246
-180 82 246
-197 82 246
-213 82 246
-230 82 246
-246 82 246
-255 82 246
-255 98 238
-24 74 255
-49 82 255
-82 98 246
-98 98 246
-106 98 246
-123 98 246
-139 98 246
-156 98 246
-172 98 246
-180 98 246
-197 98 246
-213 98 246
-230 98 246
-246 98 246
-255 98 246
-255 115 238
-24 98 255
-49 98 255
-82 106 246
-98 115 246
-115 115 246
-131 115 246
-139 115 246
-156 115 246
-172 115 246
-189 115 246
-197 115 246
-213 115 246
-230 115 246
-246 115 246
-255 115 246
-255 131 238
-24 115 255
-49 115 255
-82 123 246
-98 123 246
-115 131 246
-131 131 246
-148 131 246
-156 131 246
-172 131 246
-189 131 246
-197 131 246
-213 131 246
-230 131 246
-246 131 246
-255 139 246
-255 148 238
-24 131 255
-49 131 255
-82 139 246
-98 139 246
-115 148 246
-131 148 246
-148 148 246
-164 148 246
-172 148 246
-189 148 246
-205 148 246
-213 148 246
-230 148 246
-246 148 246
-255 156 246
-255 164 238
-24 156 255
-49 148 255
-82 156 246
-98 156 246
-115 156 246
-131 156 246
-148 164 246
-164 164 246
-180 164 246
-189 164 246
-205 164 246
-213 164 246
-230 164 246
-246 164 246
-255 172 246
-255 180 238
-24 164 255
-49 164 255
-82 172 246
-98 172 246
-115 172 246
-131 172 246
-148 180 246
-164 180 246
-180 180 246
-197 180 246
-205 180 246
-222 180 246
-230 180 246
-246 180 246
-255 189 246
-255 213 246
-24 189 255
-49 180 255
-82 180 246
-98 189 246
-115 189 246
-131 189 246
-148 189 246
-164 189 246
-180 197 246
-197 197 246
-213 197 246
-222 197 246
-230 197 246
-246 197 246
-255 213 246
-255 230 246
-24 205 255
-49 197 255
-82 197 246
-98 197 246
-115 197 246
-131 205 246
-148 205 246
-164 205 246
-180 205 246
-197 213 246
-222 222 246
-230 222 246
-238 222 246
-246 222 246
-255 230 246
-255 246 255
-24 222 255
-49 213 255
-82 213 246
-98 213 246
-115 213 246
-131 213 246
-148 213 246
-164 213 246
-180 222 246
-197 222 246
-222 230 246
-238 238 246
-246 238 246
-246 238 246
-255 246 255
-255 255 255
-24 246 255
-49 238 255
-82 230 246
-98 230 246
-115 230 246
-131 230 246
-148 230 246
-164 230 246
-180 230 246
-197 230 246
-222 238 246
-238 246 246
-246 246 255
-255 246 255
-255 255 255
-255 255 255
-24 255 255
-49 255 255
-82 246 246
-98 246 246
-115 246 246
-131 246 246
-148 246 246
-164 246 246
-180 246 246
-197 246 246
-222 246 246
-238 246 246
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-41 255 238
-65 255 246
-82 255 238
-98 255 238
-115 255 238
-139 255 238
-156 255 238
-172 255 246
-189 255 246
-213 255 246
-230 255 246
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-65 255 230
-82 255 230
-98 255 230
-115 255 230
-131 255 230
-148 255 238
-164 255 238
-180 255 238
-213 255 246
-230 255 246
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/78.pal b/graphics/misc/sunny_day/78.pal
deleted file mode 100644
index dcee38d72..000000000
--- a/graphics/misc/sunny_day/78.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-41 41 255
-49 41 255
-65 41 255
-82 41 255
-98 41 255
-115 41 255
-131 41 255
-148 41 255
-164 41 255
-180 41 255
-189 41 255
-213 41 255
-222 41 255
-238 41 255
-255 41 255
-255 65 246
-41 57 255
-65 65 255
-82 65 255
-98 65 255
-106 65 255
-123 65 255
-139 65 255
-156 65 255
-172 65 255
-180 65 255
-197 65 255
-213 65 255
-230 65 255
-246 65 255
-255 65 255
-255 82 246
-41 74 255
-65 82 255
-82 82 255
-98 82 255
-106 82 255
-123 82 255
-139 82 255
-156 82 255
-172 82 255
-180 82 255
-197 82 255
-213 82 255
-230 82 255
-238 82 255
-255 82 255
-255 98 246
-41 90 255
-65 98 255
-82 98 255
-98 98 255
-115 98 255
-123 98 255
-139 98 255
-156 98 255
-172 98 255
-180 98 255
-197 98 255
-213 98 255
-230 98 255
-238 98 255
-255 98 255
-255 115 246
-41 106 255
-65 115 255
-82 115 255
-98 115 255
-115 115 255
-131 115 255
-148 115 255
-156 115 255
-172 115 255
-189 115 255
-197 115 255
-213 115 255
-230 115 255
-238 115 255
-255 115 255
-255 131 246
-41 123 255
-65 123 255
-82 123 255
-98 131 255
-115 131 255
-139 139 255
-148 139 255
-164 139 255
-172 139 255
-189 139 255
-205 139 255
-213 139 255
-230 139 255
-238 139 255
-255 139 255
-255 148 246
-41 131 255
-65 139 255
-82 139 255
-98 148 255
-115 148 255
-139 148 255
-156 156 255
-164 156 255
-180 156 255
-189 156 255
-205 156 255
-213 156 255
-230 156 255
-238 156 255
-255 156 255
-255 164 246
-41 148 255
-65 156 255
-82 156 255
-98 156 255
-115 164 255
-139 164 255
-156 164 255
-172 172 255
-180 172 255
-197 172 255
-205 172 255
-222 172 255
-230 172 255
-246 172 255
-255 172 255
-255 180 246
-41 164 255
-65 172 255
-82 172 255
-98 172 255
-115 172 255
-139 172 255
-156 180 255
-172 180 255
-189 189 255
-197 189 255
-213 189 255
-222 189 255
-230 189 255
-246 189 255
-255 189 255
-255 213 255
-41 180 255
-65 189 255
-82 189 255
-98 189 255
-115 189 255
-139 189 255
-156 189 255
-172 197 255
-189 197 255
-213 213 255
-222 213 255
-230 213 255
-238 213 255
-246 213 255
-255 213 255
-255 230 255
-41 197 255
-65 197 255
-82 197 255
-98 197 255
-115 205 255
-139 205 255
-156 205 255
-172 205 255
-189 213 255
-213 222 255
-230 230 255
-238 230 255
-246 230 255
-246 230 255
-255 230 255
-255 246 255
-41 213 255
-65 213 255
-82 213 255
-98 213 255
-115 213 255
-139 213 255
-156 222 255
-172 222 255
-189 222 255
-213 230 255
-230 238 255
-246 246 255
-246 246 255
-255 246 255
-255 246 255
-255 255 255
-41 230 255
-65 230 255
-82 230 255
-98 230 255
-115 230 255
-139 230 255
-156 230 255
-172 230 255
-189 230 255
-213 238 255
-230 246 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-41 246 255
-65 246 255
-82 246 255
-98 246 255
-115 246 255
-139 246 255
-156 246 255
-172 246 255
-189 246 255
-213 246 255
-230 246 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-41 255 255
-65 255 255
-82 255 255
-98 255 255
-115 255 255
-139 255 255
-156 255 255
-172 255 255
-189 255 255
-213 255 255
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-65 255 246
-82 255 246
-98 255 246
-115 255 246
-131 255 246
-148 255 246
-164 255 246
-180 255 246
-213 255 255
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/79.pal b/graphics/misc/sunny_day/79.pal
deleted file mode 100644
index bbcd359c5..000000000
--- a/graphics/misc/sunny_day/79.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-65 65 255
-74 65 255
-90 65 255
-98 65 255
-115 65 255
-123 65 255
-139 65 255
-156 65 255
-164 65 255
-180 65 255
-189 65 255
-205 65 255
-213 65 255
-230 65 255
-246 65 255
-255 65 255
-65 82 255
-82 82 255
-98 82 255
-106 82 255
-115 82 255
-131 82 255
-148 82 255
-156 82 255
-172 82 255
-180 82 255
-197 82 255
-205 82 255
-222 82 255
-230 82 255
-246 82 255
-255 82 255
-65 90 255
-82 98 255
-98 98 255
-106 98 255
-123 98 255
-131 98 255
-148 98 255
-156 98 255
-172 98 255
-180 98 255
-197 98 255
-205 98 255
-222 98 255
-230 98 255
-246 98 255
-255 98 255
-65 106 255
-82 106 255
-98 115 255
-115 115 255
-123 115 255
-139 115 255
-156 115 255
-164 115 255
-172 115 255
-189 115 255
-197 115 255
-205 115 255
-222 115 255
-230 115 255
-246 115 255
-255 115 255
-65 115 255
-82 123 255
-98 123 255
-115 131 255
-131 131 255
-148 131 255
-156 131 255
-164 131 255
-180 131 255
-189 131 255
-197 131 255
-213 131 255
-222 131 255
-230 131 255
-246 131 255
-255 131 255
-65 131 255
-82 139 255
-98 139 255
-115 139 255
-131 148 255
-148 148 255
-156 148 255
-172 148 255
-180 148 255
-189 148 255
-205 148 255
-213 148 255
-222 148 255
-238 148 255
-246 148 255
-255 148 255
-65 139 255
-82 148 255
-98 148 255
-115 156 255
-131 156 255
-148 164 255
-164 164 255
-180 164 255
-189 164 255
-197 164 255
-205 164 255
-222 164 255
-230 164 255
-238 164 255
-246 164 255
-255 164 255
-65 156 255
-82 156 255
-98 164 255
-115 164 255
-131 172 255
-148 172 255
-164 180 255
-180 180 255
-197 180 255
-205 180 255
-213 180 255
-222 180 255
-230 180 255
-238 180 255
-246 180 255
-255 180 255
-65 172 255
-82 172 255
-98 172 255
-115 172 255
-131 180 255
-148 180 255
-164 189 255
-180 197 255
-213 213 255
-222 213 255
-222 213 255
-230 213 255
-238 213 255
-246 213 255
-255 213 255
-255 213 255
-65 180 255
-82 189 255
-98 189 255
-115 189 255
-131 189 255
-148 197 255
-164 197 255
-180 205 255
-213 222 255
-230 230 255
-230 230 255
-238 230 255
-246 230 255
-246 230 255
-255 230 255
-255 230 255
-65 197 255
-82 197 255
-98 197 255
-115 197 255
-131 205 255
-148 205 255
-164 205 255
-180 213 255
-213 230 255
-230 230 255
-246 246 255
-246 246 255
-255 246 255
-255 246 255
-255 246 255
-255 246 255
-65 205 255
-82 205 255
-98 213 255
-115 213 255
-131 213 255
-148 213 255
-164 222 255
-180 222 255
-213 230 255
-230 238 255
-246 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-65 222 255
-82 222 255
-98 222 255
-115 222 255
-131 222 255
-148 230 255
-164 230 255
-180 230 255
-213 238 255
-230 246 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-65 230 255
-82 238 255
-98 238 255
-115 238 255
-131 238 255
-148 238 255
-164 238 255
-180 238 255
-213 246 255
-230 246 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-65 246 255
-82 246 255
-98 246 255
-115 246 255
-131 246 255
-148 246 255
-164 246 255
-180 246 255
-213 255 255
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-65 255 255
-82 255 255
-98 255 255
-115 255 255
-131 255 255
-148 255 255
-164 255 255
-180 255 255
-213 255 255
-230 255 255
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/8.pal b/graphics/misc/sunny_day/8.pal
deleted file mode 100644
index 1d05da74e..000000000
--- a/graphics/misc/sunny_day/8.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 156
-16 0 156
-41 0 156
-57 0 156
-74 0 156
-98 0 156
-115 0 156
-131 0 156
-156 0 156
-172 0 156
-189 0 148
-205 0 148
-222 0 148
-238 0 148
-255 0 148
-255 24 148
-0 24 156
-16 16 156
-41 16 156
-57 16 156
-74 16 156
-98 16 156
-115 16 156
-131 16 156
-156 16 156
-172 16 156
-189 16 148
-205 16 148
-222 16 148
-238 16 148
-246 32 156
-255 41 148
-0 41 156
-16 41 156
-32 32 148
-57 32 148
-74 32 148
-90 32 148
-115 32 148
-131 32 148
-148 32 148
-172 32 148
-189 32 148
-205 32 148
-222 32 148
-230 49 148
-246 49 148
-255 57 156
-0 57 156
-16 57 156
-32 57 148
-57 57 148
-74 57 148
-90 57 148
-106 57 148
-131 57 148
-148 57 148
-164 57 148
-189 49 148
-205 57 148
-213 65 148
-230 65 148
-246 65 156
-255 74 156
-0 74 156
-16 74 156
-32 74 148
-57 74 148
-74 74 148
-90 74 148
-115 74 148
-131 74 148
-148 74 148
-164 74 148
-180 74 148
-197 82 148
-213 82 148
-230 82 148
-246 82 148
-255 90 156
-0 98 156
-16 98 156
-32 90 148
-57 90 148
-74 90 148
-90 90 148
-106 90 148
-131 90 148
-148 90 148
-164 90 148
-180 98 148
-197 98 148
-213 98 148
-230 98 156
-246 106 148
-255 106 156
-0 115 156
-16 115 156
-32 115 148
-57 115 148
-74 115 148
-90 106 148
-106 106 148
-131 106 148
-148 106 148
-164 115 148
-180 115 148
-197 115 148
-213 115 148
-230 123 156
-246 123 156
-255 123 156
-0 139 156
-16 131 156
-32 131 148
-57 131 148
-74 131 148
-90 131 148
-106 131 148
-131 131 148
-148 131 148
-164 131 148
-180 139 148
-197 131 148
-213 139 156
-230 139 156
-246 139 156
-255 139 156
-0 156 156
-16 156 156
-32 148 148
-57 148 148
-74 148 148
-90 148 148
-106 148 148
-131 148 148
-148 148 148
-164 148 148
-180 156 156
-197 148 148
-213 156 156
-230 156 156
-246 156 156
-255 172 172
-0 172 148
-16 172 148
-32 172 148
-57 164 148
-74 164 148
-90 164 148
-115 164 148
-131 164 148
-148 164 148
-164 164 148
-180 164 156
-197 164 148
-213 172 156
-230 164 156
-246 172 156
-255 180 172
-0 189 148
-16 189 148
-32 189 148
-49 189 148
-74 180 148
-98 180 148
-115 180 148
-139 180 148
-156 180 156
-164 180 156
-180 180 156
-197 180 148
-213 180 156
-230 180 156
-246 180 156
-255 197 172
-0 205 148
-16 205 148
-32 205 148
-57 205 148
-82 197 148
-98 197 148
-115 197 148
-131 197 148
-148 197 148
-164 197 148
-180 197 148
-197 197 148
-213 197 156
-230 197 156
-246 197 156
-255 205 172
-0 222 148
-16 222 148
-32 222 139
-65 213 148
-82 213 148
-98 213 148
-115 213 148
-139 213 148
-156 213 156
-172 213 156
-180 213 156
-197 213 156
-213 213 156
-230 213 156
-246 213 156
-255 222 172
-0 238 148
-16 238 139
-49 230 148
-65 230 148
-82 230 148
-98 230 148
-123 230 148
-139 230 148
-156 230 156
-172 230 156
-180 230 156
-197 230 156
-213 230 156
-230 230 156
-246 230 156
-255 230 172
-0 255 148
-32 246 148
-49 246 148
-65 246 148
-82 246 148
-106 246 148
-123 246 156
-139 246 156
-156 246 156
-172 246 156
-189 246 156
-197 246 156
-213 246 156
-230 246 156
-246 246 156
-255 246 172
-24 255 148
-41 255 148
-57 255 148
-74 255 148
-90 255 148
-106 255 148
-123 255 156
-139 255 156
-172 255 172
-180 255 172
-197 255 172
-205 255 172
-222 255 172
-230 255 172
-246 255 172
-255 255 172
diff --git a/graphics/misc/sunny_day/80.pal b/graphics/misc/sunny_day/80.pal
deleted file mode 100644
index c5cbf6d01..000000000
--- a/graphics/misc/sunny_day/80.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 8
-24 8 8
-41 8 8
-57 8 8
-74 8 8
-90 8 8
-106 8 8
-197 0 0
-213 0 0
-230 0 0
-246 0 0
-255 0 0
-255 16 16
-255 32 32
-255 49 49
-255 74 74
-8 24 8
-24 24 8
-41 24 8
-57 24 8
-74 24 8
-90 24 8
-106 24 8
-197 24 0
-213 24 0
-230 16 0
-246 16 0
-255 16 0
-255 32 16
-255 49 32
-255 65 49
-255 82 74
-8 41 8
-24 41 8
-41 41 8
-57 41 8
-74 41 8
-90 41 8
-106 41 8
-197 49 0
-213 49 0
-230 49 0
-246 41 0
-255 41 0
-255 49 16
-255 65 32
-255 74 49
-255 98 74
-8 57 8
-24 57 8
-41 57 8
-57 57 8
-74 57 8
-90 57 8
-106 57 8
-197 82 0
-213 74 0
-230 65 0
-246 65 0
-255 65 0
-255 74 16
-255 82 32
-255 90 49
-255 106 74
-8 74 8
-24 74 8
-41 74 8
-57 74 8
-74 74 8
-90 74 8
-106 74 8
-197 106 0
-213 106 0
-230 98 0
-246 90 0
-255 90 0
-255 90 16
-255 98 32
-255 106 49
-255 123 74
-8 90 8
-24 90 8
-41 90 8
-57 90 8
-74 90 8
-90 90 8
-106 90 8
-197 131 0
-213 131 0
-230 123 0
-246 123 0
-255 115 0
-255 115 16
-255 115 32
-255 123 49
-255 131 74
-8 106 8
-24 106 8
-41 106 8
-57 106 8
-74 106 8
-90 106 8
-106 106 8
-197 164 0
-213 156 0
-230 148 0
-246 139 0
-255 139 0
-255 139 16
-255 131 32
-255 139 49
-255 148 74
-0 197 0
-24 197 0
-57 197 0
-82 197 0
-115 197 0
-139 197 0
-164 197 0
-197 197 0
-213 180 0
-230 172 0
-246 164 0
-255 156 0
-255 156 16
-255 156 32
-255 156 49
-255 156 74
-0 213 0
-24 213 0
-49 213 0
-74 213 0
-106 213 0
-131 213 0
-156 213 0
-189 213 0
-213 213 0
-230 197 0
-246 189 0
-255 189 0
-255 172 16
-255 164 32
-255 164 49
-255 172 74
-0 230 0
-24 230 0
-49 230 0
-74 230 0
-98 230 0
-123 230 0
-148 230 0
-180 230 0
-205 230 0
-230 230 0
-246 213 0
-255 205 0
-255 197 16
-255 189 32
-255 180 49
-255 180 74
-0 246 0
-24 246 0
-49 246 0
-74 246 0
-98 246 0
-123 246 0
-148 246 0
-172 246 0
-197 246 0
-222 246 0
-246 246 0
-255 230 0
-255 213 16
-255 205 32
-255 197 49
-255 197 74
-0 255 0
-24 255 0
-49 255 0
-74 255 0
-90 255 0
-123 255 0
-139 255 0
-164 255 0
-189 255 0
-213 255 0
-238 255 0
-255 255 0
-255 238 16
-255 222 32
-255 213 49
-255 205 74
-16 255 16
-32 255 16
-57 255 16
-74 255 16
-98 255 16
-115 255 16
-139 255 16
-156 255 16
-180 255 16
-197 255 16
-222 255 16
-238 255 16
-255 255 16
-255 238 32
-255 230 49
-255 222 74
-32 255 32
-49 255 32
-65 255 32
-82 255 32
-106 255 32
-115 255 32
-139 255 32
-156 255 32
-172 255 32
-189 255 32
-205 255 32
-222 255 32
-246 255 32
-255 255 32
-255 238 49
-255 230 74
-49 255 49
-65 255 49
-82 255 49
-90 255 49
-115 255 49
-123 255 49
-139 255 49
-156 255 49
-172 255 49
-189 255 49
-197 255 49
-213 255 49
-230 255 49
-246 255 49
-255 255 49
-255 246 74
-74 255 74
-90 255 74
-98 255 74
-115 255 74
-123 255 74
-139 255 74
-148 255 74
-164 255 74
-172 255 74
-189 255 74
-197 255 74
-213 255 74
-222 255 74
-238 255 74
-246 255 74
-255 255 74
diff --git a/graphics/misc/sunny_day/81.pal b/graphics/misc/sunny_day/81.pal
deleted file mode 100644
index e0f8b8636..000000000
--- a/graphics/misc/sunny_day/81.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 24
-24 8 24
-41 8 24
-57 8 24
-74 8 24
-90 8 24
-106 8 24
-197 0 24
-213 0 24
-230 0 24
-246 0 24
-255 0 24
-255 16 32
-255 32 49
-255 49 65
-255 74 90
-8 24 24
-24 24 24
-41 24 24
-57 24 24
-74 24 24
-90 24 24
-172 16 16
-189 16 16
-205 16 16
-230 16 16
-246 8 8
-246 24 24
-255 41 41
-255 57 57
-255 74 74
-255 90 90
-8 41 24
-24 41 24
-41 41 24
-57 41 24
-74 41 24
-90 41 24
-172 49 16
-189 41 16
-205 41 16
-230 41 16
-246 32 8
-246 41 24
-255 57 41
-255 65 57
-255 90 74
-255 106 90
-8 57 24
-24 57 24
-41 57 24
-57 57 24
-74 57 24
-90 57 24
-172 74 16
-189 74 16
-205 65 16
-230 65 16
-246 57 8
-246 65 24
-255 74 41
-255 82 57
-255 106 74
-255 115 90
-8 74 24
-24 74 24
-41 74 24
-57 74 24
-74 74 24
-90 74 24
-172 106 16
-189 106 16
-205 98 16
-230 90 16
-246 82 8
-246 90 24
-255 98 41
-255 106 57
-255 115 74
-255 123 90
-8 90 24
-24 90 24
-41 90 24
-57 90 24
-74 90 24
-90 90 24
-172 139 16
-189 131 16
-205 123 16
-230 123 16
-246 115 8
-246 106 24
-255 115 41
-255 115 57
-255 131 74
-255 139 90
-8 106 24
-16 172 16
-49 172 16
-82 172 16
-106 172 16
-139 172 16
-172 172 16
-189 156 16
-205 148 16
-230 148 16
-246 139 8
-246 139 24
-255 131 41
-255 131 57
-255 139 74
-255 148 90
-0 197 24
-16 189 16
-49 189 16
-74 189 16
-106 189 16
-131 189 16
-164 189 16
-189 189 16
-205 180 16
-230 172 16
-246 164 8
-246 156 24
-255 156 41
-255 156 57
-255 156 74
-255 164 90
-0 213 24
-16 205 16
-41 205 16
-74 205 16
-98 205 16
-131 205 16
-156 205 16
-180 205 16
-205 205 16
-230 197 16
-246 189 8
-246 180 24
-255 172 41
-255 164 57
-255 172 74
-255 172 90
-0 230 16
-16 230 16
-41 230 16
-65 230 16
-98 230 16
-123 230 16
-148 230 16
-172 230 16
-205 230 16
-230 230 16
-246 222 8
-246 197 24
-255 189 41
-255 180 57
-255 189 74
-255 189 90
-0 246 16
-8 246 8
-41 246 8
-65 246 8
-90 246 8
-115 246 8
-148 246 8
-164 246 8
-197 246 8
-222 246 8
-246 246 8
-246 222 24
-255 205 41
-255 205 57
-255 197 74
-255 197 90
-0 255 16
-24 246 24
-49 246 24
-65 246 24
-90 246 24
-115 246 24
-139 246 24
-156 246 24
-180 246 24
-205 246 24
-230 246 24
-246 246 24
-255 230 41
-255 213 57
-255 213 74
-255 205 90
-16 255 32
-41 255 41
-57 255 41
-74 255 41
-98 255 41
-115 255 41
-139 255 41
-156 255 41
-172 255 41
-197 255 41
-213 255 41
-238 255 41
-255 255 41
-255 230 57
-255 230 74
-255 222 90
-32 255 49
-57 255 57
-74 255 57
-90 255 57
-106 255 57
-123 255 57
-139 255 57
-156 255 57
-172 255 57
-189 255 57
-205 255 57
-222 255 57
-238 255 57
-255 255 57
-255 246 74
-255 230 90
-49 255 65
-74 255 74
-90 255 74
-106 255 74
-115 255 74
-131 255 74
-148 255 74
-164 255 74
-180 255 74
-189 255 74
-205 255 74
-213 255 74
-230 255 74
-246 255 74
-255 255 74
-255 246 90
-74 255 82
-90 255 90
-106 255 90
-115 255 90
-131 255 90
-139 255 90
-156 255 90
-164 255 90
-172 255 90
-189 255 90
-197 255 90
-213 255 90
-222 255 90
-238 255 90
-246 255 90
-255 255 90
diff --git a/graphics/misc/sunny_day/82.pal b/graphics/misc/sunny_day/82.pal
deleted file mode 100644
index 289f94a69..000000000
--- a/graphics/misc/sunny_day/82.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 41
-24 8 41
-41 8 41
-57 8 41
-74 8 41
-90 8 41
-106 8 41
-197 0 57
-213 0 49
-230 0 49
-246 0 49
-255 0 49
-255 16 57
-255 32 65
-255 49 82
-255 74 98
-8 24 41
-24 24 41
-41 24 41
-57 24 41
-74 24 41
-90 24 41
-172 16 49
-189 16 49
-205 16 41
-230 16 41
-246 8 41
-246 24 49
-255 41 57
-255 57 74
-255 74 90
-255 90 106
-8 41 41
-24 41 41
-41 41 41
-57 41 41
-74 41 41
-139 49 49
-164 41 41
-189 41 41
-205 32 32
-222 32 32
-230 49 49
-230 57 57
-238 65 65
-246 90 90
-255 90 90
-255 106 106
-8 57 41
-24 57 41
-41 57 41
-57 57 41
-74 57 41
-139 74 49
-164 74 41
-189 65 41
-205 57 32
-222 57 32
-230 65 49
-230 74 57
-238 82 65
-246 98 90
-255 106 90
-255 123 106
-8 74 41
-24 74 41
-41 74 41
-57 74 41
-74 74 41
-139 106 49
-164 106 41
-189 90 41
-205 90 32
-222 90 32
-230 90 49
-230 98 57
-238 98 65
-246 115 90
-255 115 90
-255 131 106
-8 90 41
-24 90 41
-49 139 49
-82 139 49
-106 139 49
-139 139 49
-164 131 41
-189 123 41
-205 123 32
-222 115 32
-230 115 49
-230 115 57
-238 115 65
-246 131 90
-255 131 90
-255 139 106
-8 106 41
-16 172 49
-41 164 41
-74 164 41
-106 164 41
-131 164 41
-164 164 41
-189 156 41
-205 148 32
-222 139 32
-230 139 49
-230 131 57
-238 131 65
-246 139 90
-255 148 90
-255 156 106
-0 197 49
-16 189 41
-41 189 41
-65 189 41
-98 189 41
-123 189 41
-156 189 41
-189 189 41
-205 172 32
-222 164 32
-230 156 49
-230 156 57
-238 156 65
-246 156 90
-255 156 90
-255 164 106
-0 213 49
-16 205 41
-32 205 32
-65 205 32
-90 205 32
-123 205 32
-148 205 32
-172 205 32
-205 205 32
-222 197 32
-230 180 49
-230 172 57
-238 164 65
-246 172 90
-255 172 90
-255 180 106
-0 230 49
-16 230 41
-32 222 32
-65 222 32
-90 222 32
-115 222 32
-148 222 32
-172 222 32
-197 222 32
-222 222 32
-230 205 49
-230 189 57
-238 180 65
-246 189 90
-255 189 90
-255 189 106
-0 246 41
-8 246 32
-49 230 49
-65 230 49
-90 230 49
-115 230 49
-139 230 49
-164 230 49
-180 230 49
-205 230 49
-230 230 49
-230 213 57
-238 205 65
-246 205 90
-255 197 90
-255 197 106
-0 255 41
-24 246 41
-57 230 57
-74 230 57
-98 230 57
-115 230 57
-139 230 57
-156 230 57
-172 230 57
-197 230 57
-213 230 57
-230 230 57
-238 222 65
-246 213 90
-255 213 90
-255 213 106
-16 255 49
-41 255 57
-65 238 65
-90 238 65
-106 238 65
-123 238 65
-139 238 65
-156 238 65
-172 238 65
-189 238 65
-205 238 65
-222 238 65
-238 238 65
-246 230 90
-255 230 90
-255 222 106
-32 255 65
-57 255 65
-90 246 90
-106 246 90
-115 246 90
-131 246 90
-148 246 90
-164 246 90
-172 246 90
-189 246 90
-205 246 90
-222 246 90
-230 246 90
-246 246 90
-255 238 90
-255 230 106
-49 255 74
-74 255 90
-90 255 90
-106 255 90
-123 255 90
-131 255 90
-148 255 90
-164 255 90
-172 255 90
-189 255 90
-205 255 90
-213 255 90
-230 255 90
-246 255 90
-255 255 90
-255 246 106
-74 255 98
-90 255 106
-106 255 106
-123 255 106
-131 255 106
-148 255 106
-156 255 106
-164 255 106
-180 255 106
-189 255 106
-205 255 106
-213 255 106
-222 255 106
-238 255 106
-246 255 106
-255 255 106
diff --git a/graphics/misc/sunny_day/83.pal b/graphics/misc/sunny_day/83.pal
deleted file mode 100644
index f68c13c65..000000000
--- a/graphics/misc/sunny_day/83.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 57
-24 8 57
-41 8 57
-57 8 57
-74 8 57
-90 8 57
-106 8 57
-197 0 82
-213 0 74
-230 0 74
-246 0 74
-255 0 74
-255 16 74
-255 32 82
-255 49 90
-255 74 115
-8 24 57
-24 24 57
-41 24 57
-57 24 57
-74 24 57
-90 24 57
-172 16 82
-189 16 74
-205 16 74
-230 16 65
-246 8 65
-246 24 65
-255 41 74
-255 57 90
-255 74 106
-255 90 115
-8 41 57
-24 41 57
-41 41 57
-57 41 57
-74 41 57
-139 49 82
-164 41 74
-189 41 65
-205 32 65
-222 32 65
-230 49 65
-230 57 74
-238 65 90
-246 90 106
-255 90 106
-255 106 123
-8 57 57
-24 57 57
-41 57 57
-57 57 57
-115 74 74
-139 65 65
-156 65 65
-180 57 57
-197 57 57
-205 65 65
-213 74 74
-222 82 82
-238 98 98
-246 106 106
-255 106 106
-255 123 123
-8 74 57
-24 74 57
-41 74 57
-74 115 74
-115 115 74
-139 106 65
-156 90 65
-180 90 57
-197 82 57
-205 90 65
-213 90 74
-222 98 82
-238 115 98
-246 115 106
-255 123 106
-255 139 123
-8 90 57
-24 90 57
-49 139 74
-65 139 65
-106 139 65
-139 139 65
-156 123 65
-180 123 57
-197 115 57
-205 115 65
-213 115 74
-222 115 82
-238 131 98
-246 131 106
-255 131 106
-255 148 123
-8 106 57
-16 172 74
-41 164 74
-65 156 65
-98 156 65
-131 156 65
-156 156 65
-180 148 57
-197 139 57
-205 139 65
-213 131 74
-222 131 82
-238 139 98
-246 148 106
-255 148 106
-255 156 123
-0 197 82
-16 189 74
-41 189 65
-57 180 57
-90 180 57
-123 180 57
-148 180 57
-180 180 57
-197 164 57
-205 156 65
-213 156 74
-222 156 82
-238 156 98
-246 156 106
-255 164 106
-255 172 123
-0 213 74
-16 205 65
-32 205 57
-57 197 57
-90 197 57
-115 197 57
-139 197 57
-172 197 57
-197 197 57
-205 180 65
-213 172 74
-222 172 82
-238 172 98
-246 172 106
-255 180 106
-255 180 123
-0 230 65
-16 230 65
-32 222 57
-65 205 65
-90 205 65
-115 205 65
-139 205 65
-164 205 65
-180 205 65
-205 205 65
-213 197 74
-222 189 82
-238 189 98
-246 189 106
-255 189 106
-255 189 123
-0 246 65
-8 246 57
-49 230 65
-74 213 74
-98 213 74
-115 213 74
-139 213 74
-156 213 74
-180 213 74
-197 213 74
-213 213 74
-222 205 82
-238 205 98
-246 205 106
-255 205 106
-255 205 123
-0 255 65
-24 246 65
-57 230 74
-82 222 82
-98 222 82
-115 222 82
-139 222 82
-156 222 82
-172 222 82
-189 222 82
-205 222 82
-222 222 82
-238 222 98
-246 213 106
-255 213 106
-255 213 123
-16 255 74
-41 255 74
-65 238 82
-98 238 98
-115 238 98
-131 238 98
-148 238 98
-164 238 98
-172 238 98
-189 238 98
-205 238 98
-222 238 98
-238 238 98
-246 230 106
-255 230 106
-255 222 123
-32 255 82
-57 255 82
-90 246 98
-106 246 106
-123 246 106
-131 246 106
-148 246 106
-164 246 106
-172 246 106
-189 246 106
-205 246 106
-222 246 106
-230 246 106
-246 246 106
-255 246 106
-255 238 123
-49 255 90
-74 255 106
-90 255 106
-106 255 106
-123 255 106
-139 255 106
-156 255 106
-164 255 106
-180 255 106
-189 255 106
-205 255 106
-222 255 106
-230 255 106
-246 255 106
-255 255 106
-255 246 123
-74 255 106
-90 255 115
-106 255 123
-123 255 123
-139 255 123
-148 255 123
-156 255 123
-172 255 123
-180 255 123
-189 255 123
-205 255 123
-213 255 123
-222 255 123
-238 255 123
-246 255 123
-255 255 123
diff --git a/graphics/misc/sunny_day/84.pal b/graphics/misc/sunny_day/84.pal
deleted file mode 100644
index 635c5f049..000000000
--- a/graphics/misc/sunny_day/84.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 74
-24 8 74
-41 8 74
-57 8 74
-74 8 74
-90 8 74
-106 8 74
-197 0 115
-213 0 106
-230 0 98
-246 0 98
-255 0 90
-255 16 98
-255 32 106
-255 49 115
-255 74 123
-8 24 74
-24 24 74
-41 24 74
-57 24 74
-74 24 74
-90 24 74
-172 16 106
-189 16 106
-205 16 98
-230 16 98
-246 8 90
-246 24 90
-255 41 98
-255 57 106
-255 74 115
-255 90 131
-8 41 74
-24 41 74
-41 41 74
-57 41 74
-74 41 74
-139 49 106
-164 41 106
-189 41 98
-205 32 90
-222 32 90
-230 49 90
-230 57 98
-238 65 106
-246 90 115
-255 90 123
-255 106 131
-8 57 74
-24 57 74
-41 57 74
-74 74 115
-115 74 115
-139 65 106
-156 65 98
-180 57 90
-197 57 90
-205 65 90
-213 74 98
-222 82 98
-238 98 115
-246 106 123
-255 106 123
-255 123 139
-8 74 74
-24 74 74
-41 74 74
-74 115 115
-115 90 90
-131 90 90
-156 82 82
-172 82 82
-189 82 82
-197 90 90
-205 98 98
-222 115 115
-238 115 115
-246 123 123
-255 131 131
-255 148 148
-8 90 74
-24 90 74
-49 139 106
-65 139 106
-90 131 90
-131 131 90
-156 123 82
-172 106 82
-189 115 82
-197 115 90
-205 115 98
-222 131 115
-238 131 115
-246 131 123
-255 139 131
-255 156 148
-8 106 74
-16 172 106
-41 164 106
-65 156 90
-82 156 82
-123 156 82
-156 156 82
-172 139 82
-189 139 82
-197 131 90
-205 131 98
-222 148 115
-238 148 115
-246 148 123
-255 148 131
-255 164 148
-0 197 106
-16 189 106
-41 189 90
-57 180 90
-82 172 82
-115 172 82
-148 172 82
-172 172 82
-189 164 82
-197 156 90
-205 156 98
-222 156 115
-238 164 115
-246 164 123
-255 164 131
-255 172 148
-0 213 106
-16 205 98
-32 205 90
-57 197 82
-82 189 82
-115 189 82
-139 189 82
-164 189 82
-189 189 82
-197 172 90
-205 172 98
-222 172 115
-238 172 115
-246 172 123
-255 180 131
-255 180 148
-0 230 98
-16 230 90
-32 222 90
-65 205 90
-90 197 90
-115 197 90
-131 197 90
-156 197 90
-180 197 90
-197 197 90
-205 189 98
-222 189 115
-238 189 115
-246 189 123
-255 189 131
-255 197 148
-0 246 90
-8 246 82
-49 230 90
-74 213 90
-98 205 98
-115 205 98
-139 205 98
-156 205 98
-172 205 98
-189 205 98
-205 205 98
-222 205 115
-238 205 115
-246 205 123
-255 205 131
-255 205 148
-0 255 90
-24 246 90
-57 230 98
-82 222 98
-115 222 115
-131 222 115
-148 222 115
-164 222 115
-172 222 115
-189 222 115
-205 222 115
-222 222 115
-238 222 115
-246 213 123
-255 213 131
-255 213 148
-16 255 90
-41 255 98
-65 238 98
-98 238 115
-115 238 115
-131 238 115
-148 238 115
-164 238 115
-172 238 115
-189 238 115
-205 238 115
-222 238 115
-238 238 115
-246 230 123
-255 230 131
-255 230 148
-32 255 98
-57 255 106
-90 246 115
-106 246 115
-123 246 123
-139 246 123
-148 246 123
-164 246 123
-180 246 123
-189 246 123
-205 246 123
-222 246 123
-230 246 123
-246 246 123
-255 246 131
-255 238 148
-49 255 106
-74 255 115
-90 255 115
-106 255 123
-131 255 131
-139 255 131
-156 255 131
-164 255 131
-180 255 131
-189 255 131
-205 255 131
-222 255 131
-230 255 131
-246 255 131
-255 255 131
-255 246 148
-74 255 123
-90 255 123
-106 255 131
-123 255 139
-148 255 148
-156 255 148
-164 255 148
-172 255 148
-189 255 148
-197 255 148
-205 255 148
-213 255 148
-230 255 148
-238 255 148
-246 255 148
-255 255 148
diff --git a/graphics/misc/sunny_day/85.pal b/graphics/misc/sunny_day/85.pal
deleted file mode 100644
index 8cdcbdaf8..000000000
--- a/graphics/misc/sunny_day/85.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 90
-24 8 90
-41 8 90
-57 8 90
-74 8 90
-90 8 90
-106 8 90
-197 0 139
-213 0 131
-230 0 123
-246 0 123
-255 0 123
-255 16 115
-255 32 115
-255 49 123
-255 74 139
-8 24 90
-24 24 90
-41 24 90
-57 24 90
-74 24 90
-90 24 90
-172 16 139
-189 16 131
-205 16 131
-230 16 123
-246 8 115
-246 24 115
-255 41 115
-255 57 123
-255 74 131
-255 90 139
-8 41 90
-24 41 90
-49 49 139
-74 49 139
-106 49 139
-139 49 139
-164 41 131
-189 41 123
-205 32 123
-222 32 115
-230 49 115
-230 57 115
-238 65 123
-246 90 131
-255 90 131
-255 106 148
-8 57 90
-24 57 90
-49 82 139
-65 65 139
-106 65 139
-139 65 139
-156 65 131
-180 57 123
-197 57 115
-205 65 115
-213 74 115
-222 82 115
-238 98 131
-246 106 131
-255 106 139
-255 123 148
-8 74 90
-24 74 90
-49 106 139
-65 106 139
-90 90 131
-131 90 131
-156 82 123
-172 82 115
-189 82 115
-197 90 115
-205 98 115
-222 115 131
-238 115 131
-246 123 139
-255 131 139
-255 148 156
-8 90 90
-24 90 90
-49 139 139
-65 139 139
-90 131 131
-131 106 106
-156 106 106
-164 106 106
-180 106 106
-197 115 115
-205 123 123
-222 131 131
-238 131 131
-246 139 139
-255 148 148
-255 164 164
-8 106 90
-16 172 139
-41 164 131
-65 156 123
-82 156 123
-106 156 106
-156 156 106
-164 139 106
-180 131 106
-197 131 115
-205 139 123
-222 148 131
-238 148 131
-246 156 139
-255 156 148
-255 172 164
-0 197 131
-16 189 131
-41 189 123
-57 180 123
-82 172 106
-106 164 106
-139 164 106
-164 164 106
-180 156 106
-197 156 115
-205 156 123
-222 156 131
-238 164 131
-246 164 139
-255 172 148
-255 180 164
-0 213 131
-16 205 123
-32 205 123
-57 197 115
-82 189 115
-106 180 106
-131 180 106
-156 180 106
-180 180 106
-197 172 115
-205 172 123
-222 172 131
-238 172 131
-246 180 139
-255 180 148
-255 189 164
-0 230 123
-16 230 123
-32 222 115
-65 205 115
-90 197 115
-115 197 115
-131 197 115
-156 197 115
-172 197 115
-197 197 115
-205 189 123
-222 189 131
-238 189 131
-246 189 139
-255 197 148
-255 197 164
-0 246 123
-8 246 115
-49 230 115
-74 213 115
-98 205 115
-123 205 123
-139 205 123
-156 205 123
-172 205 123
-189 205 123
-205 205 123
-222 205 131
-238 205 131
-246 205 139
-255 205 148
-255 213 164
-0 255 115
-24 246 106
-57 230 115
-82 222 115
-115 222 131
-131 222 131
-148 222 131
-164 222 131
-172 222 131
-189 222 131
-205 222 131
-222 222 131
-238 222 131
-246 222 139
-255 222 148
-255 222 164
-16 255 115
-41 255 115
-65 238 115
-98 238 131
-115 238 131
-131 238 131
-148 238 131
-164 238 131
-180 238 131
-189 238 131
-205 238 131
-222 238 131
-238 238 131
-246 230 139
-255 230 148
-255 230 164
-32 255 115
-57 255 115
-90 246 131
-106 246 131
-123 246 131
-139 246 139
-156 246 139
-164 246 139
-180 246 139
-189 246 139
-205 246 139
-222 246 139
-230 246 139
-246 246 139
-255 246 148
-255 238 164
-49 255 123
-74 255 131
-90 255 131
-106 255 131
-131 255 139
-148 255 148
-156 255 148
-172 255 148
-180 255 148
-197 255 148
-205 255 148
-222 255 148
-230 255 148
-246 255 148
-255 255 148
-255 246 164
-74 255 131
-90 255 139
-106 255 139
-123 255 148
-148 255 156
-164 255 164
-172 255 164
-180 255 164
-189 255 164
-197 255 164
-213 255 164
-222 255 164
-230 255 164
-238 255 164
-246 255 164
-255 255 164
diff --git a/graphics/misc/sunny_day/86.pal b/graphics/misc/sunny_day/86.pal
deleted file mode 100644
index 33157fd95..000000000
--- a/graphics/misc/sunny_day/86.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-8 8 106
-24 8 106
-41 8 106
-57 8 106
-74 8 106
-90 8 106
-106 8 106
-197 0 164
-213 0 156
-230 0 148
-246 0 148
-255 0 139
-255 16 139
-255 32 139
-255 49 139
-255 74 148
-8 24 106
-16 16 172
-49 16 172
-74 16 172
-106 16 172
-139 16 172
-172 16 172
-189 16 164
-205 16 156
-230 16 148
-246 8 148
-246 24 139
-255 41 139
-255 57 139
-255 74 148
-255 90 156
-8 41 106
-16 49 172
-41 41 164
-74 41 164
-106 41 164
-131 41 164
-164 41 164
-189 41 156
-205 32 148
-222 32 148
-230 49 139
-230 57 139
-238 65 139
-246 90 148
-255 90 148
-255 106 156
-8 57 106
-16 82 172
-41 74 164
-65 65 156
-90 65 156
-123 65 156
-156 65 156
-180 57 148
-197 57 139
-205 65 139
-213 74 139
-222 82 139
-238 98 148
-246 106 148
-255 106 156
-255 123 156
-8 74 106
-16 106 172
-41 106 164
-65 98 156
-82 82 156
-123 82 156
-156 82 156
-172 82 148
-189 82 139
-197 90 131
-205 98 139
-222 115 148
-238 115 148
-246 123 148
-255 131 156
-255 148 164
-8 90 106
-16 139 172
-41 131 164
-65 131 156
-82 123 156
-106 106 156
-156 106 156
-164 106 139
-180 106 131
-197 115 131
-205 123 139
-222 131 148
-238 131 148
-246 139 156
-255 148 156
-255 164 172
-8 106 106
-16 172 172
-41 164 164
-65 156 156
-82 156 156
-106 156 156
-148 123 123
-164 123 123
-180 131 131
-197 139 139
-205 139 139
-222 148 148
-238 148 148
-246 156 156
-255 164 164
-255 180 180
-0 197 164
-16 189 156
-41 189 156
-57 180 148
-82 172 139
-106 164 139
-123 164 123
-164 164 123
-180 156 131
-197 156 139
-205 156 139
-222 164 148
-238 164 148
-246 172 156
-255 172 164
-255 189 180
-0 213 156
-16 205 148
-32 205 148
-57 197 139
-82 189 139
-106 180 131
-131 180 131
-156 180 131
-180 180 131
-197 172 139
-205 172 139
-222 172 148
-238 180 148
-246 180 156
-255 189 164
-255 197 180
-0 230 148
-16 230 148
-32 222 139
-65 205 139
-90 197 131
-115 197 131
-139 197 139
-156 197 139
-172 197 139
-197 197 139
-205 189 139
-222 189 148
-238 189 148
-246 197 156
-255 197 164
-255 205 180
-0 246 139
-8 246 139
-49 230 139
-74 213 131
-98 205 131
-123 205 139
-139 205 139
-156 205 139
-172 205 139
-189 205 139
-205 205 139
-222 205 148
-238 205 148
-246 205 156
-255 213 164
-255 213 180
-0 255 139
-24 246 139
-57 230 131
-82 222 131
-115 222 148
-131 222 148
-148 222 148
-164 222 148
-180 222 148
-189 222 148
-205 222 148
-222 222 148
-238 222 148
-246 222 156
-255 222 164
-255 222 180
-16 255 139
-41 255 131
-65 238 131
-98 238 139
-115 238 148
-131 238 148
-148 238 148
-164 238 148
-180 238 148
-189 238 148
-205 238 148
-222 238 148
-238 238 148
-246 230 156
-255 230 164
-255 230 180
-32 255 131
-57 255 131
-90 246 139
-106 246 148
-123 246 148
-139 246 156
-156 246 156
-172 246 156
-180 246 156
-197 246 156
-205 246 156
-222 246 156
-230 246 156
-246 246 156
-255 246 164
-255 238 180
-49 255 139
-74 255 139
-90 255 148
-106 255 148
-131 255 148
-148 255 156
-164 255 164
-172 255 164
-189 255 164
-197 255 164
-213 255 164
-222 255 164
-230 255 164
-246 255 164
-255 255 164
-255 246 180
-74 255 148
-90 255 148
-106 255 156
-123 255 156
-148 255 164
-164 255 172
-180 255 180
-189 255 180
-197 255 180
-205 255 180
-213 255 180
-222 255 180
-230 255 180
-238 255 180
-255 255 180
-255 255 180
diff --git a/graphics/misc/sunny_day/87.pal b/graphics/misc/sunny_day/87.pal
deleted file mode 100644
index ed7a74501..000000000
--- a/graphics/misc/sunny_day/87.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 197
-24 0 197
-49 0 197
-82 0 197
-106 0 197
-131 0 197
-164 0 197
-197 0 197
-213 0 189
-230 0 180
-246 0 172
-255 0 164
-255 16 156
-255 32 156
-255 49 156
-255 74 164
-0 24 197
-16 16 189
-41 16 189
-74 16 189
-106 16 189
-131 16 189
-156 16 189
-189 16 189
-205 16 180
-230 16 172
-246 8 164
-246 24 156
-255 41 156
-255 57 156
-255 74 164
-255 90 164
-0 57 197
-16 49 189
-41 41 189
-65 41 189
-90 41 189
-123 41 189
-156 41 189
-189 41 189
-205 32 172
-222 32 172
-230 49 164
-230 57 156
-238 65 156
-246 90 164
-255 90 164
-255 106 164
-0 82 197
-16 74 189
-41 65 189
-57 57 180
-90 57 180
-123 57 180
-148 57 180
-180 57 180
-197 57 172
-205 65 164
-213 74 156
-222 82 156
-238 98 164
-246 106 164
-255 106 164
-255 123 172
-0 115 197
-16 106 189
-41 98 189
-57 90 180
-82 82 172
-106 82 172
-139 82 172
-172 82 172
-189 82 164
-197 90 156
-205 98 156
-222 115 164
-238 115 164
-246 123 164
-255 131 164
-255 148 172
-0 139 197
-16 131 189
-41 123 189
-57 123 180
-82 115 172
-106 106 164
-139 106 164
-164 106 164
-180 106 156
-197 115 156
-205 123 156
-222 131 164
-238 131 164
-246 139 164
-255 148 172
-255 164 180
-0 164 197
-16 164 189
-41 156 189
-57 148 180
-82 148 172
-106 139 164
-123 123 164
-164 123 164
-180 131 156
-197 139 156
-205 139 156
-222 148 164
-238 148 164
-246 156 172
-255 164 172
-255 180 189
-0 197 197
-16 189 189
-41 189 189
-57 180 180
-82 172 172
-106 164 164
-123 164 164
-164 139 139
-180 156 156
-197 156 156
-205 156 156
-222 164 164
-238 172 172
-246 172 172
-255 180 180
-255 197 197
-0 213 180
-16 205 180
-32 205 172
-57 197 164
-82 189 164
-106 180 156
-131 180 156
-156 180 156
-180 180 156
-197 172 156
-205 172 156
-222 180 164
-238 180 172
-246 180 172
-255 189 180
-255 205 197
-0 230 172
-16 230 172
-32 222 164
-65 205 156
-90 197 156
-115 197 156
-139 197 156
-156 197 156
-172 197 156
-197 197 156
-205 189 156
-222 189 164
-238 197 172
-246 197 172
-255 205 180
-255 213 197
-0 246 164
-8 246 164
-49 230 156
-74 213 156
-98 205 156
-123 205 156
-139 205 156
-156 205 156
-172 205 156
-189 205 156
-205 205 156
-222 205 164
-238 205 172
-246 213 172
-255 213 180
-255 222 197
-0 255 156
-24 246 156
-57 230 156
-82 222 156
-115 222 156
-131 222 156
-148 222 164
-164 222 164
-180 222 164
-189 222 164
-205 222 164
-222 222 164
-238 222 172
-246 222 172
-255 222 180
-255 230 197
-16 255 156
-41 255 156
-65 238 156
-98 238 156
-115 238 164
-131 238 164
-148 238 164
-172 238 172
-180 238 172
-197 238 172
-205 238 172
-222 238 172
-238 238 172
-246 230 172
-255 230 180
-255 238 197
-32 255 156
-57 255 156
-90 246 156
-106 246 156
-123 246 164
-139 246 164
-156 246 172
-172 246 172
-189 246 172
-197 246 172
-213 246 172
-222 246 172
-230 246 172
-246 246 172
-255 246 180
-255 246 197
-49 255 156
-74 255 156
-90 255 156
-106 255 164
-131 255 164
-148 255 172
-164 255 172
-180 255 180
-189 255 180
-205 255 180
-213 255 180
-222 255 180
-238 255 180
-246 255 180
-255 255 180
-255 246 197
-74 255 156
-90 255 164
-106 255 164
-123 255 172
-148 255 172
-164 255 180
-180 255 189
-197 255 197
-205 255 197
-213 255 197
-222 255 197
-230 255 197
-238 255 197
-246 255 197
-255 255 197
-255 255 197
diff --git a/graphics/misc/sunny_day/88.pal b/graphics/misc/sunny_day/88.pal
deleted file mode 100644
index c01a4c575..000000000
--- a/graphics/misc/sunny_day/88.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 213
-24 0 213
-49 0 213
-74 0 213
-106 0 213
-131 0 213
-156 0 213
-180 0 213
-213 0 213
-230 0 205
-246 0 197
-255 0 189
-255 16 180
-255 32 172
-255 49 172
-255 74 172
-0 24 213
-16 16 205
-41 16 205
-65 16 205
-98 16 205
-123 16 205
-148 16 205
-180 16 205
-205 16 205
-230 16 205
-246 8 197
-246 24 180
-255 41 172
-255 57 172
-255 74 180
-255 90 172
-0 49 213
-16 41 205
-32 32 205
-57 32 205
-90 32 205
-123 32 205
-148 32 205
-172 32 205
-205 32 205
-222 32 197
-230 49 180
-230 57 172
-238 65 172
-246 90 172
-255 90 172
-255 106 180
-0 74 213
-16 74 205
-32 65 205
-57 57 197
-82 57 197
-115 57 197
-139 57 197
-164 57 197
-197 57 197
-205 65 180
-213 74 180
-222 82 172
-238 98 172
-246 106 172
-255 106 180
-255 123 180
-0 106 213
-16 98 205
-32 90 205
-57 90 197
-82 82 189
-115 82 189
-139 82 189
-164 82 189
-189 82 189
-197 90 180
-205 98 172
-222 115 172
-238 115 172
-246 123 180
-255 131 180
-255 148 189
-0 131 213
-16 131 205
-32 123 205
-57 115 197
-82 115 189
-106 106 180
-131 106 180
-156 106 180
-180 106 180
-197 115 172
-205 123 172
-222 131 172
-238 131 180
-246 139 180
-255 148 180
-255 164 189
-0 156 213
-16 156 205
-32 148 205
-57 139 197
-82 139 189
-106 131 180
-131 131 180
-156 131 180
-180 131 180
-197 139 172
-205 139 172
-222 148 180
-238 148 180
-246 156 180
-255 164 189
-255 180 197
-0 189 213
-16 180 205
-32 172 205
-57 172 197
-82 164 189
-106 156 180
-131 156 180
-156 156 180
-180 156 180
-197 156 172
-205 156 172
-222 164 180
-238 172 180
-246 172 189
-255 180 189
-255 197 205
-0 213 213
-16 205 205
-32 205 205
-57 197 197
-82 189 189
-106 180 180
-131 180 180
-156 180 180
-180 164 164
-197 172 172
-213 172 172
-222 180 180
-238 180 180
-246 189 189
-255 197 197
-255 222 222
-0 230 197
-16 230 197
-32 222 197
-65 205 180
-90 197 172
-115 197 172
-139 197 172
-156 197 172
-172 197 172
-197 197 172
-213 189 172
-222 197 180
-238 197 180
-246 197 189
-255 205 197
-255 230 222
-0 246 189
-8 246 189
-49 230 180
-74 213 172
-98 205 172
-123 205 172
-139 205 172
-156 205 172
-172 213 172
-189 213 172
-213 213 172
-222 205 180
-238 213 180
-246 213 189
-255 213 197
-255 230 222
-0 255 189
-24 246 180
-57 230 172
-82 222 172
-115 222 172
-131 222 172
-148 222 172
-164 222 180
-180 222 180
-197 222 180
-205 222 180
-222 222 180
-238 222 180
-246 222 189
-255 230 197
-255 238 222
-16 255 172
-41 255 172
-65 238 164
-98 238 172
-115 238 172
-131 238 172
-148 238 180
-172 238 180
-180 238 180
-197 238 180
-213 238 180
-222 238 180
-238 238 180
-246 238 189
-255 238 197
-255 246 222
-32 255 164
-57 255 164
-90 246 172
-106 246 172
-123 246 172
-139 246 180
-156 246 180
-172 246 180
-189 246 189
-205 246 189
-213 246 189
-222 246 189
-238 246 189
-246 246 189
-255 246 197
-255 246 222
-49 255 164
-74 255 172
-90 255 172
-106 255 180
-131 255 180
-148 255 180
-164 255 189
-180 255 189
-197 255 197
-205 255 197
-213 255 197
-230 255 197
-238 255 197
-246 255 197
-255 255 197
-255 255 222
-74 255 172
-90 255 172
-106 255 180
-123 255 180
-148 255 180
-164 255 189
-180 255 197
-197 255 205
-222 255 222
-230 255 222
-230 255 222
-238 255 222
-246 255 222
-246 255 222
-255 255 222
-255 255 222
diff --git a/graphics/misc/sunny_day/89.pal b/graphics/misc/sunny_day/89.pal
deleted file mode 100644
index 70083e6b3..000000000
--- a/graphics/misc/sunny_day/89.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 230
-16 0 230
-49 0 230
-65 0 230
-98 0 230
-123 0 230
-148 0 230
-172 0 230
-197 0 230
-230 0 230
-246 0 222
-255 0 213
-255 16 197
-255 32 189
-255 49 189
-255 74 189
-0 24 230
-16 16 230
-41 16 230
-65 16 230
-90 16 230
-123 16 230
-148 16 230
-172 16 230
-197 16 230
-230 16 230
-246 8 222
-246 24 205
-255 41 197
-255 57 189
-255 74 189
-255 90 189
-0 49 230
-16 41 230
-32 32 222
-57 32 222
-90 32 222
-115 32 222
-139 32 222
-164 32 222
-197 32 222
-222 32 222
-230 49 205
-230 57 197
-238 65 189
-246 90 189
-255 90 189
-255 106 189
-0 74 230
-16 65 230
-32 65 222
-65 65 205
-90 65 205
-115 65 205
-139 65 205
-156 65 205
-180 65 205
-205 65 205
-213 74 197
-222 82 189
-238 98 189
-246 106 189
-255 106 189
-255 123 189
-0 98 230
-16 98 230
-32 90 222
-65 90 205
-90 90 197
-115 90 197
-131 90 197
-156 90 197
-172 90 197
-197 90 197
-205 98 189
-222 115 189
-238 115 189
-246 123 189
-255 131 189
-255 148 197
-0 123 230
-16 123 230
-32 115 222
-65 115 205
-90 115 197
-115 115 197
-131 115 197
-156 115 197
-172 115 197
-197 115 197
-205 123 189
-222 131 189
-238 131 189
-246 139 189
-255 148 197
-255 164 197
-0 148 230
-16 148 230
-32 148 222
-65 139 205
-90 131 197
-115 131 197
-139 139 197
-156 139 197
-172 139 197
-197 139 197
-205 139 189
-222 148 189
-238 148 189
-246 156 197
-255 164 197
-255 180 205
-0 180 230
-16 172 230
-32 172 222
-65 164 205
-90 156 197
-115 156 197
-139 156 197
-156 156 197
-172 156 197
-197 156 197
-205 156 189
-222 164 189
-238 172 197
-246 172 197
-255 180 205
-255 197 213
-0 205 230
-16 205 230
-32 197 222
-65 180 205
-90 180 197
-115 172 197
-139 172 197
-156 172 197
-172 172 197
-197 172 197
-213 172 189
-222 180 197
-238 180 197
-246 189 205
-255 197 205
-255 222 230
-0 230 230
-16 230 230
-32 222 222
-65 205 205
-90 197 197
-115 197 197
-139 197 197
-156 197 197
-172 197 197
-197 189 189
-213 189 189
-222 197 197
-238 197 197
-246 205 205
-255 222 222
-255 238 238
-0 246 213
-8 246 222
-49 230 205
-74 213 197
-98 205 189
-123 205 189
-139 205 189
-156 205 189
-172 213 189
-189 213 189
-213 213 189
-222 213 197
-238 213 197
-246 213 205
-255 230 222
-255 238 238
-0 255 205
-24 246 197
-57 230 189
-82 222 189
-115 222 189
-131 222 189
-148 222 189
-164 222 189
-180 222 197
-197 222 197
-213 222 197
-222 222 197
-238 222 197
-246 230 205
-255 238 222
-255 246 238
-16 255 197
-41 255 189
-65 238 180
-98 238 189
-115 238 189
-131 238 189
-148 238 189
-172 238 197
-180 238 197
-197 238 197
-213 238 197
-222 238 197
-238 238 197
-246 238 205
-255 246 222
-255 246 238
-32 255 189
-57 255 180
-90 246 189
-106 246 189
-123 246 189
-139 246 189
-156 246 197
-172 246 197
-189 246 197
-205 246 205
-213 246 205
-230 246 205
-238 246 205
-246 246 205
-255 246 222
-255 255 238
-49 255 180
-74 255 189
-90 255 189
-106 255 189
-131 255 189
-148 255 197
-164 255 197
-180 255 205
-197 255 205
-222 255 222
-230 255 222
-238 255 222
-246 255 222
-246 255 222
-255 255 222
-255 255 238
-74 255 180
-90 255 189
-106 255 189
-123 255 189
-148 255 197
-164 255 197
-180 255 205
-197 255 213
-222 255 230
-238 255 238
-246 255 238
-246 255 238
-246 255 238
-255 255 238
-255 255 238
-255 255 238
diff --git a/graphics/misc/sunny_day/9.pal b/graphics/misc/sunny_day/9.pal
deleted file mode 100644
index ee5169a71..000000000
--- a/graphics/misc/sunny_day/9.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 172
-16 0 172
-32 0 172
-57 0 172
-74 0 172
-90 0 172
-115 0 172
-131 0 172
-148 0 172
-172 0 172
-189 0 172
-205 0 172
-222 0 164
-238 0 172
-255 0 164
-255 24 164
-0 16 172
-16 16 172
-32 16 172
-57 16 172
-74 16 172
-90 16 172
-115 16 172
-131 16 172
-148 16 172
-172 16 172
-189 16 172
-205 16 172
-222 16 172
-238 16 164
-246 32 164
-255 41 164
-0 41 172
-16 41 172
-32 32 172
-57 32 172
-74 32 172
-90 32 172
-115 32 172
-131 32 172
-148 32 172
-172 32 172
-189 32 172
-205 32 164
-222 32 164
-230 49 164
-246 49 164
-255 57 172
-0 57 172
-16 57 172
-32 57 172
-57 57 164
-74 57 164
-90 57 164
-115 57 164
-131 57 164
-148 57 164
-164 57 164
-189 49 172
-205 57 164
-213 65 164
-230 65 164
-246 65 164
-255 74 164
-0 74 172
-16 74 172
-32 74 172
-57 74 164
-74 74 164
-90 74 164
-106 74 164
-131 74 164
-148 74 164
-164 74 164
-180 74 164
-197 82 164
-213 82 164
-230 82 172
-246 82 164
-255 90 172
-0 98 172
-16 90 172
-32 90 172
-57 90 164
-74 90 164
-90 90 164
-106 90 164
-131 90 164
-148 90 164
-164 90 164
-180 98 164
-197 98 164
-213 98 164
-230 98 164
-246 106 172
-255 106 172
-0 115 172
-16 115 172
-32 115 172
-57 115 164
-74 106 164
-90 106 164
-115 115 164
-131 115 164
-148 115 164
-164 115 164
-180 115 164
-197 115 164
-213 115 164
-230 123 164
-246 123 172
-255 123 172
-0 131 172
-16 131 172
-32 131 172
-57 131 164
-74 131 164
-90 131 164
-115 131 164
-131 131 164
-148 131 164
-164 131 164
-180 139 164
-197 131 164
-213 139 164
-230 139 164
-246 139 172
-255 139 172
-0 156 172
-16 156 172
-32 148 172
-57 148 164
-74 148 164
-90 148 164
-115 148 164
-131 148 164
-148 148 164
-164 148 164
-180 156 164
-197 148 164
-213 156 172
-230 156 172
-246 156 172
-255 172 180
-0 172 172
-16 172 172
-32 172 172
-57 164 164
-74 164 164
-90 164 164
-115 164 164
-131 164 164
-148 164 164
-164 164 164
-180 164 164
-197 172 172
-213 172 172
-230 172 172
-246 180 180
-255 189 189
-0 189 164
-16 189 172
-32 189 164
-49 189 164
-74 180 164
-98 180 164
-115 180 164
-139 180 164
-156 180 164
-164 180 164
-180 180 164
-197 180 172
-213 180 172
-230 189 172
-246 197 180
-255 197 189
-0 205 164
-16 205 164
-32 205 164
-57 205 164
-82 197 164
-98 197 164
-115 197 164
-131 197 164
-148 197 164
-172 197 172
-180 197 172
-197 197 172
-213 197 172
-230 197 172
-246 205 180
-255 213 189
-0 222 164
-16 222 164
-32 222 164
-65 213 164
-82 213 164
-98 213 164
-115 213 164
-139 213 164
-156 213 172
-172 213 172
-189 213 172
-197 213 172
-213 213 172
-230 213 172
-246 222 180
-255 222 189
-0 238 164
-16 238 164
-49 230 164
-65 230 164
-82 230 164
-98 230 164
-123 230 164
-139 230 164
-156 230 164
-172 230 172
-189 230 172
-197 230 172
-213 230 172
-230 230 172
-246 230 180
-255 230 189
-0 255 164
-32 246 164
-49 246 164
-65 246 164
-82 246 164
-106 246 164
-123 246 164
-139 246 172
-156 246 172
-180 246 180
-197 246 180
-205 246 180
-222 246 180
-238 246 180
-246 246 180
-255 246 189
-24 255 164
-41 255 164
-57 255 164
-74 255 164
-90 255 164
-106 255 164
-123 255 172
-139 255 172
-172 255 180
-189 255 189
-197 255 189
-213 255 189
-222 255 189
-238 255 189
-246 255 189
-255 255 189
diff --git a/graphics/misc/sunny_day/90.pal b/graphics/misc/sunny_day/90.pal
deleted file mode 100644
index 3b9064bc0..000000000
--- a/graphics/misc/sunny_day/90.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 246
-16 0 246
-41 0 246
-65 0 246
-90 0 246
-123 0 246
-139 0 246
-164 0 246
-189 0 246
-213 0 246
-246 0 246
-255 0 238
-255 16 222
-255 32 205
-255 49 197
-255 74 197
-0 24 246
-8 8 246
-32 8 246
-57 8 246
-82 8 246
-115 8 246
-139 8 246
-164 8 246
-189 8 246
-222 8 246
-246 8 246
-246 24 230
-255 41 213
-255 57 205
-255 74 205
-255 90 197
-0 49 246
-8 41 246
-49 49 230
-65 49 230
-90 49 230
-115 49 230
-139 49 230
-156 49 230
-180 49 230
-205 49 230
-230 49 230
-230 57 213
-238 65 205
-246 90 205
-255 90 205
-255 106 205
-0 74 246
-8 65 246
-49 65 230
-74 74 213
-90 74 213
-115 74 213
-131 74 213
-156 74 213
-172 74 213
-197 74 213
-213 74 213
-222 82 205
-238 98 205
-246 106 205
-255 106 205
-255 123 205
-0 98 246
-8 90 246
-49 90 230
-74 98 213
-98 98 205
-115 98 205
-131 98 205
-156 98 205
-172 98 205
-189 98 205
-205 98 205
-222 115 205
-238 115 205
-246 123 205
-255 131 205
-255 148 205
-0 123 246
-8 115 246
-49 115 230
-74 115 213
-98 115 205
-123 123 205
-139 123 205
-156 123 205
-172 123 205
-189 123 205
-205 123 205
-222 131 205
-238 131 205
-246 139 205
-255 148 205
-255 164 213
-0 148 246
-8 148 246
-49 139 230
-74 139 213
-98 139 205
-123 139 205
-139 139 205
-156 139 205
-172 139 205
-189 139 205
-205 139 205
-222 148 205
-238 148 205
-246 156 205
-255 164 213
-255 180 213
-0 172 246
-8 164 246
-49 164 230
-74 156 213
-98 156 205
-123 156 205
-139 156 205
-156 156 205
-172 156 205
-189 156 205
-205 156 205
-222 164 205
-238 172 205
-246 172 213
-255 180 213
-255 197 222
-0 197 246
-8 197 246
-49 180 230
-74 180 213
-98 172 205
-123 172 205
-139 172 205
-156 172 205
-172 172 213
-189 172 213
-213 172 213
-222 180 205
-238 180 213
-246 189 213
-255 197 213
-255 222 230
-0 222 246
-8 222 246
-49 205 230
-74 197 213
-98 189 205
-123 189 205
-139 189 205
-156 189 205
-172 189 213
-189 189 213
-213 189 213
-222 197 213
-238 197 213
-246 205 213
-255 222 230
-255 238 246
-0 246 246
-8 246 246
-49 230 230
-74 213 213
-98 205 205
-123 205 205
-139 205 205
-156 205 205
-172 213 213
-189 213 213
-213 205 205
-230 213 213
-238 213 213
-246 230 230
-255 238 238
-255 255 255
-0 255 230
-24 246 222
-57 230 213
-82 222 205
-115 222 205
-131 222 205
-148 222 205
-164 222 205
-180 222 205
-197 222 213
-213 230 213
-230 230 213
-238 230 213
-246 238 230
-255 246 238
-255 255 255
-16 255 213
-41 255 205
-65 238 205
-98 238 205
-115 238 205
-131 238 205
-148 238 205
-172 238 205
-180 238 213
-197 238 213
-213 238 213
-230 238 213
-238 238 213
-246 246 230
-255 246 238
-255 255 255
-32 255 205
-57 255 205
-90 246 205
-106 246 205
-123 246 205
-139 246 205
-156 246 205
-172 246 213
-189 246 213
-205 246 213
-230 246 230
-238 246 230
-246 246 230
-246 246 230
-255 255 238
-255 255 255
-49 255 197
-74 255 197
-90 255 197
-106 255 205
-131 255 205
-148 255 205
-164 255 213
-180 255 213
-197 255 213
-222 255 230
-238 255 238
-246 255 238
-246 255 238
-255 255 238
-255 255 238
-255 255 255
-74 255 197
-90 255 197
-106 255 197
-123 255 205
-148 255 205
-164 255 213
-180 255 213
-197 255 222
-222 255 230
-238 255 238
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/91.pal b/graphics/misc/sunny_day/91.pal
deleted file mode 100644
index 0cc9cb226..000000000
--- a/graphics/misc/sunny_day/91.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 255
-16 0 255
-41 0 255
-65 0 255
-90 0 255
-115 0 255
-139 0 255
-156 0 255
-189 0 255
-205 0 255
-230 0 255
-255 0 255
-255 16 238
-255 32 222
-255 49 213
-255 74 213
-0 24 255
-24 24 246
-41 24 246
-65 24 246
-90 24 246
-106 24 246
-139 24 246
-156 24 246
-180 24 246
-197 24 246
-222 24 246
-246 24 246
-255 41 238
-255 57 222
-255 74 213
-255 90 213
-0 49 255
-24 49 246
-57 57 230
-74 57 230
-98 57 230
-115 57 230
-131 57 230
-156 57 230
-172 57 230
-189 57 230
-213 57 230
-230 57 230
-238 65 222
-246 90 222
-255 90 213
-255 106 213
-0 74 255
-24 65 246
-57 74 230
-82 82 222
-98 82 222
-115 82 222
-131 82 222
-156 82 222
-172 82 222
-189 82 222
-205 82 222
-222 82 222
-238 98 222
-246 106 222
-255 106 222
-255 123 213
-0 90 255
-24 90 246
-57 98 230
-82 98 222
-115 115 222
-131 115 222
-148 115 222
-156 115 222
-172 115 222
-189 115 222
-205 115 222
-222 115 222
-238 115 222
-246 123 222
-255 131 222
-255 148 213
-0 123 255
-24 115 246
-57 115 230
-82 115 222
-115 131 222
-131 131 222
-148 131 222
-156 131 222
-172 131 222
-189 131 222
-205 131 222
-222 131 222
-238 131 222
-246 139 222
-255 148 222
-255 164 222
-0 139 255
-24 139 246
-57 139 230
-82 139 222
-115 148 222
-131 148 222
-148 148 222
-164 148 222
-172 148 222
-189 148 222
-205 148 222
-222 148 222
-238 148 222
-246 156 222
-255 164 222
-255 180 222
-0 164 255
-24 156 246
-57 156 230
-82 156 222
-115 164 222
-131 164 222
-148 164 222
-164 164 222
-180 164 222
-189 164 222
-205 164 222
-222 164 222
-238 172 222
-246 172 222
-255 180 222
-255 197 230
-0 189 255
-24 180 246
-57 172 230
-82 172 222
-115 172 222
-131 172 222
-148 180 222
-164 180 222
-180 180 222
-197 180 222
-205 180 222
-222 180 222
-238 180 222
-246 189 222
-255 197 230
-255 222 238
-0 213 255
-24 205 246
-57 197 230
-82 189 222
-115 189 222
-131 189 222
-148 189 222
-164 189 222
-180 197 222
-197 197 222
-213 197 222
-222 197 222
-238 197 222
-246 205 230
-255 222 238
-255 238 246
-0 238 255
-24 230 246
-57 213 230
-82 205 222
-115 205 222
-131 205 222
-148 205 222
-164 205 222
-180 205 222
-197 213 222
-213 213 230
-230 213 230
-238 213 230
-246 230 238
-255 238 246
-255 255 255
-0 255 255
-24 246 246
-57 230 230
-82 222 222
-115 222 222
-131 222 222
-148 222 222
-164 222 222
-180 222 222
-197 222 222
-213 230 230
-230 222 222
-246 238 238
-255 246 246
-255 255 255
-255 255 255
-16 255 238
-41 255 230
-65 238 222
-98 238 222
-115 238 222
-131 238 222
-148 238 222
-172 238 222
-180 238 222
-197 238 222
-213 238 230
-238 246 238
-246 246 238
-255 246 246
-255 255 255
-255 255 255
-32 255 222
-57 255 213
-90 246 213
-106 246 213
-123 246 213
-139 246 222
-156 246 222
-172 246 222
-189 246 222
-205 246 230
-230 246 238
-246 255 246
-246 255 246
-255 255 246
-255 255 255
-255 255 255
-49 255 213
-74 255 213
-90 255 213
-106 255 213
-131 255 213
-148 255 222
-164 255 222
-180 255 222
-197 255 230
-222 255 238
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 255 205
-90 255 205
-106 255 213
-123 255 213
-148 255 213
-164 255 222
-180 255 222
-197 255 230
-222 255 238
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/92.pal b/graphics/misc/sunny_day/92.pal
deleted file mode 100644
index 554b2c171..000000000
--- a/graphics/misc/sunny_day/92.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-16 16 255
-32 16 255
-49 16 255
-74 16 255
-90 16 255
-115 16 255
-139 16 255
-156 16 255
-172 16 255
-197 16 255
-213 16 255
-238 16 255
-255 16 255
-255 32 246
-255 49 230
-255 74 222
-16 32 255
-41 41 255
-57 41 255
-74 41 255
-98 41 255
-115 41 255
-131 41 255
-156 41 255
-172 41 255
-189 41 255
-205 41 255
-230 41 255
-255 41 255
-255 57 238
-255 74 230
-255 90 222
-16 57 255
-41 57 255
-65 65 238
-82 65 238
-98 65 238
-115 65 238
-131 65 238
-156 65 238
-164 65 238
-180 65 238
-205 65 238
-222 65 238
-238 65 238
-246 90 230
-255 90 230
-255 106 222
-16 74 255
-41 74 255
-65 90 238
-98 98 238
-115 98 238
-131 98 238
-139 98 238
-156 98 238
-172 98 238
-189 98 238
-205 98 238
-222 98 238
-238 98 238
-246 106 230
-255 106 230
-255 123 222
-16 98 255
-41 98 255
-65 106 238
-98 115 238
-115 115 238
-131 115 238
-148 115 238
-164 115 238
-172 115 238
-189 115 238
-205 115 238
-222 115 238
-238 115 238
-246 123 230
-255 131 230
-255 148 230
-16 115 255
-41 115 255
-65 123 238
-98 131 238
-115 131 238
-131 131 238
-148 131 238
-164 131 238
-172 131 238
-189 131 238
-205 131 238
-222 131 238
-238 131 238
-246 139 230
-255 148 230
-255 164 230
-16 139 255
-41 139 255
-65 139 238
-98 148 238
-115 148 238
-131 148 238
-148 148 238
-164 148 238
-180 148 238
-189 148 238
-205 148 238
-222 148 238
-238 148 238
-246 156 230
-255 164 230
-255 180 230
-16 156 255
-41 156 255
-65 156 238
-98 164 238
-115 164 238
-131 164 238
-148 164 238
-172 172 238
-180 172 238
-197 172 238
-205 172 238
-222 172 238
-238 172 238
-246 172 230
-255 180 238
-255 197 238
-16 180 255
-41 172 255
-65 172 238
-98 172 238
-115 172 238
-131 180 238
-148 180 238
-172 180 238
-180 180 238
-197 180 238
-213 180 238
-222 180 238
-238 180 238
-246 189 238
-255 197 238
-255 222 246
-16 197 255
-41 197 255
-65 189 238
-98 189 238
-115 189 238
-131 189 238
-148 189 238
-172 197 238
-180 197 238
-197 197 238
-213 197 238
-222 197 238
-238 197 238
-246 205 238
-255 222 246
-255 238 246
-16 222 255
-41 213 255
-65 205 238
-98 205 238
-115 205 238
-131 205 238
-148 205 238
-172 205 238
-180 213 238
-197 213 238
-213 213 238
-230 213 238
-238 213 238
-246 230 246
-255 238 246
-255 255 255
-16 238 255
-41 238 255
-65 222 238
-98 222 238
-115 222 238
-131 222 238
-148 222 238
-172 222 238
-180 222 238
-197 222 238
-213 230 238
-238 238 246
-246 238 246
-255 246 246
-255 255 255
-255 255 255
-16 255 255
-41 255 255
-65 238 238
-98 238 238
-115 238 238
-131 238 238
-148 238 238
-172 238 238
-180 238 238
-197 238 238
-213 238 238
-238 246 246
-246 246 246
-255 255 255
-255 255 255
-255 255 255
-32 255 238
-57 255 230
-90 246 230
-106 246 230
-123 246 230
-139 246 230
-156 246 230
-172 246 230
-189 246 238
-205 246 238
-230 246 246
-246 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 255 230
-74 255 230
-90 255 230
-106 255 230
-131 255 230
-148 255 230
-164 255 230
-180 255 230
-197 255 238
-222 255 246
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 255 222
-90 255 222
-106 255 222
-123 255 222
-148 255 230
-164 255 230
-180 255 230
-197 255 238
-222 255 246
-238 255 246
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/93.pal b/graphics/misc/sunny_day/93.pal
deleted file mode 100644
index 15f97e8b5..000000000
--- a/graphics/misc/sunny_day/93.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-32 32 255
-49 32 255
-65 32 255
-82 32 255
-98 32 255
-115 32 255
-131 32 255
-156 32 255
-164 32 255
-189 32 255
-205 32 255
-222 32 255
-238 32 255
-255 32 255
-255 49 246
-255 74 238
-32 49 255
-57 57 255
-65 57 255
-82 57 255
-106 57 255
-115 57 255
-131 57 255
-156 57 255
-164 57 255
-180 57 255
-205 57 255
-213 57 255
-230 57 255
-255 57 255
-255 74 246
-255 90 238
-32 65 255
-57 74 255
-90 90 246
-98 90 246
-115 90 246
-131 90 246
-139 90 246
-156 90 246
-172 90 246
-189 90 246
-205 90 246
-213 90 246
-230 90 246
-246 90 246
-255 90 246
-255 106 238
-32 82 255
-57 90 255
-90 106 246
-106 106 246
-115 106 246
-131 106 246
-148 106 246
-156 106 246
-172 106 246
-189 106 246
-205 106 246
-213 106 246
-230 106 246
-246 106 246
-255 106 246
-255 123 238
-32 106 255
-57 106 255
-90 115 246
-106 123 246
-123 123 246
-131 123 246
-148 123 246
-164 123 246
-172 123 246
-189 123 246
-205 123 246
-213 123 246
-230 123 246
-246 123 246
-255 131 246
-255 148 238
-32 115 255
-57 123 255
-90 131 246
-106 131 246
-123 139 246
-139 139 246
-156 139 246
-164 139 246
-180 139 246
-189 139 246
-205 139 246
-222 139 246
-230 139 246
-246 139 246
-255 148 246
-255 164 238
-32 139 255
-57 139 255
-90 148 246
-106 148 246
-123 148 246
-139 156 246
-156 156 246
-172 156 246
-180 156 246
-197 156 246
-205 156 246
-222 156 246
-230 156 246
-246 156 246
-255 164 246
-255 180 238
-32 156 255
-57 156 255
-90 164 246
-106 164 246
-123 164 246
-139 164 246
-156 172 246
-172 172 246
-180 172 246
-197 172 246
-213 172 246
-222 172 246
-230 172 246
-246 172 246
-255 180 246
-255 197 246
-32 172 255
-57 172 255
-90 172 246
-106 172 246
-123 180 246
-139 180 246
-156 180 246
-172 189 246
-189 189 246
-197 189 246
-213 189 246
-222 189 246
-238 189 246
-246 189 246
-255 197 246
-255 222 246
-32 189 255
-57 189 255
-90 189 246
-106 189 246
-123 189 246
-139 189 246
-156 197 246
-172 197 246
-189 205 246
-205 205 246
-213 205 246
-230 205 246
-238 205 246
-246 205 246
-255 222 246
-255 238 255
-32 205 255
-57 205 255
-90 205 246
-106 205 246
-123 205 246
-139 205 246
-156 205 246
-172 213 246
-189 213 246
-205 213 246
-230 230 246
-238 230 246
-246 230 246
-246 230 246
-255 238 255
-255 255 255
-32 222 255
-57 222 255
-90 222 246
-106 222 246
-123 222 246
-139 222 246
-156 222 246
-172 222 246
-189 222 246
-205 230 246
-230 238 246
-246 246 255
-246 246 255
-255 246 255
-255 255 255
-255 255 255
-32 246 255
-57 238 255
-90 230 246
-106 230 246
-123 230 246
-139 230 246
-156 230 246
-172 230 246
-189 238 246
-205 238 246
-230 246 246
-246 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-32 255 255
-57 255 255
-90 246 246
-106 246 246
-123 246 246
-139 246 246
-156 246 246
-172 246 246
-189 246 246
-205 246 246
-230 246 246
-246 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 255 238
-74 255 246
-90 255 238
-106 255 246
-131 255 246
-148 255 246
-164 255 246
-180 255 246
-197 255 246
-222 255 246
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 255 230
-90 255 230
-106 255 230
-123 255 238
-148 255 238
-164 255 238
-180 255 238
-197 255 246
-222 255 246
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/94.pal b/graphics/misc/sunny_day/94.pal
deleted file mode 100644
index 0036d47e0..000000000
--- a/graphics/misc/sunny_day/94.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-49 49 255
-65 49 255
-74 49 255
-90 49 255
-106 49 255
-123 49 255
-139 49 255
-156 49 255
-164 49 255
-180 49 255
-197 49 255
-213 49 255
-230 49 255
-238 49 255
-255 49 255
-255 74 246
-49 65 255
-74 74 255
-90 74 255
-106 74 255
-115 74 255
-131 74 255
-139 74 255
-156 74 255
-172 74 255
-189 74 255
-197 74 255
-213 74 255
-230 74 255
-246 74 255
-255 74 255
-255 90 246
-49 82 255
-74 90 255
-90 90 255
-106 90 255
-115 90 255
-131 90 255
-148 90 255
-156 90 255
-172 90 255
-189 90 255
-197 90 255
-213 90 255
-230 90 255
-238 90 255
-255 90 255
-255 106 246
-49 90 255
-74 106 255
-90 106 255
-106 106 255
-123 106 255
-131 106 255
-148 106 255
-164 106 255
-180 106 255
-189 106 255
-205 106 255
-213 106 255
-230 106 255
-246 106 255
-255 106 255
-255 123 246
-49 115 255
-74 115 255
-90 123 255
-106 123 255
-131 131 255
-139 131 255
-148 131 255
-164 131 255
-180 131 255
-189 131 255
-205 131 255
-213 131 255
-230 131 255
-246 131 255
-255 131 255
-255 148 246
-49 123 255
-74 131 255
-90 131 255
-106 139 255
-131 139 255
-148 148 255
-156 148 255
-172 148 255
-180 148 255
-197 148 255
-205 148 255
-222 148 255
-230 148 255
-246 148 255
-255 148 255
-255 164 246
-49 139 255
-74 148 255
-90 148 255
-106 156 255
-131 156 255
-148 156 255
-164 164 255
-172 164 255
-189 164 255
-197 164 255
-213 164 255
-222 164 255
-230 164 255
-246 164 255
-255 164 255
-255 180 255
-49 156 255
-74 164 255
-90 164 255
-106 164 255
-131 164 255
-148 172 255
-164 172 255
-180 180 255
-189 180 255
-205 180 255
-213 180 255
-222 180 255
-230 180 255
-246 180 255
-255 180 255
-255 197 255
-49 172 255
-74 180 255
-90 172 255
-106 180 255
-131 180 255
-148 180 255
-164 189 255
-180 189 255
-197 197 255
-205 197 255
-213 197 255
-230 197 255
-238 197 255
-246 197 255
-255 197 255
-255 222 255
-49 189 255
-74 189 255
-90 189 255
-106 189 255
-131 189 255
-148 197 255
-164 197 255
-180 205 255
-197 205 255
-222 222 255
-230 222 255
-238 222 255
-246 222 255
-246 222 255
-255 222 255
-255 238 255
-49 197 255
-74 205 255
-90 205 255
-106 205 255
-131 205 255
-148 205 255
-164 213 255
-180 213 255
-197 213 255
-222 230 255
-238 238 255
-246 238 255
-246 238 255
-255 238 255
-255 238 255
-255 255 255
-49 213 255
-74 213 255
-90 213 255
-106 222 255
-131 222 255
-148 222 255
-164 222 255
-180 222 255
-197 230 255
-222 238 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 230 255
-74 230 255
-90 230 255
-106 230 255
-131 230 255
-148 230 255
-164 230 255
-180 238 255
-197 238 255
-222 246 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 246 255
-74 246 255
-90 246 255
-106 246 255
-131 246 255
-148 246 255
-164 246 255
-180 246 255
-197 246 255
-222 246 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-49 255 255
-74 255 255
-90 255 255
-106 255 255
-131 255 255
-148 255 255
-164 255 255
-180 255 255
-197 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 255 246
-90 255 246
-106 255 246
-123 255 246
-148 255 246
-164 255 246
-180 255 246
-197 255 246
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/misc/sunny_day/95.pal b/graphics/misc/sunny_day/95.pal
deleted file mode 100644
index 3b8bceb35..000000000
--- a/graphics/misc/sunny_day/95.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-74 74 255
-82 74 255
-98 74 255
-106 74 255
-123 74 255
-131 74 255
-148 74 255
-156 74 255
-172 74 255
-180 74 255
-197 74 255
-205 74 255
-222 74 255
-230 74 255
-246 74 255
-255 74 255
-74 90 255
-90 90 255
-106 90 255
-115 90 255
-123 90 255
-139 90 255
-148 90 255
-164 90 255
-172 90 255
-189 90 255
-197 90 255
-205 90 255
-222 90 255
-230 90 255
-246 90 255
-255 90 255
-74 98 255
-90 106 255
-106 106 255
-123 106 255
-131 106 255
-139 106 255
-156 106 255
-164 106 255
-180 106 255
-189 106 255
-197 106 255
-213 106 255
-222 106 255
-230 106 255
-246 106 255
-255 106 255
-74 115 255
-90 115 255
-106 123 255
-123 123 255
-139 123 255
-148 123 255
-156 123 255
-172 123 255
-180 123 255
-189 123 255
-205 123 255
-213 123 255
-222 123 255
-238 123 255
-246 123 255
-255 123 255
-74 123 255
-90 131 255
-106 131 255
-123 139 255
-148 148 255
-156 148 255
-164 148 255
-172 148 255
-180 148 255
-197 148 255
-205 148 255
-213 148 255
-230 148 255
-238 148 255
-246 148 255
-255 148 255
-74 139 255
-90 139 255
-106 148 255
-123 148 255
-148 156 255
-164 164 255
-172 164 255
-180 164 255
-189 164 255
-197 164 255
-213 164 255
-222 164 255
-230 164 255
-238 164 255
-246 164 255
-255 164 255
-74 148 255
-90 156 255
-106 156 255
-123 156 255
-148 164 255
-164 172 255
-180 180 255
-189 180 255
-197 180 255
-205 180 255
-213 180 255
-222 180 255
-230 180 255
-238 180 255
-246 180 255
-255 180 255
-74 164 255
-90 164 255
-106 164 255
-123 172 255
-148 172 255
-164 180 255
-180 189 255
-197 197 255
-205 197 255
-213 197 255
-222 197 255
-230 197 255
-238 197 255
-246 197 255
-246 197 255
-255 197 255
-74 172 255
-90 172 255
-106 180 255
-123 180 255
-148 189 255
-164 189 255
-180 197 255
-197 205 255
-222 222 255
-230 222 255
-230 222 255
-238 222 255
-246 222 255
-246 222 255
-255 222 255
-255 222 255
-74 189 255
-90 189 255
-106 189 255
-123 189 255
-148 197 255
-164 197 255
-180 205 255
-197 213 255
-222 230 255
-238 238 255
-238 238 255
-246 238 255
-246 238 255
-255 238 255
-255 238 255
-255 238 255
-74 197 255
-90 197 255
-106 205 255
-123 205 255
-148 205 255
-164 213 255
-180 213 255
-197 222 255
-222 230 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 213 255
-90 213 255
-106 213 255
-123 213 255
-148 213 255
-164 222 255
-180 222 255
-197 230 255
-222 238 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 222 255
-90 222 255
-106 222 255
-123 222 255
-148 230 255
-164 230 255
-180 230 255
-197 238 255
-222 246 255
-238 246 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 238 255
-90 238 255
-106 238 255
-123 238 255
-148 238 255
-164 238 255
-180 238 255
-197 246 255
-222 246 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 246 255
-90 246 255
-106 246 255
-123 246 255
-148 246 255
-164 246 255
-180 255 255
-197 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-74 255 255
-90 255 255
-106 255 255
-123 255 255
-148 255 255
-164 255 255
-180 255 255
-197 255 255
-222 255 255
-238 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
-255 255 255
diff --git a/graphics/weather/drought/colors_0.bin b/graphics/weather/drought/colors_0.bin
new file mode 100644
index 000000000..e8249d55a
--- /dev/null
+++ b/graphics/weather/drought/colors_0.bin
diff --git a/graphics/weather/drought/colors_1.bin b/graphics/weather/drought/colors_1.bin
new file mode 100644
index 000000000..145423a26
--- /dev/null
+++ b/graphics/weather/drought/colors_1.bin
diff --git a/graphics/weather/drought/colors_2.bin b/graphics/weather/drought/colors_2.bin
new file mode 100644
index 000000000..4cdaa0103
--- /dev/null
+++ b/graphics/weather/drought/colors_2.bin
diff --git a/graphics/weather/drought/colors_3.bin b/graphics/weather/drought/colors_3.bin
new file mode 100644
index 000000000..793a8bb86
--- /dev/null
+++ b/graphics/weather/drought/colors_3.bin
diff --git a/graphics/weather/drought/colors_4.bin b/graphics/weather/drought/colors_4.bin
new file mode 100644
index 000000000..315ec5193
--- /dev/null
+++ b/graphics/weather/drought/colors_4.bin
diff --git a/graphics/weather/drought/colors_5.bin b/graphics/weather/drought/colors_5.bin
new file mode 100644
index 000000000..a74504f96
--- /dev/null
+++ b/graphics/weather/drought/colors_5.bin
diff --git a/include/battle.h b/include/battle.h
index 73caed16f..94596c75e 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -28,10 +28,11 @@
 #define B_ACTION_SAFARI_GO_NEAR         7
 #define B_ACTION_SAFARI_RUN             8
 #define B_ACTION_WALLY_THROW            9
-// The exact purposes of these are unclear
-#define B_ACTION_EXEC_SCRIPT            10 // when executing an action
+#define B_ACTION_EXEC_SCRIPT            10
+#define B_ACTION_TRY_FINISH             11
+#define B_ACTION_FINISHED               12
+
 #define B_ACTION_CANCEL_PARTNER         12 // when choosing an action
-#define B_ACTION_FINISHED               12 // when executing an action
 #define B_ACTION_NOTHING_FAINTED        13 // when choosing an action
 #define B_ACTION_NONE                   0xFF
 
@@ -128,36 +129,36 @@ struct UnknownFlags
 
 struct DisableStruct
 {
-     u32 transformedMonPersonality;
-     u16 disabledMove;
-     u16 encoredMove;
-     u8 protectUses;
-     u8 stockpileCounter;
-     u8 substituteHP;
-     u8 disableTimer:4;
-     u8 disableTimerStartValue:4;
-     u8 encoredMovePos;
-     u8 filler_D; // Unused field.
-     u8 encoreTimer:4;
-     u8 encoreTimerStartValue:4;
-     u8 perishSongTimer:4;
-     u8 perishSongTimerStartValue:4;
-     u8 furyCutterCounter;
-     u8 rolloutTimer:4;
-     u8 rolloutTimerStartValue:4;
-     u8 chargeTimer:4;
-     u8 chargeTimerStartValue:4;
-     u8 tauntTimer:4;
-     u8 tauntTimer2:4;
-     u8 battlerPreventingEscape;
-     u8 battlerWithSureHit;
-     u8 isFirstTurn;
-     u8 unk17;
-     u8 truantCounter:1;
-     u8 truantUnknownBit:1;
-     u8 unk18_a_2:2;
-     u8 unk18_b:4;
-     u8 rechargeTimer;
+    u32 transformedMonPersonality;
+    u16 disabledMove;
+    u16 encoredMove;
+    u8 protectUses;
+    u8 stockpileCounter;
+    u8 substituteHP;
+    u8 disableTimer:4;
+    u8 disableTimerStartValue:4;
+    u8 encoredMovePos;
+    u8 filler_D; // Unused field.
+    u8 encoreTimer:4;
+    u8 encoreTimerStartValue:4;
+    u8 perishSongTimer:4;
+    u8 perishSongTimerStartValue:4;
+    u8 furyCutterCounter;
+    u8 rolloutTimer:4;
+    u8 rolloutTimerStartValue:4;
+    u8 chargeTimer:4;
+    u8 chargeTimerStartValue:4;
+    u8 tauntTimer:4;
+    u8 tauntTimer2:4;
+    u8 battlerPreventingEscape;
+    u8 battlerWithSureHit;
+    u8 isFirstTurn;
+    u8 filler_17; // Unused field.
+    u8 truantCounter:1;
+    u8 truantSwitchInHack:1;
+    u8 filler_18_2:2; // Unused field.
+    u8 mimickedMoves:4;
+    u8 rechargeTimer;
 };
 
 struct ProtectStruct
@@ -168,7 +169,7 @@ struct ProtectStruct
     u32 helpingHand:1;
     u32 bounceMove:1;
     u32 stealMove:1;
-    u32 flag0Unknown:1;
+    u32 flag0Unknown:1; // Only set to 0 once.
     u32 prlzImmobility:1;
     u32 confusionSelfDmg:1;
     u32 targetNotAffected:1;
@@ -178,10 +179,10 @@ struct ProtectStruct
     u32 loveImmobility:1;
     u32 usedDisabledMove:1;
     u32 usedTauntedMove:1;
-    u32 flag2Unknown:1;
+    u32 flag2Unknown:1; // Only set to 0 once. Checked in 'WasUnableToUseMove' function.
     u32 flinchImmobility:1;
     u32 notFirstStrike:1;
-    u32 flag_x10:1;
+    u32 palaceUnableToUseMove:1;
     u32 physicalDmg;
     u32 specialDmg;
     u8 physicalBattlerId;
@@ -300,8 +301,8 @@ struct BattleResults
     u8 playerFaintCounter;    // 0x0
     u8 opponentFaintCounter;  // 0x1
     u8 playerSwitchesCounter; // 0x2
-    u8 unk3;                  // 0x3
-    u8 unk4;                  // 0x4
+    u8 numHealingItemsUsed;   // 0x3
+    u8 numRevivesUsed;        // 0x4
     u8 playerMonWasDamaged:1; // 0x5
     u8 usedMasterBall:1;      // 0x5
     u8 caughtMonBall:4;       // 0x5
@@ -441,8 +442,8 @@ struct BattleStruct
     u8 safariPkblThrowCounter;
     u8 safariEscapeFactor;
     u8 safariCatchFactor;
-    u8 field_7D; // unknown spriteId
-    u8 field_7E; // unknown spriteId
+    u8 linkBattleVsSpriteId_V; // The letter "V"
+    u8 linkBattleVsSpriteId_S; // The letter "S"
     u8 formToChangeInto;
     u8 chosenMovePositions[MAX_BATTLERS_COUNT];
     u8 stateIdAfterSelScript[MAX_BATTLERS_COUNT];
diff --git a/include/battle_anim.h b/include/battle_anim.h
index fc0f603eb..8e8a17675 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -75,6 +75,10 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId);
 
 // battle_anim_80A5C6C.s
 void sub_80A6450(struct Sprite *sprite);
+void sub_80A8AEC(struct Sprite *sprite);
+void sub_80A8A6C(struct Sprite *sprite);
+void sub_80A8E30(struct Sprite *sprite);
+void sub_80A8B64(struct Sprite *sprite);
 void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y);
 void DestroySpriteAndMatrix(struct Sprite *sprite);
 void AnimTranslateLinearSimple(struct Sprite *sprite);
diff --git a/include/battle_util.h b/include/battle_util.h
index b3fff196e..71bb22a00 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -42,9 +42,9 @@
 #define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK)))
 
 u8 GetBattlerForBattleScript(u8 caseId);
-void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move);
-void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
-void PressurePPLoseOnUsingImprision(u8 bankAtk);
+void PressurePPLose(u8 target, u8 attacker, u16 move);
+void PressurePPLoseOnUsingPerishSong(u8 attacker);
+void PressurePPLoseOnUsingImprision(u8 attacker);
 void MarkAllBattlersForControllerExec(void); // unused
 void MarkBattlerForControllerExec(u8 battlerId);
 void sub_803F850(u8 arg0);
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
new file mode 100755
index 000000000..d12db9b33
--- /dev/null
+++ b/include/constants/layouts.h
@@ -0,0 +1,446 @@
+#ifndef GUARD_CONSTANTS_LAYOUTS_H
+#define GUARD_CONSTANTS_LAYOUTS_H
+
+#define LAYOUT_PETALBURG_CITY 1
+#define LAYOUT_SLATEPORT_CITY 2
+#define LAYOUT_MAUVILLE_CITY 3
+#define LAYOUT_RUSTBORO_CITY 4
+#define LAYOUT_FORTREE_CITY 5
+#define LAYOUT_LILYCOVE_CITY 6
+#define LAYOUT_MOSSDEEP_CITY 7
+#define LAYOUT_SOOTOPOLIS_CITY 8
+#define LAYOUT_EVER_GRANDE_CITY 9
+#define LAYOUT_LITTLEROOT_TOWN 10
+#define LAYOUT_OLDALE_TOWN 11
+#define LAYOUT_DEWFORD_TOWN 12
+#define LAYOUT_LAVARIDGE_TOWN 13
+#define LAYOUT_FALLARBOR_TOWN 14
+#define LAYOUT_VERDANTURF_TOWN 15
+#define LAYOUT_PACIFIDLOG_TOWN 16
+#define LAYOUT_ROUTE101 17
+#define LAYOUT_ROUTE102 18
+#define LAYOUT_ROUTE103 19
+#define LAYOUT_ROUTE104 20
+#define LAYOUT_ROUTE105 21
+#define LAYOUT_ROUTE106 22
+#define LAYOUT_ROUTE107 23
+#define LAYOUT_ROUTE108 24
+#define LAYOUT_ROUTE109 25
+#define LAYOUT_ROUTE110 26
+#define LAYOUT_ROUTE111 27
+#define LAYOUT_ROUTE112 28
+#define LAYOUT_ROUTE113 29
+#define LAYOUT_ROUTE114 30
+#define LAYOUT_ROUTE115 31
+#define LAYOUT_ROUTE116 32
+#define LAYOUT_ROUTE117 33
+#define LAYOUT_ROUTE118 34
+#define LAYOUT_ROUTE119 35
+#define LAYOUT_ROUTE120 36
+#define LAYOUT_ROUTE121 37
+#define LAYOUT_ROUTE122 38
+#define LAYOUT_ROUTE123 39
+#define LAYOUT_ROUTE124 40
+#define LAYOUT_ROUTE125 41
+#define LAYOUT_ROUTE126 42
+#define LAYOUT_ROUTE127 43
+#define LAYOUT_ROUTE128 44
+#define LAYOUT_ROUTE129 45
+#define LAYOUT_UNKNOWN_MAP_08417FC4 46
+#define LAYOUT_ROUTE131 47
+#define LAYOUT_ROUTE132 48
+#define LAYOUT_ROUTE133 49
+#define LAYOUT_ROUTE134 50
+#define LAYOUT_UNDERWATER2 51
+#define LAYOUT_UNDERWATER3 52
+#define LAYOUT_UNDERWATER4 53
+#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54
+#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55
+#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56
+#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 57
+#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB 58
+#define LAYOUT_HOUSE1 59
+#define LAYOUT_HOUSE2 60
+#define LAYOUT_POKEMON_CENTER_1F 61
+#define LAYOUT_POKEMON_CENTER_2F 62
+#define LAYOUT_MART 63
+#define LAYOUT_HOUSE3 64
+#define LAYOUT_DEWFORD_TOWN_GYM 65
+#define LAYOUT_DEWFORD_TOWN_HALL 66
+#define LAYOUT_HOUSE4 67
+#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 68
+#define LAYOUT_LAVARIDGE_TOWN_GYM_1F 69
+#define LAYOUT_LAVARIDGE_TOWN_GYM_B1F 70
+#define LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F 71
+#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72
+#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73
+#define LAYOUT_LILYCOVE_CITY_HOUSE2 74
+#define LAYOUT_UNKNOWN_MAP_08428450 75
+#define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78
+#define LAYOUT_PETALBURG_CITY_GYM 79
+#define LAYOUT_HOUSE_WITH_BED 80
+#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81
+#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82
+#define LAYOUT_UNKNOWN_MAP_084294C4 83
+#define LAYOUT_UNKNOWN_MAP_084294E8 84
+#define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85
+#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86
+#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87
+#define LAYOUT_HARBOR 88
+#define LAYOUT_MAUVILLE_CITY_GYM 89
+#define LAYOUT_MAUVILLE_CITY_BIKE_SHOP 90
+#define LAYOUT_MAUVILLE_CITY_GAME_CORNER 91
+#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F 92
+#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F 93
+#define LAYOUT_RUSTBORO_CITY_GYM 94
+#define LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL 95
+#define LAYOUT_RUSTBORO_CITY_HOUSE 96
+#define LAYOUT_RUSTBORO_CITY_HOUSE1 97
+#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 98
+#define LAYOUT_FORTREE_CITY_HOUSE1 99
+#define LAYOUT_FORTREE_CITY_GYM 100
+#define LAYOUT_FORTREE_CITY_HOUSE2 101
+#define LAYOUT_ROUTE104_MR_BRINEYS_HOUSE 102
+#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F 103
+#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F 104
+#define LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY 105
+#define LAYOUT_LILYCOVE_CITY_CONTEST_HALL 106
+#define LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB 107
+#define LAYOUT_MOSSDEEP_CITY_GYM 108
+#define LAYOUT_SOOTOPOLIS_CITY_GYM_1F 109
+#define LAYOUT_SOOTOPOLIS_CITY_GYM_B1F 110
+#define LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM 111
+#define LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM 112
+#define LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM 113
+#define LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM 114
+#define LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM 115
+#define LAYOUT_EVER_GRANDE_CITY_SHORT_HALL 116
+#define LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP 117
+#define LAYOUT_CABLE_CAR_STATION 118
+#define LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE 119
+#define LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL 120
+#define LAYOUT_ROUTE114_LANETTES_HOUSE 121
+#define LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE 122
+#define LAYOUT_ROUTE117_POKEMON_DAY_CARE 123
+#define LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE 124
+#define LAYOUT_METEOR_FALLS_1F_1R 125
+#define LAYOUT_METEOR_FALLS_1F_2R 126
+#define LAYOUT_METEOR_FALLS_B1F_1R 127
+#define LAYOUT_METEOR_FALLS_B1F_2R 128
+#define LAYOUT_RUSTURF_TUNNEL 129
+#define LAYOUT_UNDERWATER_SOOTOPOLIS_CITY 130
+#define LAYOUT_DESERT_RUINS 131
+#define LAYOUT_GRANITE_CAVE_1F 132
+#define LAYOUT_GRANITE_CAVE_B1F 133
+#define LAYOUT_GRANITE_CAVE_B2F 134
+#define LAYOUT_PETALBURG_WOODS 135
+#define LAYOUT_MT_CHIMNEY 136
+#define LAYOUT_MT_PYRE_1F 137
+#define LAYOUT_MT_PYRE_2F 138
+#define LAYOUT_MT_PYRE_3F 139
+#define LAYOUT_MT_PYRE_4F 140
+#define LAYOUT_MT_PYRE_5F 141
+#define LAYOUT_MT_PYRE_6F 142
+#define LAYOUT_AQUA_HIDEOUT_1F 143
+#define LAYOUT_AQUA_HIDEOUT_B1F 144
+#define LAYOUT_AQUA_HIDEOUT_B2F 145
+#define LAYOUT_UNDERWATER_SEAFLOOR_CAVERN 146
+#define LAYOUT_SEAFLOOR_CAVERN_ENTRANCE 147
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM1 148
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM2 149
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM3 150
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM4 151
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM5 152
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM6 153
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM7 154
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM8 155
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM9 156
+#define LAYOUT_CAVE_OF_ORIGIN_ENTRANCE 157
+#define LAYOUT_CAVE_OF_ORIGIN_1F 158
+#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 159
+#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 160
+#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 161
+#define LAYOUT_CAVE_OF_ORIGIN_B1F 162
+#define LAYOUT_VICTORY_ROAD_1F 163
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM 164
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM 165
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM 166
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167
+#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168
+#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169
+#define LAYOUT_UNKNOWN_MAP_0843E6C0 170
+#define LAYOUT_UNKNOWN_MAP_0843E6E4 171
+#define LAYOUT_UNKNOWN_MAP_0843E708 172
+#define LAYOUT_UNKNOWN_MAP_0843E72C 173
+#define LAYOUT_UNKNOWN_MAP_0843E750 174
+#define LAYOUT_UNKNOWN_MAP_0843E774 175
+#define LAYOUT_UNKNOWN_MAP_0843E798 176
+#define LAYOUT_UNKNOWN_MAP_0843E7BC 177
+#define LAYOUT_UNKNOWN_MAP_0843E7E0 178
+#define LAYOUT_UNKNOWN_MAP_0843E804 179
+#define LAYOUT_UNKNOWN_MAP_0843E828 180
+#define LAYOUT_UNKNOWN_MAP_0843E84C 181
+#define LAYOUT_UNKNOWN_MAP_0843E870 182
+#define LAYOUT_UNKNOWN_MAP_0843E894 183
+#define LAYOUT_NEW_MAUVILLE_ENTRANCE 184
+#define LAYOUT_NEW_MAUVILLE_INSIDE 185
+#define LAYOUT_ABANDONED_SHIP_DECK 186
+#define LAYOUT_ABANDONED_SHIP_CORRIDORS_1F 187
+#define LAYOUT_ABANDONED_SHIP_ROOMS_1F 188
+#define LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F 189
+#define LAYOUT_ABANDONED_SHIP_ROOMS_B1F 190
+#define LAYOUT_ABANDONED_SHIP_ROOMS2_B1F 191
+#define LAYOUT_ABANDONED_SHIP_UNDERWATER1 192
+#define LAYOUT_ABANDONED_SHIP_ROOM_B1F 193
+#define LAYOUT_ABANDONED_SHIP_ROOMS2_1F 194
+#define LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE 195
+#define LAYOUT_ABANDONED_SHIP_UNDERWATER2 196
+#define LAYOUT_SECRET_BASE_RED_CAVE1 197
+#define LAYOUT_SECRET_BASE_BROWN_CAVE1 198
+#define LAYOUT_SECRET_BASE_BLUE_CAVE1 199
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE1 200
+#define LAYOUT_SECRET_BASE_TREE1 201
+#define LAYOUT_SECRET_BASE_SHRUB1 202
+#define LAYOUT_SECRET_BASE_RED_CAVE2 203
+#define LAYOUT_SECRET_BASE_BROWN_CAVE2 204
+#define LAYOUT_SECRET_BASE_BLUE_CAVE2 205
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE2 206
+#define LAYOUT_SECRET_BASE_TREE2 207
+#define LAYOUT_SECRET_BASE_SHRUB2 208
+#define LAYOUT_SECRET_BASE_RED_CAVE3 209
+#define LAYOUT_SECRET_BASE_BROWN_CAVE3 210
+#define LAYOUT_SECRET_BASE_BLUE_CAVE3 211
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE3 212
+#define LAYOUT_SECRET_BASE_TREE3 213
+#define LAYOUT_SECRET_BASE_SHRUB3 214
+#define LAYOUT_SECRET_BASE_RED_CAVE4 215
+#define LAYOUT_SECRET_BASE_BROWN_CAVE4 216
+#define LAYOUT_SECRET_BASE_BLUE_CAVE4 217
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218
+#define LAYOUT_SECRET_BASE_TREE4 219
+#define LAYOUT_SECRET_BASE_SHRUB4 220
+#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221
+#define LAYOUT_TRADE_CENTER 222
+#define LAYOUT_RECORD_CORNER 223
+#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224
+#define LAYOUT_LINK_CONTEST_ROOM1 225
+#define LAYOUT_UNKNOWN_MAP_25_29 226
+#define LAYOUT_UNKNOWN_MAP_25_30 227
+#define LAYOUT_UNKNOWN_MAP_25_31 228
+#define LAYOUT_UNKNOWN_MAP_25_32 229
+#define LAYOUT_UNKNOWN_MAP_25_33 230
+#define LAYOUT_UNKNOWN_MAP_25_34 231
+#define LAYOUT_LINK_CONTEST_ROOM2 232
+#define LAYOUT_LINK_CONTEST_ROOM3 233
+#define LAYOUT_LINK_CONTEST_ROOM4 234
+#define LAYOUT_LINK_CONTEST_ROOM5 235
+#define LAYOUT_LINK_CONTEST_ROOM6 236
+#define LAYOUT_INSIDE_OF_TRUCK 237
+#define LAYOUT_SAFARI_ZONE_NORTHWEST 238
+#define LAYOUT_SAFARI_ZONE_NORTH 239
+#define LAYOUT_SAFARI_ZONE_SOUTHWEST 240
+#define LAYOUT_SAFARI_ZONE_SOUTH 241
+#define LAYOUT_UNKNOWN_MAP_08447028 242
+#define LAYOUT_ROUTE109_SEASHORE_HOUSE 243
+#define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244
+#define LAYOUT_ROUTE110_TRICK_HOUSE_END 245
+#define LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR 246
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 247
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 248
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 249
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 250
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 251
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 252
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 253
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 254
+#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 255
+#define LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE 256
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F 257
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F 258
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F 259
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F 260
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F 261
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP 262
+#define LAYOUT_ROUTE130 263
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY 264
+#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST 265
+#define LAYOUT_BATTLE_ELEVATOR 266
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR 267
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM 268
+#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F 269
+#define LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F 270
+#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271
+#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273
+#define LAYOUT_UNDERWATER1 274
+#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275
+#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276
+#define LAYOUT_SS_TIDAL_CORRIDOR 277
+#define LAYOUT_SS_TIDAL_LOWER_DECK 278
+#define LAYOUT_SS_TIDAL_ROOMS 279
+#define LAYOUT_ISLAND_CAVE 280
+#define LAYOUT_ANCIENT_TOMB 281
+#define LAYOUT_UNDERWATER_ROUTE134 282
+#define LAYOUT_UNDERWATER_SEALED_CHAMBER 283
+#define LAYOUT_SEALED_CHAMBER_OUTER_ROOM 284
+#define LAYOUT_VICTORY_ROAD_B1F 285
+#define LAYOUT_VICTORY_ROAD_B2F 286
+#define LAYOUT_ROUTE104_PROTOTYPE 287
+#define LAYOUT_GRANITE_CAVE_STEVENS_ROOM 288
+#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 289
+#define LAYOUT_SOUTHERN_ISLAND_EXTERIOR 290
+#define LAYOUT_SOUTHERN_ISLAND_INTERIOR 291
+#define LAYOUT_JAGGED_PASS 292
+#define LAYOUT_FIERY_PATH 293
+#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 294
+#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 295
+#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 296
+#define LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE 297
+#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 298
+#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F 299
+#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F 300
+#define LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE 301
+#define LAYOUT_MT_PYRE_EXTERIOR 302
+#define LAYOUT_MT_PYRE_SUMMIT 303
+#define LAYOUT_SEALED_CHAMBER_INNER_ROOM 304
+#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F 305
+#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F 306
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 307
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 308
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309
+#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310
+#define LAYOUT_SCORCHED_SLAB 311
+#define LAYOUT_UNKNOWN_MAP_0845A394 312
+#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313
+#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314
+#define LAYOUT_EVER_GRANDE_CITY_HALL4 315
+#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316
+#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317
+#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318
+#define LAYOUT_UNKNOWN_MAP_0845D470 319
+#define LAYOUT_SKY_PILLAR_ENTRANCE 320
+#define LAYOUT_SKY_PILLAR_OUTSIDE 321
+#define LAYOUT_SKY_PILLAR_1F 322
+#define LAYOUT_SKY_PILLAR_2F 323
+#define LAYOUT_SKY_PILLAR_3F 324
+#define LAYOUT_SKY_PILLAR_4F 325
+#define LAYOUT_UNKNOWN_MAP_0845ECB4 326
+#define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328
+#define LAYOUT_SAFARI_ZONE_REST_HOUSE 329
+#define LAYOUT_SKY_PILLAR_5F 330
+#define LAYOUT_SKY_PILLAR_TOP 331
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY 332
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR 333
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM 334
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM 335
+#define LAYOUT_MAGMA_HIDEOUT_1F 336
+#define LAYOUT_MAGMA_HIDEOUT_2F_1R 337
+#define LAYOUT_MAGMA_HIDEOUT_2F_2R 338
+#define LAYOUT_MAGMA_HIDEOUT_3F_1R 339
+#define LAYOUT_MAGMA_HIDEOUT_3F_2R 340
+#define LAYOUT_MAGMA_HIDEOUT_4F 341
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY 342
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR 343
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM 344
+#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST 345
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY 346
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM 347
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM 348
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY 349
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR 350
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM 351
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 352
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 353
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356
+#define LAYOUT_UNKNOWN_MAP_08469200 357
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358
+#define LAYOUT_UNKNOWN_MAP_084693AC 359
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361
+#define LAYOUT_BATTLE_PYRAMID_SQUARE01 362
+#define LAYOUT_BATTLE_PYRAMID_SQUARE02 363
+#define LAYOUT_BATTLE_PYRAMID_SQUARE03 364
+#define LAYOUT_BATTLE_PYRAMID_SQUARE04 365
+#define LAYOUT_BATTLE_PYRAMID_SQUARE05 366
+#define LAYOUT_BATTLE_PYRAMID_SQUARE06 367
+#define LAYOUT_BATTLE_PYRAMID_SQUARE07 368
+#define LAYOUT_BATTLE_PYRAMID_SQUARE08 369
+#define LAYOUT_BATTLE_PYRAMID_SQUARE09 370
+#define LAYOUT_BATTLE_PYRAMID_SQUARE10 371
+#define LAYOUT_BATTLE_PYRAMID_SQUARE11 372
+#define LAYOUT_BATTLE_PYRAMID_SQUARE12 373
+#define LAYOUT_BATTLE_PYRAMID_SQUARE13 374
+#define LAYOUT_BATTLE_PYRAMID_SQUARE14 375
+#define LAYOUT_BATTLE_PYRAMID_SQUARE15 376
+#define LAYOUT_BATTLE_PYRAMID_SQUARE16 377
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP 378
+#define LAYOUT_MAGMA_HIDEOUT_3F_3R 379
+#define LAYOUT_MAGMA_HIDEOUT_2F_3R 380
+#define LAYOUT_MIRAGE_TOWER_1F 381
+#define LAYOUT_MIRAGE_TOWER_2F 382
+#define LAYOUT_MIRAGE_TOWER_3F 383
+#define LAYOUT_BATTLE_TENT_LOBBY 384
+#define LAYOUT_BATTLE_TENT_CORRIDOR 385
+#define LAYOUT_BATTLE_TENT_BATTLE_ROOM 386
+#define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387
+#define LAYOUT_MIRAGE_TOWER_4F 388
+#define LAYOUT_DESERT_UNDERPASS 389
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM 390
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 391
+#define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392
+#define LAYOUT_UNION_ROOM 393
+#define LAYOUT_SAFARI_ZONE_NORTHEAST 394
+#define LAYOUT_SAFARI_ZONE_SOUTHEAST 395
+#define LAYOUT_BATTLE_FRONTIER_RANKING_HALL 396
+#define LAYOUT_BATTLE_FRONTIER_LOUNGE1 397
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER 398
+#define LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE 399
+#define LAYOUT_ARTISAN_CAVE_B1F 400
+#define LAYOUT_ARTISAN_CAVE_1F 401
+#define LAYOUT_FARAWAY_ISLAND_ENTRANCE 402
+#define LAYOUT_FARAWAY_ISLAND_INTERIOR 403
+#define LAYOUT_BIRTH_ISLAND_EXTERIOR 404
+#define LAYOUT_ISLAND_HARBOR 405
+#define LAYOUT_UNDERWATER_MARINE_CAVE 406
+#define LAYOUT_MARINE_CAVE_ENTRANCE 407
+#define LAYOUT_TERRA_CAVE_ENTRANCE 408
+#define LAYOUT_TERRA_CAVE_END 409
+#define LAYOUT_UNDERWATER6 410
+#define LAYOUT_UNDERWATER7 411
+#define LAYOUT_UNDERWATER5 412
+#define LAYOUT_MARINE_CAVE_END 413
+#define LAYOUT_TRAINER_HILL_ENTRANCE 414
+#define LAYOUT_TRAINER_HILL_1F 415
+#define LAYOUT_TRAINER_HILL_2F 416
+#define LAYOUT_TRAINER_HILL_3F 417
+#define LAYOUT_TRAINER_HILL_4F 418
+#define LAYOUT_TRAINER_HILL_ROOF 419
+#define LAYOUT_ALTERING_CAVE 420
+#define LAYOUT_NAVEL_ROCK_EXTERIOR 421
+#define LAYOUT_NAVEL_ROCK_ENTRANCE 422
+#define LAYOUT_NAVEL_ROCK_TOP 423
+#define LAYOUT_NAVEL_ROCK_BOTTOM 424
+#define LAYOUT_NAVEL_ROCK_LADDER_ROOM1 425
+#define LAYOUT_NAVEL_ROCK_LADDER_ROOM2 426
+#define LAYOUT_NAVEL_ROCK_B1F 427
+#define LAYOUT_NAVEL_ROCK_FORK 428
+#define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429
+#define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430
+#define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431
+#define LAYOUT_UNKNOWN_MAP_08480DAC 432
+#define LAYOUT_UNKNOWN_MAP_08480F54 433
+#define LAYOUT_UNKNOWN_MAP_084810FC 434
+#define LAYOUT_UNKNOWN_MAP_084812A4 435
+#define LAYOUT_UNKNOWN_MAP_0848144C 436
+#define LAYOUT_UNKNOWN_MAP_084815F4 437
+#define LAYOUT_UNKNOWN_MAP_08481B24 438
+#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439
+#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440
+#define LAYOUT_UNKNOWN_MAP_08481DBC 441
+
+#endif // GUARD_CONSTANTS_LAYOUTS_H
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
new file mode 100755
index 000000000..dc2ac2f32
--- /dev/null
+++ b/include/constants/map_groups.h
@@ -0,0 +1,592 @@
+#ifndef GUARD_CONSTANTS_MAP_GROUPS_H
+#define GUARD_CONSTANTS_MAP_GROUPS_H
+
+// Map Group 0
+#define MAP_PETALBURG_CITY   (0 | (0 << 8))
+#define MAP_SLATEPORT_CITY   (1 | (0 << 8))
+#define MAP_MAUVILLE_CITY    (2 | (0 << 8))
+#define MAP_RUSTBORO_CITY    (3 | (0 << 8))
+#define MAP_FORTREE_CITY     (4 | (0 << 8))
+#define MAP_LILYCOVE_CITY    (5 | (0 << 8))
+#define MAP_MOSSDEEP_CITY    (6 | (0 << 8))
+#define MAP_SOOTOPOLIS_CITY  (7 | (0 << 8))
+#define MAP_EVER_GRANDE_CITY (8 | (0 << 8))
+#define MAP_LITTLEROOT_TOWN  (9 | (0 << 8))
+#define MAP_OLDALE_TOWN      (10 | (0 << 8))
+#define MAP_DEWFORD_TOWN     (11 | (0 << 8))
+#define MAP_LAVARIDGE_TOWN   (12 | (0 << 8))
+#define MAP_FALLARBOR_TOWN   (13 | (0 << 8))
+#define MAP_VERDANTURF_TOWN  (14 | (0 << 8))
+#define MAP_PACIFIDLOG_TOWN  (15 | (0 << 8))
+#define MAP_ROUTE101         (16 | (0 << 8))
+#define MAP_ROUTE102         (17 | (0 << 8))
+#define MAP_ROUTE103         (18 | (0 << 8))
+#define MAP_ROUTE104         (19 | (0 << 8))
+#define MAP_ROUTE105         (20 | (0 << 8))
+#define MAP_ROUTE106         (21 | (0 << 8))
+#define MAP_ROUTE107         (22 | (0 << 8))
+#define MAP_ROUTE108         (23 | (0 << 8))
+#define MAP_ROUTE109         (24 | (0 << 8))
+#define MAP_ROUTE110         (25 | (0 << 8))
+#define MAP_ROUTE111         (26 | (0 << 8))
+#define MAP_ROUTE112         (27 | (0 << 8))
+#define MAP_ROUTE113         (28 | (0 << 8))
+#define MAP_ROUTE114         (29 | (0 << 8))
+#define MAP_ROUTE115         (30 | (0 << 8))
+#define MAP_ROUTE116         (31 | (0 << 8))
+#define MAP_ROUTE117         (32 | (0 << 8))
+#define MAP_ROUTE118         (33 | (0 << 8))
+#define MAP_ROUTE119         (34 | (0 << 8))
+#define MAP_ROUTE120         (35 | (0 << 8))
+#define MAP_ROUTE121         (36 | (0 << 8))
+#define MAP_ROUTE122         (37 | (0 << 8))
+#define MAP_ROUTE123         (38 | (0 << 8))
+#define MAP_ROUTE124         (39 | (0 << 8))
+#define MAP_ROUTE125         (40 | (0 << 8))
+#define MAP_ROUTE126         (41 | (0 << 8))
+#define MAP_ROUTE127         (42 | (0 << 8))
+#define MAP_ROUTE128         (43 | (0 << 8))
+#define MAP_ROUTE129         (44 | (0 << 8))
+#define MAP_ROUTE130         (45 | (0 << 8))
+#define MAP_ROUTE131         (46 | (0 << 8))
+#define MAP_ROUTE132         (47 | (0 << 8))
+#define MAP_ROUTE133         (48 | (0 << 8))
+#define MAP_ROUTE134         (49 | (0 << 8))
+#define MAP_UNDERWATER1      (50 | (0 << 8))
+#define MAP_UNDERWATER2      (51 | (0 << 8))
+#define MAP_UNDERWATER3      (52 | (0 << 8))
+#define MAP_UNDERWATER4      (53 | (0 << 8))
+#define MAP_UNDERWATER5      (54 | (0 << 8))
+#define MAP_UNDERWATER6      (55 | (0 << 8))
+#define MAP_UNDERWATER7      (56 | (0 << 8))
+
+// Map Group 1
+#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    (0 | (1 << 8))
+#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F    (1 | (1 << 8))
+#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F        (2 | (1 << 8))
+#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F        (3 | (1 << 8))
+#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8))
+
+// Map Group 2
+#define MAP_OLDALE_TOWN_HOUSE1            (0 | (2 << 8))
+#define MAP_OLDALE_TOWN_HOUSE2            (1 | (2 << 8))
+#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8))
+#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8))
+#define MAP_OLDALE_TOWN_MART              (4 | (2 << 8))
+
+// Map Group 3
+#define MAP_DEWFORD_TOWN_HOUSE1            (0 | (3 << 8))
+#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8))
+#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8))
+#define MAP_DEWFORD_TOWN_GYM               (3 | (3 << 8))
+#define MAP_DEWFORD_TOWN_HALL              (4 | (3 << 8))
+#define MAP_DEWFORD_TOWN_HOUSE2            (5 | (3 << 8))
+
+// Map Group 4
+#define MAP_LAVARIDGE_TOWN_HERB_SHOP         (0 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_GYM_1F            (1 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_GYM_B1F           (2 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_HOUSE             (3 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_MART              (4 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8))
+
+// Map Group 5
+#define MAP_FALLARBOR_TOWN_MART                    (0 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY       (1 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR    (2 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F       (4 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F       (5 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_HOUSE1                  (6 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_HOUSE2                  (7 | (5 << 8))
+
+// Map Group 6
+#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY       (0 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR    (1 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_MART                    (3 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F       (4 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F       (5 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE            (6 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_HOUSE                   (8 | (6 << 8))
+
+// Map Group 7
+#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE1            (2 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE2            (3 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE3            (4 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE4            (5 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE5            (6 | (7 << 8))
+
+// Map Group 8
+#define MAP_PETALBURG_CITY_WALLYS_HOUSE      (0 | (8 << 8))
+#define MAP_PETALBURG_CITY_GYM               (1 | (8 << 8))
+#define MAP_PETALBURG_CITY_HOUSE1            (2 | (8 << 8))
+#define MAP_PETALBURG_CITY_HOUSE2            (3 | (8 << 8))
+#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8))
+#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8))
+#define MAP_PETALBURG_CITY_MART              (6 | (8 << 8))
+
+// Map Group 9
+#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F      (0 | (9 << 8))
+#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F      (1 | (9 << 8))
+#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY       (2 | (9 << 8))
+#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR    (3 | (9 << 8))
+#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HOUSE1                  (5 | (9 << 8))
+#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB        (6 | (9 << 8))
+#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F       (7 | (9 << 8))
+#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F       (8 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HARBOR                  (9 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HOUSE2                  (10 | (9 << 8))
+#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F       (11 | (9 << 8))
+#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F       (12 | (9 << 8))
+#define MAP_SLATEPORT_CITY_MART                    (13 | (9 << 8))
+
+// Map Group 10
+#define MAP_MAUVILLE_CITY_GYM               (0 | (10 << 8))
+#define MAP_MAUVILLE_CITY_BIKE_SHOP         (1 | (10 << 8))
+#define MAP_MAUVILLE_CITY_HOUSE1            (2 | (10 << 8))
+#define MAP_MAUVILLE_CITY_GAME_CORNER       (3 | (10 << 8))
+#define MAP_MAUVILLE_CITY_HOUSE2            (4 | (10 << 8))
+#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8))
+#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8))
+#define MAP_MAUVILLE_CITY_MART              (7 | (10 << 8))
+
+// Map Group 11
+#define MAP_RUSTBORO_CITY_DEVON_CORP_1F     (0 | (11 << 8))
+#define MAP_RUSTBORO_CITY_DEVON_CORP_2F     (1 | (11 << 8))
+#define MAP_RUSTBORO_CITY_DEVON_CORP_3F     (2 | (11 << 8))
+#define MAP_RUSTBORO_CITY_GYM               (3 | (11 << 8))
+#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL    (4 | (11 << 8))
+#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8))
+#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8))
+#define MAP_RUSTBORO_CITY_MART              (7 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT1_1F          (8 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT1_2F          (9 | (11 << 8))
+#define MAP_RUSTBORO_CITY_HOUSE1            (10 | (11 << 8))
+#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE     (11 | (11 << 8))
+#define MAP_RUSTBORO_CITY_HOUSE2            (12 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT2_1F          (13 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT2_2F          (14 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT2_3F          (15 | (11 << 8))
+#define MAP_RUSTBORO_CITY_HOUSE3            (16 | (11 << 8))
+
+// Map Group 12
+#define MAP_FORTREE_CITY_HOUSE1            (0 | (12 << 8))
+#define MAP_FORTREE_CITY_GYM               (1 | (12 << 8))
+#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8))
+#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8))
+#define MAP_FORTREE_CITY_MART              (4 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE2            (5 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE3            (6 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE4            (7 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE5            (8 | (12 << 8))
+#define MAP_FORTREE_CITY_DECORATION_SHOP   (9 | (12 << 8))
+
+// Map Group 13
+#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F        (0 | (13 << 8))
+#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F        (1 | (13 << 8))
+#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F        (2 | (13 << 8))
+#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F        (3 | (13 << 8))
+#define MAP_LILYCOVE_CITY_CONTEST_LOBBY             (4 | (13 << 8))
+#define MAP_LILYCOVE_CITY_CONTEST_HALL              (5 | (13 << 8))
+#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F         (6 | (13 << 8))
+#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F         (7 | (13 << 8))
+#define MAP_LILYCOVE_CITY_UNUSED_MART               (8 | (13 << 8))
+#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB  (9 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HARBOR                    (10 | (13 << 8))
+#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE       (11 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE1                    (12 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE2                    (13 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE3                    (14 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE4                    (15 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F       (16 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F       (17 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F       (18 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F       (19 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F       (20 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP  (21 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8))
+
+// Map Group 14
+#define MAP_MOSSDEEP_CITY_GYM               (0 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE1            (1 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE2            (2 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_MART              (5 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE3            (6 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE     (7 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE4            (8 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F   (9 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F   (10 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F    (11 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F   (12 | (14 << 8))
+
+// Map Group 15
+#define MAP_SOOTOPOLIS_CITY_GYM_1F                   (0 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_GYM_B1F                  (1 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F        (2 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F        (3 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MART                     (4 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE1                   (5 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE2                   (6 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE3                   (7 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE4                   (8 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE5                   (9 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE6                   (10 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE7                   (11 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE   (12 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F  (13 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8))
+
+// Map Group 16
+#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM      (0 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM      (1 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM      (2 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM       (3 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM    (4 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL1             (5 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL2             (6 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL3             (7 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL4             (8 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL5             (9 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME      (11 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8))
+
+// Map Group 17
+#define MAP_ROUTE104_MR_BRINEYS_HOUSE         (0 | (17 << 8))
+#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8))
+
+// Map Group 18
+#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8))
+#define MAP_ROUTE111_OLD_LADYS_REST_STOP     (1 | (18 << 8))
+
+// Map Group 19
+#define MAP_ROUTE112_CABLE_CAR_STATION   (0 | (19 << 8))
+#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8))
+
+// Map Group 20
+#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE  (0 | (20 << 8))
+#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8))
+#define MAP_ROUTE114_LANETTES_HOUSE        (2 | (20 << 8))
+
+// Map Group 21
+#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8))
+
+// Map Group 22
+#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8))
+
+// Map Group 23
+#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8))
+
+// Map Group 24
+#define MAP_METEOR_FALLS_1F_1R                       (0 | (24 << 8))
+#define MAP_METEOR_FALLS_1F_2R                       (1 | (24 << 8))
+#define MAP_METEOR_FALLS_B1F_1R                      (2 | (24 << 8))
+#define MAP_METEOR_FALLS_B1F_2R                      (3 | (24 << 8))
+#define MAP_RUSTURF_TUNNEL                           (4 | (24 << 8))
+#define MAP_UNDERWATER_SOOTOPOLIS_CITY               (5 | (24 << 8))
+#define MAP_DESERT_RUINS                             (6 | (24 << 8))
+#define MAP_GRANITE_CAVE_1F                          (7 | (24 << 8))
+#define MAP_GRANITE_CAVE_B1F                         (8 | (24 << 8))
+#define MAP_GRANITE_CAVE_B2F                         (9 | (24 << 8))
+#define MAP_GRANITE_CAVE_STEVENS_ROOM                (10 | (24 << 8))
+#define MAP_PETALBURG_WOODS                          (11 | (24 << 8))
+#define MAP_MT_CHIMNEY                               (12 | (24 << 8))
+#define MAP_JAGGED_PASS                              (13 | (24 << 8))
+#define MAP_FIERY_PATH                               (14 | (24 << 8))
+#define MAP_MT_PYRE_1F                               (15 | (24 << 8))
+#define MAP_MT_PYRE_2F                               (16 | (24 << 8))
+#define MAP_MT_PYRE_3F                               (17 | (24 << 8))
+#define MAP_MT_PYRE_4F                               (18 | (24 << 8))
+#define MAP_MT_PYRE_5F                               (19 | (24 << 8))
+#define MAP_MT_PYRE_6F                               (20 | (24 << 8))
+#define MAP_MT_PYRE_EXTERIOR                         (21 | (24 << 8))
+#define MAP_MT_PYRE_SUMMIT                           (22 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_1F                          (23 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_B1F                         (24 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_B2F                         (25 | (24 << 8))
+#define MAP_UNDERWATER_SEAFLOOR_CAVERN               (26 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ENTRANCE                 (27 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM1                    (28 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM2                    (29 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM3                    (30 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM4                    (31 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM5                    (32 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM6                    (33 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM7                    (34 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM8                    (35 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM9                    (36 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_ENTRANCE                  (37 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_1F                        (38 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_B1F                       (42 | (24 << 8))
+#define MAP_VICTORY_ROAD_1F                          (43 | (24 << 8))
+#define MAP_VICTORY_ROAD_B1F                         (44 | (24 << 8))
+#define MAP_VICTORY_ROAD_B2F                         (45 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM        (46 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM           (47 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM          (48 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM           (49 | (24 << 8))
+#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM       (50 | (24 << 8))
+#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM          (51 | (24 << 8))
+#define MAP_NEW_MAUVILLE_ENTRANCE                    (52 | (24 << 8))
+#define MAP_NEW_MAUVILLE_INSIDE                      (53 | (24 << 8))
+#define MAP_ABANDONED_SHIP_DECK                      (54 | (24 << 8))
+#define MAP_ABANDONED_SHIP_CORRIDORS_1F              (55 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS_1F                  (56 | (24 << 8))
+#define MAP_ABANDONED_SHIP_CORRIDORS_B1F             (57 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS_B1F                 (58 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS2_B1F                (59 | (24 << 8))
+#define MAP_ABANDONED_SHIP_UNDERWATER1               (60 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOM_B1F                  (61 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS2_1F                 (62 | (24 << 8))
+#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE           (63 | (24 << 8))
+#define MAP_ABANDONED_SHIP_UNDERWATER2               (64 | (24 << 8))
+#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS    (65 | (24 << 8))
+#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS        (66 | (24 << 8))
+#define MAP_ISLAND_CAVE                              (67 | (24 << 8))
+#define MAP_ANCIENT_TOMB                             (68 | (24 << 8))
+#define MAP_UNDERWATER_ROUTE134                      (69 | (24 << 8))
+#define MAP_UNDERWATER_SEALED_CHAMBER                (70 | (24 << 8))
+#define MAP_SEALED_CHAMBER_OUTER_ROOM                (71 | (24 << 8))
+#define MAP_SEALED_CHAMBER_INNER_ROOM                (72 | (24 << 8))
+#define MAP_SCORCHED_SLAB                            (73 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1            (74 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2            (75 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3            (76 | (24 << 8))
+#define MAP_SKY_PILLAR_ENTRANCE                      (77 | (24 << 8))
+#define MAP_SKY_PILLAR_OUTSIDE                       (78 | (24 << 8))
+#define MAP_SKY_PILLAR_1F                            (79 | (24 << 8))
+#define MAP_SKY_PILLAR_2F                            (80 | (24 << 8))
+#define MAP_SKY_PILLAR_3F                            (81 | (24 << 8))
+#define MAP_SKY_PILLAR_4F                            (82 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM             (83 | (24 << 8))
+#define MAP_SKY_PILLAR_5F                            (84 | (24 << 8))
+#define MAP_SKY_PILLAR_TOP                           (85 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_1F                         (86 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_2F_1R                      (87 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_2F_2R                      (88 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_3F_1R                      (89 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_3F_2R                      (90 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_4F                         (91 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_3F_3R                      (92 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_2F_3R                      (93 | (24 << 8))
+#define MAP_MIRAGE_TOWER_1F                          (94 | (24 << 8))
+#define MAP_MIRAGE_TOWER_2F                          (95 | (24 << 8))
+#define MAP_MIRAGE_TOWER_3F                          (96 | (24 << 8))
+#define MAP_MIRAGE_TOWER_4F                          (97 | (24 << 8))
+#define MAP_DESERT_UNDERPASS                         (98 | (24 << 8))
+#define MAP_ARTISAN_CAVE_B1F                         (99 | (24 << 8))
+#define MAP_ARTISAN_CAVE_1F                          (100 | (24 << 8))
+#define MAP_UNDERWATER_MARINE_CAVE                   (101 | (24 << 8))
+#define MAP_MARINE_CAVE_ENTRANCE                     (102 | (24 << 8))
+#define MAP_MARINE_CAVE_END                          (103 | (24 << 8))
+#define MAP_TERRA_CAVE_ENTRANCE                      (104 | (24 << 8))
+#define MAP_TERRA_CAVE_END                           (105 | (24 << 8))
+#define MAP_ALTERING_CAVE                            (106 | (24 << 8))
+#define MAP_METEOR_FALLS_STEVENS_CAVE                (107 | (24 << 8))
+
+// Map Group 25
+#define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE1  (1 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE1   (2 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
+#define MAP_SECRET_BASE_TREE1        (4 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB1       (5 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE2    (6 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE2  (7 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE2   (8 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
+#define MAP_SECRET_BASE_TREE2        (10 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB2       (11 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE3    (12 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE3  (13 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE3   (14 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
+#define MAP_SECRET_BASE_TREE3        (16 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB3       (17 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE4    (18 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE4  (19 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE4   (20 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
+#define MAP_SECRET_BASE_TREE4        (22 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB4       (23 | (25 << 8))
+#define MAP_SINGLE_BATTLE_COLOSSEUM  (24 | (25 << 8))
+#define MAP_TRADE_CENTER             (25 | (25 << 8))
+#define MAP_RECORD_CORNER            (26 | (25 << 8))
+#define MAP_DOUBLE_BATTLE_COLOSSEUM  (27 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM1       (28 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_29        (29 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_30        (30 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_31        (31 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_32        (32 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_33        (33 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_34        (34 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM2       (35 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM3       (36 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM4       (37 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM5       (38 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM6       (39 | (25 << 8))
+#define MAP_INSIDE_OF_TRUCK          (40 | (25 << 8))
+#define MAP_SS_TIDAL_CORRIDOR        (41 | (25 << 8))
+#define MAP_SS_TIDAL_LOWER_DECK      (42 | (25 << 8))
+#define MAP_SS_TIDAL_ROOMS           (43 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE01  (44 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE02  (45 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE03  (46 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE04  (47 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE05  (48 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE06  (49 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE07  (50 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE08  (51 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE09  (52 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE10  (53 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE11  (54 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE12  (55 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE13  (56 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE14  (57 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE15  (58 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE16  (59 | (25 << 8))
+#define MAP_UNION_ROOM               (60 | (25 << 8))
+
+// Map Group 26
+#define MAP_SAFARI_ZONE_NORTHWEST                                (0 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTH                                    (1 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHWEST                                (2 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTH                                    (3 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST                         (4 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY                   (5 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR                (6 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR                (7 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM             (8 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_EXTERIOR                             (9 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_INTERIOR                             (10 | (26 << 8))
+#define MAP_SAFARI_ZONE_REST_HOUSE                               (11 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHEAST                                (12 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHEAST                                (13 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                         (14 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM       (15 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2               (16 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2            (17 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY                    (18 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR                 (19 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM          (20 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM              (21 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY                  (22 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR               (23 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM            (24 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY                 (25 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE          (26 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP                   (27 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY                   (28 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR                (29 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM             (30 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY                 (31 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM       (32 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM           (33 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY                    (34 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR                 (35 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM          (36 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1             (37 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2             (38 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3             (39 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_RANKING_HALL                         (40 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE1                              (41 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE2                              (43 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE3                              (44 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE4                              (45 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                         (46 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE5                              (47 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE6                              (48 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE7                              (49 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_RECEPTION_GATE                       (50 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE8                              (51 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE9                              (52 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F                    (53 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F                    (54 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_MART                                 (55 | (26 << 8))
+#define MAP_FARAWAY_ISLAND_ENTRANCE                              (56 | (26 << 8))
+#define MAP_FARAWAY_ISLAND_INTERIOR                              (57 | (26 << 8))
+#define MAP_BIRTH_ISLAND_EXTERIOR                                (58 | (26 << 8))
+#define MAP_BIRTH_ISLAND_HARBOR                                  (59 | (26 << 8))
+#define MAP_TRAINER_HILL_ENTRANCE                                (60 | (26 << 8))
+#define MAP_TRAINER_HILL_1F                                      (61 | (26 << 8))
+#define MAP_TRAINER_HILL_2F                                      (62 | (26 << 8))
+#define MAP_TRAINER_HILL_3F                                      (63 | (26 << 8))
+#define MAP_TRAINER_HILL_4F                                      (64 | (26 << 8))
+#define MAP_TRAINER_HILL_ROOF                                    (65 | (26 << 8))
+#define MAP_NAVEL_ROCK_EXTERIOR                                  (66 | (26 << 8))
+#define MAP_NAVEL_ROCK_HARBOR                                    (67 | (26 << 8))
+#define MAP_NAVEL_ROCK_ENTRANCE                                  (68 | (26 << 8))
+#define MAP_NAVEL_ROCK_B1F                                       (69 | (26 << 8))
+#define MAP_NAVEL_ROCK_FORK                                      (70 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP1                                       (71 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP2                                       (72 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP3                                       (73 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP4                                       (74 | (26 << 8))
+#define MAP_NAVEL_ROCK_TOP                                       (75 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN01                                    (76 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN02                                    (77 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN03                                    (78 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN04                                    (79 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN05                                    (80 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN06                                    (81 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN07                                    (82 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN08                                    (83 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN09                                    (84 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN10                                    (85 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN11                                    (86 | (26 << 8))
+#define MAP_NAVEL_ROCK_BOTTOM                                    (87 | (26 << 8))
+#define MAP_TRAINER_HILL_ELEVATOR                                (88 | (26 << 8))
+
+// Map Group 27
+#define MAP_ROUTE104_PROTOTYPE                          (0 | (27 << 8))
+#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8))
+
+// Map Group 28
+#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8))
+
+// Map Group 29
+#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE                (0 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_END                     (1 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR                (2 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1                 (3 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2                 (4 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3                 (5 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4                 (6 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5                 (7 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6                 (8 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7                 (9 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8                 (10 | (29 << 8))
+#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8))
+#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8))
+
+// Map Group 30
+#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
+
+// Map Group 31
+#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8))
+
+// Map Group 32
+#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8))
+#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8))
+#define MAP_ROUTE119_HOUSE                (2 | (32 << 8))
+
+// Map Group 33
+#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8))
+
+#define MAP_GROUPS_COUNT 34
+
+#endif // GUARD_CONSTANTS_MAP_GROUPS_H
diff --git a/include/constants/maps.h b/include/constants/maps.h
index c65f373af..e1e2da992 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -1,598 +1,11 @@
 #ifndef GUARD_CONSTANTS_MAPS_H
 #define GUARD_CONSTANTS_MAPS_H
 
-// Map Group 0
-#define MAP_PETALBURG_CITY   (0 | (0 << 8))
-#define MAP_SLATEPORT_CITY   (1 | (0 << 8))
-#define MAP_MAUVILLE_CITY    (2 | (0 << 8))
-#define MAP_RUSTBORO_CITY    (3 | (0 << 8))
-#define MAP_FORTREE_CITY     (4 | (0 << 8))
-#define MAP_LILYCOVE_CITY    (5 | (0 << 8))
-#define MAP_MOSSDEEP_CITY    (6 | (0 << 8))
-#define MAP_SOOTOPOLIS_CITY  (7 | (0 << 8))
-#define MAP_EVER_GRANDE_CITY (8 | (0 << 8))
-#define MAP_LITTLEROOT_TOWN  (9 | (0 << 8))
-#define MAP_OLDALE_TOWN      (10 | (0 << 8))
-#define MAP_DEWFORD_TOWN     (11 | (0 << 8))
-#define MAP_LAVARIDGE_TOWN   (12 | (0 << 8))
-#define MAP_FALLARBOR_TOWN   (13 | (0 << 8))
-#define MAP_VERDANTURF_TOWN  (14 | (0 << 8))
-#define MAP_PACIFIDLOG_TOWN  (15 | (0 << 8))
-#define MAP_ROUTE101         (16 | (0 << 8))
-#define MAP_ROUTE102         (17 | (0 << 8))
-#define MAP_ROUTE103         (18 | (0 << 8))
-#define MAP_ROUTE104         (19 | (0 << 8))
-#define MAP_ROUTE105         (20 | (0 << 8))
-#define MAP_ROUTE106         (21 | (0 << 8))
-#define MAP_ROUTE107         (22 | (0 << 8))
-#define MAP_ROUTE108         (23 | (0 << 8))
-#define MAP_ROUTE109         (24 | (0 << 8))
-#define MAP_ROUTE110         (25 | (0 << 8))
-#define MAP_ROUTE111         (26 | (0 << 8))
-#define MAP_ROUTE112         (27 | (0 << 8))
-#define MAP_ROUTE113         (28 | (0 << 8))
-#define MAP_ROUTE114         (29 | (0 << 8))
-#define MAP_ROUTE115         (30 | (0 << 8))
-#define MAP_ROUTE116         (31 | (0 << 8))
-#define MAP_ROUTE117         (32 | (0 << 8))
-#define MAP_ROUTE118         (33 | (0 << 8))
-#define MAP_ROUTE119         (34 | (0 << 8))
-#define MAP_ROUTE120         (35 | (0 << 8))
-#define MAP_ROUTE121         (36 | (0 << 8))
-#define MAP_ROUTE122         (37 | (0 << 8))
-#define MAP_ROUTE123         (38 | (0 << 8))
-#define MAP_ROUTE124         (39 | (0 << 8))
-#define MAP_ROUTE125         (40 | (0 << 8))
-#define MAP_ROUTE126         (41 | (0 << 8))
-#define MAP_ROUTE127         (42 | (0 << 8))
-#define MAP_ROUTE128         (43 | (0 << 8))
-#define MAP_ROUTE129         (44 | (0 << 8))
-#define MAP_ROUTE130         (45 | (0 << 8))
-#define MAP_ROUTE131         (46 | (0 << 8))
-#define MAP_ROUTE132         (47 | (0 << 8))
-#define MAP_ROUTE133         (48 | (0 << 8))
-#define MAP_ROUTE134         (49 | (0 << 8))
-#define MAP_UNDERWATER1      (50 | (0 << 8))
-#define MAP_UNDERWATER2      (51 | (0 << 8))
-#define MAP_UNDERWATER3      (52 | (0 << 8))
-#define MAP_UNDERWATER4      (53 | (0 << 8))
-#define MAP_UNDERWATER5      (54 | (0 << 8))
-#define MAP_UNDERWATER6      (55 | (0 << 8))
-#define MAP_UNDERWATER7      (56 | (0 << 8))
-
-// Map Group 1
-#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    (0 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F    (1 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F        (2 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F        (3 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8))
-
-// Map Group 2
-#define MAP_OLDALE_TOWN_HOUSE1            (0 | (2 << 8))
-#define MAP_OLDALE_TOWN_HOUSE2            (1 | (2 << 8))
-#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8))
-#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8))
-#define MAP_OLDALE_TOWN_MART              (4 | (2 << 8))
-
-// Map Group 3
-#define MAP_DEWFORD_TOWN_HOUSE1            (0 | (3 << 8))
-#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8))
-#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8))
-#define MAP_DEWFORD_TOWN_GYM               (3 | (3 << 8))
-#define MAP_DEWFORD_TOWN_HALL              (4 | (3 << 8))
-#define MAP_DEWFORD_TOWN_HOUSE2            (5 | (3 << 8))
-
-// Map Group 4
-#define MAP_LAVARIDGE_TOWN_HERB_SHOP         (0 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_GYM_1F            (1 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_GYM_B1F           (2 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_HOUSE             (3 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_MART              (4 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8))
-
-// Map Group 5
-#define MAP_FALLARBOR_TOWN_MART                    (0 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY       (1 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR    (2 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F       (4 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F       (5 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE1                  (6 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE2                  (7 | (5 << 8))
-
-// Map Group 6
-#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY       (0 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR    (1 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_MART                    (3 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F       (4 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F       (5 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE            (6 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_HOUSE                   (8 | (6 << 8))
-
-// Map Group 7
-#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE1            (2 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE2            (3 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE3            (4 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE4            (5 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE5            (6 | (7 << 8))
-
-// Map Group 8
-#define MAP_PETALBURG_CITY_WALLYS_HOUSE      (0 | (8 << 8))
-#define MAP_PETALBURG_CITY_GYM               (1 | (8 << 8))
-#define MAP_PETALBURG_CITY_HOUSE1            (2 | (8 << 8))
-#define MAP_PETALBURG_CITY_HOUSE2            (3 | (8 << 8))
-#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8))
-#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8))
-#define MAP_PETALBURG_CITY_MART              (6 | (8 << 8))
-
-// Map Group 9
-#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F      (0 | (9 << 8))
-#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F      (1 | (9 << 8))
-#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY       (2 | (9 << 8))
-#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR    (3 | (9 << 8))
-#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE1                  (5 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB        (6 | (9 << 8))
-#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F       (7 | (9 << 8))
-#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F       (8 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HARBOR                  (9 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE2                  (10 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F       (11 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F       (12 | (9 << 8))
-#define MAP_SLATEPORT_CITY_MART                    (13 | (9 << 8))
-
-// Map Group 10
-#define MAP_MAUVILLE_CITY_GYM               (0 | (10 << 8))
-#define MAP_MAUVILLE_CITY_BIKE_SHOP         (1 | (10 << 8))
-#define MAP_MAUVILLE_CITY_HOUSE1            (2 | (10 << 8))
-#define MAP_MAUVILLE_CITY_GAME_CORNER       (3 | (10 << 8))
-#define MAP_MAUVILLE_CITY_HOUSE2            (4 | (10 << 8))
-#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8))
-#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8))
-#define MAP_MAUVILLE_CITY_MART              (7 | (10 << 8))
-
-// Map Group 11
-#define MAP_RUSTBORO_CITY_DEVON_CORP_1F     (0 | (11 << 8))
-#define MAP_RUSTBORO_CITY_DEVON_CORP_2F     (1 | (11 << 8))
-#define MAP_RUSTBORO_CITY_DEVON_CORP_3F     (2 | (11 << 8))
-#define MAP_RUSTBORO_CITY_GYM               (3 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL    (4 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8))
-#define MAP_RUSTBORO_CITY_MART              (7 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT1_1F          (8 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT1_2F          (9 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE1            (10 | (11 << 8))
-#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE     (11 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE2            (12 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_1F          (13 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_2F          (14 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_3F          (15 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE3            (16 | (11 << 8))
-
-// Map Group 12
-#define MAP_FORTREE_CITY_HOUSE1            (0 | (12 << 8))
-#define MAP_FORTREE_CITY_GYM               (1 | (12 << 8))
-#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8))
-#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8))
-#define MAP_FORTREE_CITY_MART              (4 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE2            (5 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE3            (6 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE4            (7 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE5            (8 | (12 << 8))
-#define MAP_FORTREE_CITY_DECORATION_SHOP   (9 | (12 << 8))
-
-// Map Group 13
-#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F        (0 | (13 << 8))
-#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F        (1 | (13 << 8))
-#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F        (2 | (13 << 8))
-#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F        (3 | (13 << 8))
-#define MAP_LILYCOVE_CITY_CONTEST_LOBBY             (4 | (13 << 8))
-#define MAP_LILYCOVE_CITY_CONTEST_HALL              (5 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F         (6 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F         (7 | (13 << 8))
-#define MAP_LILYCOVE_CITY_UNUSED_MART               (8 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB  (9 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HARBOR                    (10 | (13 << 8))
-#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE       (11 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE1                    (12 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE2                    (13 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE3                    (14 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE4                    (15 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F       (16 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F       (17 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F       (18 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F       (19 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F       (20 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP  (21 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8))
-
-// Map Group 14
-#define MAP_MOSSDEEP_CITY_GYM               (0 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE1            (1 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE2            (2 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_MART              (5 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE3            (6 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE     (7 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE4            (8 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F   (9 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F   (10 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F    (11 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F   (12 | (14 << 8))
-
-// Map Group 15
-#define MAP_SOOTOPOLIS_CITY_GYM_1F               (0 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_GYM_B1F              (1 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F    (2 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F    (3 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MART                 (4 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE1               (5 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE2               (6 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE3               (7 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE4               (8 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE5               (9 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE6               (10 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE7               (11 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE   (12 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F  (13 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8))
-
-// Map Group 16
-#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM      (0 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM      (1 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM      (2 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM       (3 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM    (4 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL1         (5 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL2         (6 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL3         (7 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL4         (8 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL5         (9 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME      (11 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8))
-
-// Map Group 17
-#define MAP_ROUTE104_MR_BRINEYS_HOUSE         (0 | (17 << 8))
-#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8))
-
-// Map Group 18
-#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8))
-#define MAP_ROUTE111_OLD_LADYS_REST_STOP     (1 | (18 << 8))
-
-// Map Group 19
-#define MAP_ROUTE112_CABLE_CAR_STATION   (0 | (19 << 8))
-#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8))
-
-// Map Group 20
-#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE  (0 | (20 << 8))
-#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8))
-#define MAP_ROUTE114_LANETTES_HOUSE        (2 | (20 << 8))
-
-// Map Group 21
-#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8))
-
-// Map Group 22
-#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8))
-
-// Map Group 23
-#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8))
-
-// Map Group 24
-#define MAP_METEOR_FALLS_1F_1R                    (0 | (24 << 8))
-#define MAP_METEOR_FALLS_1F_2R                    (1 | (24 << 8))
-#define MAP_METEOR_FALLS_B1F_1R                   (2 | (24 << 8))
-#define MAP_METEOR_FALLS_B1F_2R                   (3 | (24 << 8))
-#define MAP_RUSTURF_TUNNEL                        (4 | (24 << 8))
-#define MAP_UNDERWATER_SOOTOPOLIS_CITY            (5 | (24 << 8))
-#define MAP_DESERT_RUINS                          (6 | (24 << 8))
-#define MAP_GRANITE_CAVE_1F                       (7 | (24 << 8))
-#define MAP_GRANITE_CAVE_B1F                      (8 | (24 << 8))
-#define MAP_GRANITE_CAVE_B2F                      (9 | (24 << 8))
-#define MAP_GRANITE_CAVE_STEVENS_ROOM             (10 | (24 << 8))
-#define MAP_PETALBURG_WOODS                       (11 | (24 << 8))
-#define MAP_MT_CHIMNEY                            (12 | (24 << 8))
-#define MAP_JAGGED_PASS                           (13 | (24 << 8))
-#define MAP_FIERY_PATH                            (14 | (24 << 8))
-#define MAP_MT_PYRE_1F                            (15 | (24 << 8))
-#define MAP_MT_PYRE_2F                            (16 | (24 << 8))
-#define MAP_MT_PYRE_3F                            (17 | (24 << 8))
-#define MAP_MT_PYRE_4F                            (18 | (24 << 8))
-#define MAP_MT_PYRE_5F                            (19 | (24 << 8))
-#define MAP_MT_PYRE_6F                            (20 | (24 << 8))
-#define MAP_MT_PYRE_EXTERIOR                      (21 | (24 << 8))
-#define MAP_MT_PYRE_SUMMIT                        (22 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_1F                       (23 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_B1F                      (24 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_B2F                      (25 | (24 << 8))
-#define MAP_UNDERWATER_SEAFLOOR_CAVERN            (26 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ENTRANCE              (27 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM1                 (28 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM2                 (29 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM3                 (30 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM4                 (31 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM5                 (32 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM6                 (33 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM7                 (34 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM8                 (35 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM9                 (36 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_ENTRANCE               (37 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_1F                     (38 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1          (39 | (24 << 8))  //
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2          (40 | (24 << 8))  // Ruby/Sapphire leftovers
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3          (41 | (24 << 8))  //
-#define MAP_CAVE_OF_ORIGIN_B1F                    (42 | (24 << 8))
-#define MAP_VICTORY_ROAD_1F                       (43 | (24 << 8))
-#define MAP_VICTORY_ROAD_B1F                      (44 | (24 << 8))
-#define MAP_VICTORY_ROAD_B2F                      (45 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM     (46 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM        (47 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM       (48 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM        (49 | (24 << 8))
-#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM    (50 | (24 << 8))
-#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM       (51 | (24 << 8))
-#define MAP_NEW_MAUVILLE_ENTRANCE                 (52 | (24 << 8))
-#define MAP_NEW_MAUVILLE_INSIDE                   (53 | (24 << 8))
-#define MAP_ABANDONED_SHIP_DECK                   (54 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CORRIDORS_1F           (55 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS_1F               (56 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CORRIDORS_B1F          (57 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS_B1F              (58 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS2_B1F             (59 | (24 << 8))
-#define MAP_ABANDONED_SHIP_UNDERWATER1            (60 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOM_B1F               (61 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS2_1F              (62 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE        (63 | (24 << 8))
-#define MAP_ABANDONED_SHIP_UNDERWATER2            (64 | (24 << 8))
-#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8))
-#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS     (66 | (24 << 8))
-#define MAP_ISLAND_CAVE                           (67 | (24 << 8))
-#define MAP_ANCIENT_TOMB                          (68 | (24 << 8))
-#define MAP_UNDERWATER_ROUTE134                   (69 | (24 << 8))
-#define MAP_UNDERWATER_SEALED_CHAMBER             (70 | (24 << 8))
-#define MAP_SEALED_CHAMBER_OUTER_ROOM             (71 | (24 << 8))
-#define MAP_SEALED_CHAMBER_INNER_ROOM             (72 | (24 << 8))
-#define MAP_SCORCHED_SLAB                         (73 | (24 << 8))
-#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_1F          (74 | (24 << 8))  //
-#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B1F         (75 | (24 << 8))  // Ruby/Sapphire leftovers
-#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B2F         (76 | (24 << 8))  //
-#define MAP_SKY_PILLAR_ENTRANCE                   (77 | (24 << 8))
-#define MAP_SKY_PILLAR_OUTSIDE                    (78 | (24 << 8))
-#define MAP_SKY_PILLAR_1F                         (79 | (24 << 8))
-#define MAP_SKY_PILLAR_2F                         (80 | (24 << 8))
-#define MAP_SKY_PILLAR_3F                         (81 | (24 << 8))
-#define MAP_SKY_PILLAR_4F                         (82 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM          (83 | (24 << 8))
-#define MAP_SKY_PILLAR_5F                         (84 | (24 << 8))
-#define MAP_SKY_PILLAR_TOP                        (85 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_1F                      (86 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_2F_1R                   (87 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_2F_2R                   (88 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_3F_1R                   (89 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_3F_2R                   (90 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_4F                      (91 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_3F_3R                   (92 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_2F_3R                   (93 | (24 << 8))
-#define MAP_MIRAGE_TOWER_1F                       (94 | (24 << 8))
-#define MAP_MIRAGE_TOWER_2F                       (95 | (24 << 8))
-#define MAP_MIRAGE_TOWER_3F                       (96 | (24 << 8))
-#define MAP_MIRAGE_TOWER_4F                       (97 | (24 << 8))
-#define MAP_DESERT_UNDERPASS                      (98 | (24 << 8))
-#define MAP_ARTISAN_CAVE_B1F                      (99 | (24 << 8))
-#define MAP_ARTISAN_CAVE_1F                       (100 | (24 << 8))
-#define MAP_UNDERWATER_MARINE_CAVE                (101 | (24 << 8))
-#define MAP_MARINE_CAVE_ENTRANCE                  (102 | (24 << 8))
-#define MAP_MARINE_CAVE_END                       (103 | (24 << 8))
-#define MAP_TERRA_CAVE_ENTRANCE                   (104 | (24 << 8))
-#define MAP_TERRA_CAVE_END                        (105 | (24 << 8))
-#define MAP_ALTERING_CAVE                         (106 | (24 << 8))
-#define MAP_METEOR_FALLS_STEVENS_CAVE             (107 | (24 << 8))
-
-// Map Group 25
-#define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE1  (1 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE1   (2 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
-#define MAP_SECRET_BASE_TREE1        (4 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB1       (5 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE2    (6 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE2  (7 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE2   (8 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
-#define MAP_SECRET_BASE_TREE2        (10 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB2       (11 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE3    (12 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE3  (13 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE3   (14 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
-#define MAP_SECRET_BASE_TREE3        (16 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB3       (17 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE4    (18 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE4  (19 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE4   (20 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
-#define MAP_SECRET_BASE_TREE4        (22 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB4       (23 | (25 << 8))
-#define MAP_SINGLE_BATTLE_COLOSSEUM  (24 | (25 << 8))
-#define MAP_TRADE_CENTER             (25 | (25 << 8))
-#define MAP_RECORD_CORNER            (26 | (25 << 8))
-#define MAP_DOUBLE_BATTLE_COLOSSEUM  (27 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM1       (28 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_29        (29 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_30        (30 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_31        (31 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_32        (32 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_33        (33 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_34        (34 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM2       (35 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM3       (36 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM4       (37 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM5       (38 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM6       (39 | (25 << 8))
-#define MAP_INSIDE_OF_TRUCK          (40 | (25 << 8))
-#define MAP_SS_TIDAL_CORRIDOR        (41 | (25 << 8))
-#define MAP_SS_TIDAL_LOWER_DECK      (42 | (25 << 8))
-#define MAP_SS_TIDAL_ROOMS           (43 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE01  (44 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE02  (45 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE03  (46 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE04  (47 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE05  (48 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE06  (49 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE07  (50 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE08  (51 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE09  (52 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE10  (53 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE11  (54 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE12  (55 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE13  (56 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE14  (57 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE15  (58 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE16  (59 | (25 << 8))
-#define MAP_UNION_ROOM               (60 | (25 << 8))
-
-// Map Group 26
-#define MAP_SAFARI_ZONE_NORTHWEST    (0 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTH        (1 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHWEST    (2 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTH        (3 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST     (4 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY       (5 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR    (6 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR    (7 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8))
-#define MAP_SAFARI_ZONE_REST_HOUSE   (11 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTHEAST    (12 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHEAST    (13 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                         (14 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM       (15 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2               (16 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2            (17 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY                    (18 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR                 (19 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM          (20 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM              (21 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY                  (22 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR               (23 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM            (24 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY                 (25 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE          (26 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP                   (27 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY                   (28 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR                (29 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM             (30 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY                 (31 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM       (32 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM           (33 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY                    (34 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR                 (35 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM          (36 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1             (37 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2             (38 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3             (39 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RANKING_HALL                         (40 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE1                              (41 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE2                              (43 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE3                              (44 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE4                              (45 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                         (46 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE5                              (47 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE6                              (48 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE7                              (49 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RECEPTION_GATE                       (50 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE8                              (51 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE9                              (52 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F                    (53 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F                    (54 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_MART                                 (55 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8))
-#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8))
-#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8))
-#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8))
-#define MAP_TRAINER_HILL_1F (61 | (26 << 8))
-#define MAP_TRAINER_HILL_2F (62 | (26 << 8))
-#define MAP_TRAINER_HILL_3F (63 | (26 << 8))
-#define MAP_TRAINER_HILL_4F (64 | (26 << 8))
-#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8))
-#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8))
-#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8))
-#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8))
-#define MAP_NAVEL_ROCK_B1F    (69 | (26 << 8))
-#define MAP_NAVEL_ROCK_FORK   (70 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP1    (71 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP2    (72 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP3    (73 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP4    (74 | (26 << 8))
-#define MAP_NAVEL_ROCK_TOP    (75 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8))
-#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8))
-#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8))
-
-// Map Group 27
-#define MAP_ROUTE104_PROTOTYPE                          (0 | (27 << 8))
-#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8))
-
-// Map Group 28
-#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8))
-
-// Map Group 29
-#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE                (0 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_END                     (1 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR                (2 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1                 (3 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2                 (4 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3                 (5 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4                 (6 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5                 (7 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6                 (8 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7                 (9 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8                 (10 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8))
-
-// Map Group 30
-#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
-
-// Map Group 31
-#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8))
-
-// Map Group 32
-#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8))
-#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8))
-#define MAP_ROUTE119_HOUSE                (2 | (32 << 8))
-
-// Map Group 33
-#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8))
-
-#define MAP_GROUPS_COUNT 34
+#include "map_groups.h"
 
 #define MAP_NONE (0x7F | (0x7F << 8))
 #define MAP_UNDEFINED (0xFF | (0xFF << 8))
 
-
 #define MAP_GROUP(map) (MAP_##map >> 8)
 #define MAP_NUM(map) (MAP_##map & 0xFF)
 
diff --git a/include/contest.h b/include/contest.h
index 73ebb79fa..e4391a327 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -221,22 +221,6 @@ struct ContestPokemon
     /*0x3C*/ u32 otId;  // otId
 }; // wow
 
-extern struct ContestPokemon gContestMons[4];
-extern u8 gContestMonPartyIndex;
-extern u16 gSpecialVar_ContestCategory;
-extern u16 gSpecialVar_ContestRank;
-extern u8 gUnknown_02039F2B;
-extern u8 gNumLinkContestPlayers;
-extern u8 gHighestRibbonRank;
-extern u8 gContestFinalStandings[4];
-extern u8 gContestPlayerMonIndex;
-extern s16 gUnknown_02039F08[4];
-extern s16 gUnknown_02039F10[4];
-extern s16 gUnknown_02039F18[4];
-extern s16 gContestMonConditions[4];
-extern u8 gIsLinkContest;
-extern struct ContestWinner gUnknown_02039F3C;
-
 struct Shared18000
 {
     /*0x18000*/ u8 unk18000;
@@ -260,10 +244,10 @@ struct ContestStruct_field_18
 
 struct Contest
 {
-    /*0x19204*/ u8 playerMoveChoice;
-    /*0x19205*/ u8 turnNumber;
-    /*0x19206*/ u8 unk19206[4];    // seems to only be used by an unref function
-    /*0x1920A*/ u16 unk1920A_0:1;  // Task active flags?
+    /*0x0*/ u8 playerMoveChoice;
+    /*0x1*/ u8 turnNumber;
+    /*0x2*/ u8 unk19206[4];    // seems to only be used by an unref function
+    /*0x6*/ u16 unk1920A_0:1;  // Task active flags?
     u16 unk1920A_1:1;
     u16 unk1920A_2:1;
     u16 unk1920A_3:1;
@@ -271,18 +255,18 @@ struct Contest
     u16 unk1920A_5:1;
     u16 unk1920A_6:1;
     u16 unk1920A_7:1;
-    /*0x1920B*/ u16 unk1920B_0:1;
+    /*0x7*/ u16 unk1920B_0:1;
     u16 unk1920B_1:1;
     u16 unk1920B_2:1;
-    /*0x1920C*/ u8 mainTaskId;
-    /*0x1920D*/ u8 unk1920D[4];
-    /*0x19211*/ u8 unk19211;
-    /*0x19212*/ u8 unk19212;
-    /*0x19213*/ u8 filler19213;
-    /*0x19214*/ u8 unk19214;
-    /*0x19215*/ u8 unk19215;
-    /*0x19216*/ u8 unk19216;    // sprite ID
-    /*0x19217*/ s8 applauseLevel;
+    /*0x8*/ u8 mainTaskId;
+    /*0x9*/ u8 unk1920D[4];
+    /*0xD*/ u8 unk19211;
+    /*0xE*/ u8 unk19212;
+    /*0xF*/ u8 filler19213;
+    /*0x10*/ u8 unk19214;
+    /*0x11*/ u8 unk19215;
+    /*0x12*/ u8 unk19216;    // sprite ID
+    /*0x13*/ s8 applauseLevel;
     /*0x19218*/ u8 unk19218[4];
     /*0x1921C*/ u32 unk1921C;   // saved RNG value?
     u16 unk19220[5][4];  // move history?
@@ -385,9 +369,22 @@ struct UnknownContestStruct4
     u8 unk2_2:1;
 };
 
+struct UnknownContestStruct6
+{
+    s32 unk0;
+    s32 unk4;
+    s32 unk8;
+    s32 unkC;
+};
+
 struct ContestResourcesField1C
 {
-    u8 filler_00[0x40];
+    u16 unk0[5];
+    s16 unkA;
+    u8 unkC;
+    u8 unkD;
+    u8 unkE_1:1;
+    u8 unkE_2:1;
 };
 
 struct ContestResourcesField20
@@ -412,38 +409,64 @@ struct ContestResources
     void * field_3c;
 };
 
-extern struct ContestResources *gContestResources;
-
 #define sContest (*gContestResources->field_0)
 #define sContestantStatus (gContestResources->field_4)
 #define shared192D0 (*gContestResources->field_8)
 #define eContestAI (gContestResources->field_C)
 #define shared19328 (*gContestResources->field_10)
 #define shared19338 (*gContestResources->field_14)
-
 #define shared15800 (gHeap + 0x18000)
+#define shared16800 (gHeap + 0x19000)
 #define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000))
 
-extern u32 gContestRngValue;
+extern struct ContestPokemon gContestMons[4];
+extern s16 gContestMonConditions[4];
+extern s16 gUnknown_02039F08[4];
+extern s16 gUnknown_02039F10[4];
+extern s16 gUnknown_02039F18[4];
+extern u8 gContestFinalStandings[4];
+extern u8 gContestMonPartyIndex;
+extern u8 gContestPlayerMonIndex;
 extern u8 gUnknown_02039F26[4];
+extern u8 gIsLinkContest;
+extern u8 gUnknown_02039F2B;
+extern u16 gSpecialVar_ContestCategory;
+extern u16 gSpecialVar_ContestRank;
+extern u8 gNumLinkContestPlayers;
+extern u8 gHighestRibbonRank;
+extern struct ContestResources *gContestResources;
+extern u8 sContestBgCopyFlags;
+extern struct ContestWinner gUnknown_02039F3C;
+extern u8 gUnknown_02039F5C;
+extern u8 gUnknown_02039F5D;
 
-bool8 IsSpeciesNotUnown(u16 species);
+extern u32 gContestRngValue;
+
+// contest.c
+void ResetLinkContestBoolean(void);
 void LoadContestBgAfterMoveAnim(void);
+void sub_80D7B24(void);
+void sub_80DA8C8(u8 partyIndex);
+void sub_80DAB8C(u8 contestType, u8 rank);
+void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame);
+u8 sub_80DAE0C(struct Pokemon *pkmn);
+void sub_80DB09C(u8 contestCategory);
+bool8 IsSpeciesNotUnown(u16 species);
+bool8 Contest_IsMonsTurnDisabled(u8 a);
+void sub_80DBED4(void);
+void sub_80DCE58(u8 a);
 void SetContestantEffectStringID(u8 a, u8 b);
 void SetContestantEffectStringID2(u8 a, u8 b);
+void SetStartledString(u8 contestant, u8 jam);
 void MakeContestantNervous(u8 p);
-bool8 Contest_IsMonsTurnDisabled(u8 a);
+s8 Contest_GetMoveExcitement(u16 move);
 bool8 sub_80DE1E8(u8 a);
-void SetStartledString(u8 a, u8 b);
-s8 Contest_GetMoveExcitement(u16);
-u8 sub_80DAE0C(struct Pokemon *);
-void sub_80DEDA8(u8);
-void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame);
-void sub_80DB09C(u8 contestCategory);
-void sub_80DCE58(u8);
-void sub_80DFA08(struct ContestPokemon *mon, int language);
-void sub_80DBED4(void);
-u8 sub_80DEFA8(u8, u8);
+void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s32 fontId);
+void ResetContestLinkResults(void);
+bool8 sub_80DEDA8(u8 a);
+u8 sub_80DEFA8(u8 a, u8 b);
+void ClearContestWinnerPicsInContestHall(void);
+void sub_80DFA08(struct ContestPokemon *mon, s32 language);
 
 // contest link
 void sub_81D9DE4(u8 taskId);
@@ -456,5 +479,4 @@ bool8 sub_80FC55C(void);
 bool8 sub_80FC530(u8);
 u8 sub_80F86E0(u8 *);
 
-
 #endif //GUARD_CONTEST_H
diff --git a/include/contest_painting.h b/include/contest_painting.h
index ca03a72b5..c633c50cc 100644
--- a/include/contest_painting.h
+++ b/include/contest_painting.h
@@ -13,7 +13,4 @@ enum
 void sub_812FDA8(int);
 void CB2_ContestPainting(void);
 
-extern u8 gUnknown_02039F5C;
-extern u8 gUnknown_02039F5D;
-
 #endif
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index 339a0774e..e2836c6f6 100644
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -69,38 +69,38 @@ struct ToneData
 
 struct CgbChannel
 {
-    u8 sf;
-    u8 ty;
-    u8 rightVolume;
-    u8 leftVolume;
-    u8 at;
-    u8 de;
-    u8 su;
-    u8 re;
-    u8 ky;
-    u8 ev;
-    u8 eg;
-    u8 ec;
-    u8 echoVolume;
-    u8 echoLength;
-    u8 d1;
-    u8 d2;
-    u8 gt;
-    u8 mk;
-    u8 ve;
-    u8 pr;
-    u8 rp;
-    u8 d3[3];
-    u8 d5;
-    u8 sg;
-    u8 n4;
-    u8 pan;
-    u8 panMask;
-    u8 mo;
-    u8 le;
-    u8 sw;
-    u32 fr;
-    u32 wp;
+    u8 sf; // 0x0
+    u8 ty; // 0x1
+    u8 rightVolume; // 0x2
+    u8 leftVolume; // 0x3
+    u8 at; // 0x4
+    u8 de; // 0x5
+    u8 su; // 0x6
+    u8 re; // 0x7
+    u8 ky; // 0x8
+    u8 ev; // 0x9
+    u8 eg; // 0xA
+    u8 ec; // 0xB
+    u8 echoVolume; // 0xC
+    u8 echoLength; // 0xD
+    u8 d1; // 0xE
+    u8 d2; // 0xF
+    u8 gt; // 0x10
+    u8 mk; // 0x11
+    u8 ve; // 0x12
+    u8 pr; // 0x13
+    u8 rp; // 0x14
+    u8 d3[3]; // 0x15, 0x16, 0x17
+    u8 d5; // 0x18
+    u8 sg; // 0x19
+    u8 n4; // 0x1A
+    u8 pan; // 0x1B
+    u8 panMask; // 0x1C
+    u8 mo; // 0x1D
+    u8 le; // 0x1E
+    u8 sw; // 0x1F
+    u32 fr; // 0x20
+    u32 *wp;
     u32 cp;
     u32 tp;
     u32 pp;
@@ -397,6 +397,7 @@ void m4aSoundMode(u32 mode);
 void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track, u8 a3);
 void CgbSound(void);
 void CgbOscOff(u8);
+void CgbModVol(struct CgbChannel *chan);
 u32 MidiKeyToCgbFreq(u8, u8, u8);
 void DummyFunc(void);
 void MPlayJumpTableCopy(void **mplayJumpTable);
diff --git a/include/global.tv.h b/include/global.tv.h
index 61f014984..aa151a75c 100644
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -521,13 +521,13 @@ struct GabbyAndTyData
     /*2bad*/ u8 battleNum;
     /*2bae*/ u8 battleTookMoreThanOneTurn:1;
     /*2bae*/ u8 playerLostAMon:1;
-    /*2bae*/ u8 playerUsedAnItem:1;
+    /*2bae*/ u8 playerUsedHealingItem:1;
     /*2bae*/ u8 playerThrewABall:1;
     /*2bae*/ u8 onAir:1;
     /*2bae*/ u8 valA_5:3;
     /*2baf*/ u8 battleTookMoreThanOneTurn2:1;
     /*2baf*/ u8 playerLostAMon2:1;
-    /*2baf*/ u8 playerUsedAnItem2:1;
+    /*2baf*/ u8 playerUsedHealingItem2:1;
     /*2baf*/ u8 playerThrewABall2:1;
     /*2baf*/ u8 valB_4:4;
 };
diff --git a/include/graphics.h b/include/graphics.h
index cfe73c6c3..f7eaa394d 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4745,9 +4745,13 @@ extern const u32 gBattleStatMask8_Pal[];
 extern const u32 gUnknown_08D9A88C[];
 extern const u32 gContestMiscGfx[];
 extern const u32 gContestAudienceGfx[];
+extern const u8 gContestApplauseMeterGfx[];
+extern const u8 gContestNextTurnNumbersGfx[];
+extern const u8 gContestNextTurnRandomGfx[];
 extern const u32 gUnknown_08C16FA8[];
 extern const u32 gUnknown_08C16E90[];
 extern const u32 gUnknown_08C17170[];
+extern const u32 gUnknown_08C17980[];
 
 extern const u32 gUnknown_08D95E00[];
 extern const u32 gUnknown_08D960D0[];
diff --git a/include/list_menu.h b/include/list_menu.h
index 84c38306b..ef23688d8 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -101,7 +101,7 @@ extern struct ListMenuTemplate gMultiuseListMenuTemplate;
 s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
 u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
 u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *arg1, u16 scrollOffset, u16 selectedRow);
-s32 ListMenuHandleInputGetItemId(u8 listTaskId);
+s32 ListMenu_ProcessInput(u8 listTaskId);
 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
 void RedrawListMenu(u8 listTaskId);
 void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
diff --git a/include/party_menu.h b/include/party_menu.h
index ae7c414a8..702b4fde1 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -48,6 +48,8 @@ extern MainCallback gPostMenuFieldCallback;
 extern u8 gSelectedOrderFromParty[4];
 extern u8 gUnknown_0203CF00[3];
 
+extern void (*gUnknown_03006328)(u8, TaskFunc);
+
 extern const u16 gTutorMoves[];
 
 void sub_81B0FCC(u8 slot, u8 b);
diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h
index 392e80a6d..93f1b02a5 100755
--- a/include/pokedex_cry_screen.h
+++ b/include/pokedex_cry_screen.h
@@ -10,6 +10,8 @@ struct CryRelatedStruct
     u8 yPos;
 };
 
+extern u8 gDexCryScreenState;
+
 bool8 sub_8145354(struct CryRelatedStruct*, u8);
 void sub_814545C(u8);
 void sub_8145534(u16);
diff --git a/include/text.h b/include/text.h
index d9c7a9a2e..96c5a4507 100644
--- a/include/text.h
+++ b/include/text.h
@@ -13,10 +13,15 @@
 #define CHAR_7              0xA8
 #define CHAR_8              0xA9
 #define CHAR_9              0xAA
+#define CHAR_EXCL_MARK      0xAB
 #define CHAR_QUESTION_MARK  0xAC
 #define CHAR_PERIOD         0xAD
 #define CHAR_HYPHEN         0xAE
 #define CHAR_ELLIPSIS       0xB0
+#define CHAR_DBL_QUOT_LEFT  0xB1
+#define CHAR_DBL_QUOT_RIGHT 0xB2
+#define CHAR_SGL_QUOT_LEFT  0xB3
+#define CHAR_SGL_QUOT_RIGHT 0xB4
 #define CHAR_MALE           0xB5
 #define CHAR_FEMALE         0xB6
 #define CHAR_CURRENCY       0xB7
diff --git a/include/trade.h b/include/trade.h
index 95a10cacf..0c95e1e81 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -6,8 +6,11 @@
 // Exported type declarations
 
 // Exported RAM declarations
+extern struct MailStruct gUnknown_020321C0[PARTY_SIZE];
+extern u8 gUnknown_02032298[2];
 
 // Exported ROM declarations
+extern const struct WindowTemplate gUnknown_0833900C;
 
 s32 sub_807A728(void);
 void sub_80773AC(void);
diff --git a/include/tv.h b/include/tv.h
index ea0226815..760d87522 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -56,5 +56,10 @@ void SaveRecordedItemPurchasesForTVShow(void);
 bool8 sub_80EE818(void);
 void sub_80EE8C8(u16 winStreak, u8 facilityAndMode);
 void BravoTrainerPokemonProfile_BeforeInterview2(u8 contestStandingPlace);
+void ContestLiveUpdates_BeforeInterview_1(u8 a0);
+void ContestLiveUpdates_BeforeInterview_2(u8 a0);
+void ContestLiveUpdates_BeforeInterview_3(u8 a0);
+void ContestLiveUpdates_BeforeInterview_4(u16 a0);
+void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1);
 
 #endif //GUARD_TV_H
diff --git a/include/util.h b/include/util.h
index 9d13453c2..56c89359a 100644
--- a/include/util.h
+++ b/include/util.h
@@ -15,5 +15,7 @@ u16 CalcCRC16WithTable(u8 *data, u32 length);
 u32 CalcByteArraySum(const u8* data, u32 length);
 void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
 void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha);
+void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output);
+
 
 #endif // GUARD_UTIL_H
diff --git a/ld_script.txt b/ld_script.txt
index 844c64fb5..306a1f4b0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -27,7 +27,7 @@ SECTIONS {
         INCLUDE "sym_bss.ld"
 
         /* .bss.code starts at 0x3001AA8 */
-        src/m4a_2.o(.bss.code);
+        src/m4a.o(.bss.code);
 
         /* COMMON starts at 0x30022A8 */
         INCLUDE "sym_common.ld"
@@ -136,7 +136,6 @@ SECTIONS {
         src/battle_anim_80D51AC.o(.text);
         src/item.o(.text);
         src/contest.o(.text);
-        asm/contest.o(.text);
         src/shop.o(.text);
         src/fldeff_escalator.o(.text);
         src/berry.o(.text);
@@ -320,9 +319,7 @@ SECTIONS {
     {
         asm/libgcnmultiboot.o(.text);
         asm/m4a_1.o(.text);
-        src/m4a_2.o(.text);
-        asm/m4a_3.o(.text);
-        src/m4a_4.o(.text);
+        src/m4a.o(.text);
         src/agb_flash.o(.text);
         src/agb_flash_1m.o(.text);
         src/agb_flash_mx.o(.text);
@@ -440,14 +437,12 @@ SECTIONS {
         src/start_menu.o(.rodata);
         src/tileset_anims.o(.rodata);
         src/palette.o(.rodata);
-        data/fanfares.o(.rodata);
+        src/sound.o(.rodata);
         src/battle_anim.o(.rodata);
         src/battle_anim_80A5C6C.o(.rodata);
         data/map_events.o(.rodata);
-        data/battle_anim_80A9C70.o(.rodata);
         src/battle_anim_80A9C70.o(.rodata);
         src/title_screen.o(.rodata);
-        data/field_weather.o(.rodata);
         src/field_weather.o(.rodata);
         src/field_weather_effect.o(.rodata);
         src/field_screen_effect.o(.rodata);
diff --git a/map_data_rules.mk b/map_data_rules.mk
new file mode 100755
index 000000000..5a7d9dd84
--- /dev/null
+++ b/map_data_rules.mk
@@ -0,0 +1,31 @@
+# Map JSON data
+
+MAPS_DIR = $(DATA_ASM_SUBDIR)/maps
+LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts
+
+MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/))
+MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS))
+MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS))
+MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS))
+
+$(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc $(MAPS_DIR)/headers.inc $(MAPS_DIR)/groups.inc $(MAPS_DIR)/connections.inc $(MAP_CONNECTIONS) $(MAP_HEADERS)
+	$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
+$(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/events.inc $(MAP_EVENTS)
+	$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
+
+$(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json
+	$(MAPJSON) map emerald $< $(LAYOUTS_DIR)/layouts.json
+$(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ;
+$(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ;
+
+$(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json
+	$(MAPJSON) groups emerald $<
+$(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ;
+$(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ;
+$(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ;
+include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ;
+
+$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json
+	$(MAPJSON) layouts emerald $<
+$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ;
+include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ;
diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c
index 001f99d7f..1271680e0 100644
--- a/src/battle_anim_80A9C70.c
+++ b/src/battle_anim_80A9C70.c
@@ -28,6 +28,182 @@ static void sub_80A9E44(struct Sprite *sprite);
 static void sub_80A9E78(struct Sprite *sprite);
 
 // const rom data
+static const union AnimCmd sSpriteAnim_853EDE4[] =
+{
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(4, 3),
+    ANIMCMD_FRAME(8, 3),
+    ANIMCMD_FRAME(12, 3),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_853EDF8[] =
+{
+    sSpriteAnim_853EDE4
+};
+
+const struct SpriteTemplate gUnknown_0853EDFC =
+{
+    .tileTag = ANIM_TAG_UNUSED_ORB,
+    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .oam = &gUnknown_0852490C,
+    .anims = sSpriteAnimTable_853EDF8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A8AEC,
+};
+
+const struct SpriteTemplate gUnknown_0853EE14 =
+{
+    .tileTag = ANIM_TAG_UNUSED_ORB,
+    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .oam = &gUnknown_0852490C,
+    .anims = sSpriteAnimTable_853EDF8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A8A6C,
+};
+
+static const union AnimCmd sSpriteAnim_853EE2C[] =
+{
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_853EE34[] =
+{
+    sSpriteAnim_853EE2C
+};
+
+const struct SpriteTemplate gUnknown_0853EE38 =
+{
+    .tileTag = ANIM_TAG_WEATHER_BALL,
+    .paletteTag = ANIM_TAG_WEATHER_BALL,
+    .oam = &gUnknown_08524914,
+    .anims = sSpriteAnimTable_853EE34,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A8E30,
+};
+
+const struct SpriteTemplate gUnknown_0853EE50 =
+{
+    .tileTag = ANIM_TAG_WEATHER_BALL,
+    .paletteTag = ANIM_TAG_WEATHER_BALL,
+    .oam = &gUnknown_08524914,
+    .anims = sSpriteAnimTable_853EE34,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A8EE4,
+};
+
+static const union AnimCmd sSpriteAnim_853EE68[] =
+{
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(16, 3),
+    ANIMCMD_FRAME(32, 3),
+    ANIMCMD_FRAME(48, 3),
+    ANIMCMD_FRAME(64, 3),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_853EE80[] =
+{
+    sSpriteAnim_853EE68
+};
+
+const struct SpriteTemplate gUnknown_0853EE84 =
+{
+    .tileTag = ANIM_TAG_SPARKLE_4,
+    .paletteTag = ANIM_TAG_SPARKLE_4,
+    .oam = &gUnknown_08524914,
+    .anims = sSpriteAnimTable_853EE80,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A8B64,
+};
+
+const struct SpriteTemplate gUnknown_0853EE9C =
+{
+    .tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
+    .paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
+    .oam = &gUnknown_08524914,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A8AEC,
+};
+
+static const union AnimCmd sSpriteAnim_853EEB4[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_853EEBC[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_853EEC4[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_853EECC[] =
+{
+    sSpriteAnim_853EEB4,
+    sSpriteAnim_853EEBC,
+    sSpriteAnim_853EEC4
+};
+
+const struct SpriteTemplate gUnknown_0853EED8 =
+{
+    .tileTag = ANIM_TAG_IMPACT,
+    .paletteTag = ANIM_TAG_IMPACT,
+    .oam = &gUnknown_08524914,
+    .anims = sSpriteAnimTable_853EECC,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A8AEC,
+};
+
+static const union AnimCmd sSpriteAnim_853EEF0[] =
+{
+    ANIMCMD_FRAME(0, 15),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_853EEF8[] =
+{
+    sSpriteAnim_853EEF0
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_853EEFC[] =
+{
+    AFFINEANIMCMD_FRAME(96, 96, 0, 0),
+    AFFINEANIMCMD_FRAME(2, 2, 0, 1),
+    AFFINEANIMCMD_JUMP(1)
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] =
+{
+    sSpriteAffineAnim_853EEFC
+};
+
+const struct SpriteTemplate gUnknown_0853EF18 =
+{
+    .tileTag = ANIM_TAG_UNUSED_ORB,
+    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .oam = &gUnknown_085249CC,
+    .anims = sSpriteAnimTable_853EEF8,
+    .images = NULL,
+    .affineAnims = sSpriteAffineAnimTable_853EEF8,
+    .callback = sub_80A8A6C,
+};
+
 static const struct Subsprite gUnknown_0853EF30[] =
 {
     {.x = -16, .y = -16, .shape = ST_OAM_SQUARE,      .size = 3, .tileOffset =   0, .priority = 2},
diff --git a/src/battle_bg.c b/src/battle_bg.c
index a072a2cda..61a914fc9 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -1037,10 +1037,10 @@ void sub_8035D74(u8 taskId)
     case 1:
         palId = AllocSpritePalette(0x2710);
         gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF;
-        gBattleStruct->field_7D = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0);
-        gBattleStruct->field_7E = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0);
-        gSprites[gBattleStruct->field_7D].invisible = TRUE;
-        gSprites[gBattleStruct->field_7E].invisible = TRUE;
+        gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0);
+        gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0);
+        gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = TRUE;
+        gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = TRUE;
         gTasks[taskId].data[0]++;
         break;
     case 2:
@@ -1071,15 +1071,15 @@ void sub_8035D74(u8 taskId)
 
             PlaySE(SE_W231);
             DestroyTask(taskId);
-            gSprites[gBattleStruct->field_7D].invisible = FALSE;
-            gSprites[gBattleStruct->field_7E].invisible = FALSE;
-            gSprites[gBattleStruct->field_7E].oam.tileNum += 0x40;
-            gSprites[gBattleStruct->field_7D].data[0] = 0;
-            gSprites[gBattleStruct->field_7E].data[0] = 1;
-            gSprites[gBattleStruct->field_7D].data[1] = gSprites[gBattleStruct->field_7D].pos1.x;
-            gSprites[gBattleStruct->field_7E].data[1] = gSprites[gBattleStruct->field_7E].pos1.x;
-            gSprites[gBattleStruct->field_7D].data[2] = 0;
-            gSprites[gBattleStruct->field_7E].data[2] = 0;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = FALSE;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = FALSE;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].oam.tileNum += 0x40;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[0] = 0;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[0] = 1;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_V].pos1.x;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_S].pos1.x;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[2] = 0;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[2] = 0;
         }
         break;
     }
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index a6a6ac0f3..70b0a6160 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -696,10 +696,10 @@ static void HandleMoveSwitching(void)
             moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]] = moveInfo->maxPp[gMultiUsePlayerCursor];
             moveInfo->maxPp[gMultiUsePlayerCursor] = i;
 
-            if (gDisableStructs[gActiveBattler].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBattler]])
+            if (gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[gMoveSelectionCursor[gActiveBattler]])
             {
-                gDisableStructs[gActiveBattler].unk18_b &= (~gBitTable[gMoveSelectionCursor[gActiveBattler]]);
-                gDisableStructs[gActiveBattler].unk18_b |= gBitTable[gMultiUsePlayerCursor];
+                gDisableStructs[gActiveBattler].mimickedMoves &= (~gBitTable[gMoveSelectionCursor[gActiveBattler]]);
+                gDisableStructs[gActiveBattler].mimickedMoves |= gBitTable[gMultiUsePlayerCursor];
             }
 
             MoveSelectionDisplayMoveNames();
diff --git a/src/battle_factory.c b/src/battle_factory.c
index 5793c78e9..c025dc139 100644
--- a/src/battle_factory.c
+++ b/src/battle_factory.c
@@ -11,6 +11,7 @@
 #include "constants/species.h"
 #include "constants/battle_ai.h"
 #include "constants/battle_frontier.h"
+#include "constants/layouts.h"
 #include "constants/trainers.h"
 #include "constants/moves.h"
 
@@ -662,7 +663,8 @@ static u8 GetStyleForMove(u16 move)
 
 bool8 sub_81A6BF4(void)
 {
-    return (gMapHeader.mapLayoutId == 347 || gMapHeader.mapLayoutId == 348);
+    return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM
+        || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM;
 }
 
 static void sub_81A6C1C(void)
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 3ceaef983..7c6b74304 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -205,13 +205,13 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
 
             if (Random() % 100 > 49)
             {
-                gProtectStructs[gActiveBattler].flag_x10 = 1;
+                gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
                 return 0;
             }
         }
         else
         {
-            gProtectStructs[gActiveBattler].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
             return 0;
         }
     }
diff --git a/src/battle_intro.c b/src/battle_intro.c
index 21e83ed29..043cf855a 100644
--- a/src/battle_intro.c
+++ b/src/battle_intro.c
@@ -463,10 +463,10 @@ static void BattleIntroSlideLink(u8 taskId)
         if (--gTasks[taskId].data[2] == 0)
         {
             gTasks[taskId].data[0]++;
-            gSprites[gBattleStruct->field_7D].oam.objMode = ST_OAM_OBJ_WINDOW;
-            gSprites[gBattleStruct->field_7D].callback = sub_8038B74;
-            gSprites[gBattleStruct->field_7E].oam.objMode = ST_OAM_OBJ_WINDOW;
-            gSprites[gBattleStruct->field_7E].callback = sub_8038B74;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_V].oam.objMode = ST_OAM_OBJ_WINDOW;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_V].callback = sub_8038B74;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].oam.objMode = ST_OAM_OBJ_WINDOW;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].callback = sub_8038B74;
             SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
             SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2);
         }
diff --git a/src/battle_main.c b/src/battle_main.c
index 1aeaa25ca..043e75808 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -139,7 +139,7 @@ static void HandleAction_ThrowPokeblock(void);
 static void HandleAction_GoNear(void);
 static void HandleAction_SafariZoneRun(void);
 static void HandleAction_WallyBallThrow(void);
-static void HandleAction_Action11(void);
+static void HandleAction_TryFinish(void);
 static void HandleAction_NothingIsFainted(void);
 static void HandleAction_ActionFinished(void);
 
@@ -553,7 +553,7 @@ static void (* const sTurnActionsFuncsTable[])(void) =
     [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
     [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow,
     [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript,
-    [11] = HandleAction_Action11, // not sure about this one
+    [B_ACTION_TRY_FINISH] = HandleAction_TryFinish,
     [B_ACTION_FINISHED] = HandleAction_ActionFinished,
     [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted,
 };
@@ -3196,7 +3196,7 @@ void SwitchInClearSetData(void)
 
     gMoveResultFlags = 0;
     gDisableStructs[gActiveBattler].isFirstTurn = 2;
-    gDisableStructs[gActiveBattler].truantUnknownBit = disableStructCopy.truantUnknownBit;
+    gDisableStructs[gActiveBattler].truantSwitchInHack = disableStructCopy.truantSwitchInHack;
     gLastMoves[gActiveBattler] = 0;
     gLastLandedMoves[gActiveBattler] = 0;
     gLastHitByType[gActiveBattler] = 0;
@@ -5492,7 +5492,7 @@ static void HandleAction_UseMove(void)
 
     // choose battlescript
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-        && gProtectStructs[gBattlerAttacker].flag_x10)
+        && gProtectStructs[gBattlerAttacker].palaceUnableToUseMove)
     {
         if (gBattleMons[gBattlerAttacker].hp == 0)
         {
@@ -5845,7 +5845,7 @@ static void HandleAction_WallyBallThrow(void)
     gActionsByTurnOrder[1] = B_ACTION_FINISHED;
 }
 
-static void HandleAction_Action11(void)
+static void HandleAction_TryFinish(void)
 {
     if (!HandleFaintedMonActions())
     {
diff --git a/src/battle_message.c b/src/battle_message.c
index 7b8085219..164108dec 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -37,8 +37,6 @@ struct BattleWindowText
     u8 shadowColor;
 };
 
-extern u8 gUnknown_0203C7B4;
-
 extern const u8 gTrainerClassNames[][13];
 extern const u16 gUnknown_08D85620[];
 
diff --git a/src/battle_pike.c b/src/battle_pike.c
index c12038efb..bdf6e8027 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -16,6 +16,7 @@
 #include "constants/event_objects.h"
 #include "constants/battle_frontier.h"
 #include "constants/abilities.h"
+#include "constants/layouts.h"
 #include "constants/rgb.h"
 #include "constants/trainers.h"
 #include "constants/species.h"
@@ -1314,8 +1315,10 @@ static void sub_81A8090(void)
 
 bool8 InBattlePike(void)
 {
-    return (gMapHeader.mapLayoutId == 351 || gMapHeader.mapLayoutId == 352
-            || gMapHeader.mapLayoutId == 358 || gMapHeader.mapLayoutId == 359);
+    return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM
+        || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
+        || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3
+        || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC;
 }
 
 static void sub_81A80DC(void)
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index c0ff1ecf5..ed911d8d9 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -30,6 +30,7 @@
 #include "constants/event_objects.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/items.h"
+#include "constants/layouts.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/species.h"
@@ -1380,9 +1381,9 @@ u8 GetPyramidRunMultiplier(void)
 
 u8 InBattlePyramid(void)
 {
-    if (gMapHeader.mapLayoutId == 361)
+    if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
         return 1;
-    else if (gMapHeader.mapLayoutId == 378)
+    else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP)
         return 2;
     else
         return FALSE;
@@ -1390,7 +1391,8 @@ u8 InBattlePyramid(void)
 
 bool8 InBattlePyramid_(void)
 {
-    return (gMapHeader.mapLayoutId == 361 || gMapHeader.mapLayoutId == 378);
+    return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE
+        || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP;
 }
 
 void sub_81A9E90(void)
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 50baf48fd..9bed2ab43 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -853,7 +853,7 @@ static void Task_HandlePyramidBagInput(u8 taskId)
         }
         else
         {
-            s32 listId = ListMenuHandleInputGetItemId(data[0]);
+            s32 listId = ListMenu_ProcessInput(data[0]);
             ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition);
             switch (listId)
             {
@@ -945,9 +945,9 @@ static void HandleFewMenuActionsInput(u8 taskId)
         s32 id = Menu_ProcessInputNoWrap();
         switch (id)
         {
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             break;
-        case -1:
+        case MENU_B_PRESSED:
             PlaySE(SE_SELECT);
             sMenuActions[ACTION_CANCEL].func.void_u8(taskId);
             break;
@@ -1285,7 +1285,7 @@ static void Task_ItemSwapHandleInput(u8 taskId)
         }
         else
         {
-            s32 id = ListMenuHandleInputGetItemId(data[0]);
+            s32 id = ListMenu_ProcessInput(data[0]);
             ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition);
             sub_81C7028(FALSE);
             sub_81C704C(gPyramidBagCursorData.cursorPosition);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 0995eec45..6023b2c1b 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1243,7 +1243,7 @@ static void atk03_ppreduce(void)
             gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 0;
 
         if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)
-            && !((gDisableStructs[gBattlerAttacker].unk18_b) & gBitTable[gCurrMovePos]))
+            && !((gDisableStructs[gBattlerAttacker].mimickedMoves) & gBitTable[gCurrMovePos]))
         {
             gActiveBattler = gBattlerAttacker;
             BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]);
@@ -4233,13 +4233,13 @@ static void atk3D_end(void)
 
     gMoveResultFlags = 0;
     gActiveBattler = 0;
-    gCurrentActionFuncId = 0xB;
+    gCurrentActionFuncId = B_ACTION_TRY_FINISH;
 }
 
 static void atk3E_end2(void)
 {
     gActiveBattler = 0;
-    gCurrentActionFuncId = 0xB;
+    gCurrentActionFuncId = B_ACTION_TRY_FINISH;
 }
 
 static void atk3F_end3(void) // pops the main function stack
@@ -5550,10 +5550,12 @@ static void atk52_switchineffects(void)
     }
     else
     {
-        if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBattler].truantUnknownBit)
+        // There is a hack here to ensure the truant counter will be 0 when the battler's next turn starts.
+        // The truant counter is not updated in the case where a mon switches in after a lost judgement in the battle arena.
+        if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBattler].truantSwitchInHack)
             gDisableStructs[gActiveBattler].truantCounter = 1;
 
-        gDisableStructs[gActiveBattler].truantUnknownBit = 0;
+        gDisableStructs[gActiveBattler].truantSwitchInHack = 0;
 
         if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0)
             && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE))
@@ -5774,7 +5776,7 @@ static void atk5A_yesnoboxlearnmove(void)
 
                     if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId
                         && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED)
-                        && !(gDisableStructs[0].unk18_b & gBitTable[movePosition]))
+                        && !(gDisableStructs[0].mimickedMoves & gBitTable[movePosition]))
                     {
                         RemoveBattleMonPPBonus(&gBattleMons[0], movePosition);
                         SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, movePosition);
@@ -5782,7 +5784,7 @@ static void atk5A_yesnoboxlearnmove(void)
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
                         && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId
                         && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED)
-                        && !(gDisableStructs[2].unk18_b & gBitTable[movePosition]))
+                        && !(gDisableStructs[2].mimickedMoves & gBitTable[movePosition]))
                     {
                         RemoveBattleMonPPBonus(&gBattleMons[2], movePosition);
                         SetBattleMonMoveSlot(&gBattleMons[2], gMoveToLearn, movePosition);
@@ -6694,14 +6696,14 @@ static void atk76_various(void)
         gBattleMons[1].hp = 0;
         gHitMarker |= HITMARKER_FAINTED(1);
         gBattleStruct->arenaLostOpponentMons |= gBitTable[gBattlerPartyIndexes[1]];
-        gDisableStructs[1].truantUnknownBit = 1;
+        gDisableStructs[1].truantSwitchInHack = 1;
         break;
     case VARIOUS_ARENA_PLAYER_MON_LOST:
         gBattleMons[0].hp = 0;
         gHitMarker |= HITMARKER_FAINTED(0);
         gHitMarker |= HITMARKER_x400000;
         gBattleStruct->arenaLostPlayerMons |= gBitTable[gBattlerPartyIndexes[0]];
-        gDisableStructs[0].truantUnknownBit = 1;
+        gDisableStructs[0].truantSwitchInHack = 1;
         break;
     case VARIOUS_ARENA_BOTH_MONS_LOST:
         gBattleMons[0].hp = 0;
@@ -6711,8 +6713,8 @@ static void atk76_various(void)
         gHitMarker |= HITMARKER_x400000;
         gBattleStruct->arenaLostPlayerMons |= gBitTable[gBattlerPartyIndexes[0]];
         gBattleStruct->arenaLostOpponentMons |= gBitTable[gBattlerPartyIndexes[1]];
-        gDisableStructs[0].truantUnknownBit = 1;
-        gDisableStructs[1].truantUnknownBit = 1;
+        gDisableStructs[0].truantSwitchInHack = 1;
+        gDisableStructs[1].truantSwitchInHack = 1;
         break;
     case VARIOUS_EMIT_YESNOBOX:
         BtlController_EmitUnknownYesNoBox(0);
@@ -8021,7 +8023,7 @@ static void atk9B_transformdataexecution(void)
         gDisableStructs[gBattlerAttacker].disabledMove = 0;
         gDisableStructs[gBattlerAttacker].disableTimer = 0;
         gDisableStructs[gBattlerAttacker].transformedMonPersonality = gBattleMons[gBattlerTarget].personality;
-        gDisableStructs[gBattlerAttacker].unk18_b = 0;
+        gDisableStructs[gBattlerAttacker].mimickedMoves = 0;
 
         PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species)
 
@@ -8095,7 +8097,7 @@ static void atk9D_mimicattackcopy(void)
     }
     else
     {
-        s32 i;
+        int i;
 
         for (i = 0; i < MAX_MON_MOVES; i++)
         {
@@ -8114,7 +8116,7 @@ static void atk9D_mimicattackcopy(void)
 
             PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget])
 
-            gDisableStructs[gBattlerAttacker].unk18_b |= gBitTable[gCurrMovePos];
+            gDisableStructs[gBattlerAttacker].mimickedMoves |= gBitTable[gCurrMovePos];
             gBattlescriptCurrInstr += 5;
         }
         else
@@ -8571,7 +8573,7 @@ static void atkAD_tryspiteppreduce(void)
             gBattleMons[gBattlerTarget].pp[i] -= ppToDeduct;
             gActiveBattler = gBattlerTarget;
 
-            if (!(gDisableStructs[gActiveBattler].unk18_b & gBitTable[i])
+            if (!(gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[i])
                 && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
                 BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
diff --git a/src/battle_tent.c b/src/battle_tent.c
index de4d9d374..cb8149253 100644
--- a/src/battle_tent.c
+++ b/src/battle_tent.c
@@ -12,6 +12,7 @@
 #include "frontier_util.h"
 #include "string_util.h"
 #include "constants/items.h"
+#include "constants/layouts.h"
 #include "constants/region_map_sections.h"
 #include "constants/species.h"
 
@@ -270,8 +271,8 @@ static void sub_81B9E88(void)
 
 bool8 sub_81B9E94(void)
 {
-    return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
-            && ((gMapHeader.mapLayoutId == 385) | (gMapHeader.mapLayoutId == 386)));
+    return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
+           && (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM);
 }
 
 static void sub_81B9EC0(void)
diff --git a/src/battle_util.c b/src/battle_util.c
index 5d8e42482..2f583a9c7 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -78,38 +78,38 @@ u8 GetBattlerForBattleScript(u8 caseId)
     return ret;
 }
 
-void PressurePPLose(u8 defender, u8 attacker, u16 move)
+void PressurePPLose(u8 target, u8 attacker, u16 move)
 {
-    s32 i;
+    int moveIndex;
 
-    if (gBattleMons[defender].ability != ABILITY_PRESSURE)
+    if (gBattleMons[target].ability != ABILITY_PRESSURE)
         return;
 
-    for (i = 0; i < MAX_MON_MOVES; i++)
+    for (moveIndex = 0; moveIndex < MAX_MON_MOVES; moveIndex++)
     {
-        if (gBattleMons[attacker].moves[i] == move)
+        if (gBattleMons[attacker].moves[moveIndex] == move)
             break;
     }
 
-    if (i == MAX_MON_MOVES) // mons don't share any moves
+    if (moveIndex == MAX_MON_MOVES)
         return;
 
-    if (gBattleMons[attacker].pp[i] != 0)
-        gBattleMons[attacker].pp[i]--;
+    if (gBattleMons[attacker].pp[moveIndex] != 0)
+        gBattleMons[attacker].pp[moveIndex]--;
 
     if (!(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
-        && !(gDisableStructs[attacker].unk18_b & gBitTable[i]))
+        && !(gDisableStructs[attacker].mimickedMoves & gBitTable[moveIndex]))
     {
         gActiveBattler = attacker;
-        BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
+        BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + moveIndex, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]);
         MarkBattlerForControllerExec(gActiveBattler);
     }
 }
 
 void PressurePPLoseOnUsingImprision(u8 attacker)
 {
-    s32 i, j;
-    s32 imprisionPos = 4;
+    int i, j;
+    int imprisionPos = 4;
     u8 atkSide = GetBattlerSide(attacker);
 
     for (i = 0; i < gBattlersCount; i++)
@@ -132,7 +132,7 @@ void PressurePPLoseOnUsingImprision(u8 attacker)
 
     if (imprisionPos != 4
         && !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
-        && !(gDisableStructs[attacker].unk18_b & gBitTable[imprisionPos]))
+        && !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisionPos]))
     {
         gActiveBattler = attacker;
         BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]);
@@ -142,8 +142,8 @@ void PressurePPLoseOnUsingImprision(u8 attacker)
 
 void PressurePPLoseOnUsingPerishSong(u8 attacker)
 {
-    s32 i, j;
-    s32 perishSongPos = 4;
+    int i, j;
+    int perishSongPos = 4;
 
     for (i = 0; i < gBattlersCount; i++)
     {
@@ -165,7 +165,7 @@ void PressurePPLoseOnUsingPerishSong(u8 attacker)
 
     if (perishSongPos != MAX_MON_MOVES
         && !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
-        && !(gDisableStructs[attacker].unk18_b & gBitTable[perishSongPos]))
+        && !(gDisableStructs[attacker].mimickedMoves & gBitTable[perishSongPos]))
     {
         gActiveBattler = attacker;
         BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]);
@@ -175,7 +175,7 @@ void PressurePPLoseOnUsingPerishSong(u8 attacker)
 
 void MarkAllBattlersForControllerExec(void) // unused
 {
-    s32 i;
+    int i;
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
@@ -314,14 +314,14 @@ u8 TrySetCantSelectMoveBattleScript(void)
     u8 holdEffect;
     u16* choicedMove = &gBattleStruct->choicedMove[gActiveBattler];
 
-    if (gDisableStructs[gActiveBattler].disabledMove == move && move != 0)
+    if (gDisableStructs[gActiveBattler].disabledMove == move && move != MOVE_NONE)
     {
         gBattleScripting.battler = gActiveBattler;
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
             gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace;
-            gProtectStructs[gActiveBattler].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
         }
         else
         {
@@ -336,7 +336,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
             gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace;
-            gProtectStructs[gActiveBattler].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
         }
         else
         {
@@ -351,7 +351,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
             gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace;
-            gProtectStructs[gActiveBattler].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
         }
         else
         {
@@ -366,7 +366,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
             gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace;
-            gProtectStructs[gActiveBattler].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
         }
         else
         {
@@ -388,7 +388,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gLastUsedItem = gBattleMons[gActiveBattler].item;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gProtectStructs[gActiveBattler].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
         }
         else
         {
@@ -401,7 +401,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gProtectStructs[gActiveBattler].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
         }
         else
         {
@@ -3035,7 +3035,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                     MarkBattlerForControllerExec(gActiveBattler);
                     break;
                 case ITEM_PP_CHANGE:
-                    if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[battlerId].unk18_b & gBitTable[i]))
+                    if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[i]))
                         gBattleMons[battlerId].pp[i] = changedPP;
                     break;
                 }
diff --git a/src/cable_club.c b/src/cable_club.c
index ce9b9db05..303b0d016 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -27,12 +27,10 @@
 #include "task.h"
 #include "trade.h"
 #include "trainer_card.h"
+#include "party_menu.h"
 #include "window.h"
 #include "constants/songs.h"
 
-extern u8 gUnknown_02032298[2];
-extern u8 gSelectedOrderFromParty[];
-
 static const struct WindowTemplate gUnknown_08550594 = {
     .bg = 0,
     .tilemapLeft = 16,
diff --git a/src/contest.c b/src/contest.c
index 7decf88fc..cf084e35e 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -21,6 +21,7 @@
 #include "overworld.h"
 #include "palette.h"
 #include "random.h"
+#include "new_game.h"
 #include "script.h"
 #include "sound.h"
 #include "sprite.h"
@@ -42,134 +43,157 @@
 #include "international_string_util.h"
 #include "data2.h"
 #include "constants/rgb.h"
-
-extern void (*gFieldCallback)(void);
-
-void sub_80D782C(void);
-void sub_80D7C7C(u8 taskId);
-void sub_80D7CB4(u8 taskId);
-void sub_80D7DAC(u8 taskId);
-void sub_80D7DC8(u8 taskId);
-void sub_80D7DE8(u8 taskId);
-bool8 sub_80D7E44(u8 *);
-void sub_80D80C8(u8 taskId);
-void sub_80D8108(u8 taskId);
-void vblank_cb_battle(void);
-void sub_80D823C(void);
-void sub_80D833C(u8 taskId);
-void sub_80D8424(u8 taskId);
-void sub_80D8610(u8 taskId);
-void sub_80D8490(u8 taskId);
-void sub_80D880C(s8);
-void sub_80D883C(s8);
-void sub_80D8894(u8 taskId);
-void sub_80D892C(u8 taskId);
-void sub_80D895C(u8 taskId);
-void sub_80D8A04(u8 taskId);
-void sub_80D8A50(u8 taskId);
-void sub_80D8A88(u8 taskId);
-void sub_80D8B38(u8 taskId);
-void sub_80DA110(u8);
-void sub_80DA134(struct Sprite *);
-void sub_80DA164(struct Sprite *);
-void sub_80DA198(u8);
-void sub_80DA25C(u8);
-void sub_80DA28C(u8);
-void sub_80DA31C(u8);
-void sub_80DA348(u8);
-void sub_80DA38C(u8);
-void sub_80DA3CC(u8);
-void sub_80DA464(u8);
-void sub_80DA49C(u8);
-void sub_80DA4CC(u8);
-void sub_80DA51C(u8);
-void sub_80DA5B4(u8);
-void sub_80DA5E8(u8);
-void sub_80DA6B4(u8);
-void sub_80DA700(u8);
-void sub_80DA740(u8);
-void sub_80DA7A0(u8);
-void sub_80DA7EC(u8);
-void sub_80DA830(u8);
-void sub_80DA874(void);
-bool8 sub_80DA8A4(void);
-void sub_80DAF04(u8);
-void sub_80DAF1C(u8 a0, u8 a1);
-void sub_80DAF88(u8);
-void sub_80DAFA0(u8, u8);
-u8 sub_80DB0C4(void);
-u8 sub_80DB120(void);
-u8 sub_80DB174(u16, u32, u32, u32);
-void sub_80DB2BC(void);
-void prints_contest_move_description(u16);
-u16 sub_80DE84C(u16);
-void sub_80DB89C(void);
-u16 sub_80DB8B8(u8);
-void sub_80DB918(void);
-bool8 Contest_IsMonsTurnDisabled(u8);
-void sub_80DBF68(void);
-void sub_80DBF90(void);
-void sub_80DC2BC(void);
-void sub_80DC490(bool8);
-void sub_80DC4F0(void);
-void sub_80DC594(void);
-void sub_80DC5E8(void);
-void sub_80DC7EC(void);
-void sub_80DCD48(void);
-void sub_80DCE58(u8);
-void sub_80DD04C(void);
-void sub_80DD590(void);
-void sub_80DDB0C(void);
-void sub_80DDBE8(void);
-bool8 sub_80DE1E8(u8);
-void sub_80DE224(void);
-void sub_80DE350(void);
-void sub_80DE424(u8);
-void sub_80DE69C(u8);
-void sub_80DEA20(void);
-void Contest_PrintTextToBg0WindowAt(u32, u8 *, s32, u8, u8);
-void Contest_StartTextPrinter(const u8 *, u8);
-void ContestBG_FillBoxWithIncrementingTile(u8, u16, u8, u8, u8, u8, u8, u8);
-bool32 Contest_RunTextPrinters(void);
-void Contest_SetBgCopyFlags(u32);
-void sub_80FC9F8(u8);
-bool8 AreMovesContestCombo(u16, u16);
-void sub_80DBD18(void);
-void sub_80DF250(void);
-void sub_80DF4F8(void);
-void sub_80DD080(u8);
-void sub_80DF080(u8);
-void sub_80DF750(void);
-void sub_80DE9DC(u8);
-void sub_80DCBE8(u8, u8);
-u8 sub_80DC9EC(u8);
-u16 sub_80DE834(u16);
-void sub_80DE864(u8);
-void sub_80DEAA8(u16);
-void sub_80DE9B0(u8);
-void sub_80DC674(u8);
-void sub_80DE12C(void);
-void sub_80DD45C(u8, u8);
-void sub_80DD720(u8);
-void sub_80DE008(bool8);
-void sub_80DC028(s16, s16, u8);
-bool8 sub_80DB5B8(u8, u8);
-bool8 sub_80DB798(u8);
-void sub_80DB884(void);
-void sub_80DC9B4(u8);
-void sub_80DDED0(s8, s8);
-void sub_80DDCDC(s8);
-void sub_80DDE0C(void);
-void sub_80DD940(void);
-void sub_80DB944(void);
-void sub_80DBA18(void);
-void sub_80DC3AC(void);
-bool8 sub_80DC3C4(void);
-void sub_80DF9D4(u8 *);
-void sub_80DF9E0(u8 *, s32);
-void ContestBG_FillBoxWithTile(u8, u16, u8, u8, u8, u8, u8);
-void Contest_PrintTextToBg0WindowStd(u8, const u8 *);
-
+#include "contest_ai.h"
+
+extern void sub_80FC9F8(u8); // contest_link_80FC4F4.c
+
+// This file's functions.
+static void sub_80D782C(void);
+static void sub_80D7C7C(u8 taskId);
+static void sub_80D7CB4(u8 taskId);
+static void sub_80D7DAC(u8 taskId);
+static void sub_80D7DC8(u8 taskId);
+static void sub_80D7DE8(u8 taskId);
+static bool8 sub_80D7E44(u8 *);
+static void sub_80D80C8(u8 taskId);
+static void sub_80D8108(u8 taskId);
+static void vblank_cb_battle(void);
+static void sub_80D823C(void);
+static void sub_80D833C(u8 taskId);
+static void sub_80D8424(u8 taskId);
+static void sub_80D8610(u8 taskId);
+static void sub_80D8490(u8 taskId);
+static void sub_80D880C(s8);
+static void sub_80D883C(s8);
+static void sub_80D8894(u8 taskId);
+static void sub_80D892C(u8 taskId);
+static void sub_80D895C(u8 taskId);
+static void sub_80D8A04(u8 taskId);
+static void sub_80D8A50(u8 taskId);
+static void sub_80D8A88(u8 taskId);
+static void sub_80D8B38(u8 taskId);
+static void sub_80DA110(u8);
+static void sub_80DA134(struct Sprite *);
+static void sub_80DA164(struct Sprite *);
+static void sub_80DA198(u8);
+static void sub_80DA25C(u8);
+static void sub_80DA28C(u8);
+static void sub_80DA31C(u8);
+static void sub_80DA348(u8);
+static void sub_80DA38C(u8);
+static void sub_80DA3CC(u8);
+static void sub_80DA464(u8);
+static void sub_80DA49C(u8);
+static void sub_80DA4CC(u8);
+static void sub_80DA51C(u8);
+static void sub_80DA5B4(u8);
+static void sub_80DA5E8(u8);
+static void sub_80DA6B4(u8);
+static void sub_80DA700(u8);
+static void sub_80DA740(u8);
+static void sub_80DA7A0(u8);
+static void sub_80DA7EC(u8);
+static void sub_80DA830(u8);
+static void sub_80DA874(void);
+static bool8 sub_80DA8A4(void);
+static void sub_80DAF04(u8);
+static void sub_80DAF1C(u8 a0, u8 a1);
+static void sub_80DAF88(u8);
+static void sub_80DAFA0(u8, u8);
+static u8 sub_80DB0C4(void);
+static u8 sub_80DB120(void);
+static u8 sub_80DB174(u16, u32, u32, u32);
+static void prints_contest_move_description(u16);
+static u16 SanitizeSpecies(u16);
+static void sub_80DB89C(void);
+static u16 GetChosenMove(u8);
+static void sub_80DB918(void);
+static void sub_80DBF68(void);
+static void sub_80DBF90(void);
+static void sub_80DC2BC(void);
+static void sub_80DC490(bool8);
+static void sub_80DC4F0(void);
+static void CreateApplauseMeterSprite(void);
+static void sub_80DC5E8(void);
+static void sub_80DC7EC(void);
+static void sub_80DCD48(void);
+static void sub_80DD04C(void);
+static void sub_80DD590(void);
+static void sub_80DDB0C(void);
+static void sub_80DDBE8(void);
+static void sub_80DE224(void);
+static void sub_80DE350(void);
+static void sub_80DE424(u8);
+static void sub_80DE69C(u8);
+static void sub_80DEA20(void);
+static void Contest_StartTextPrinter(const u8 *, u32);
+static void ContestBG_FillBoxWithIncrementingTile(u8, u16, u8, u8, u8, u8, u8, s16);
+static bool32 Contest_RunTextPrinters(void);
+static void Contest_SetBgCopyFlags(u32);
+static void sub_80DBD18(void);
+static void sub_80DD080(u8);
+static void sub_80DE9DC(u8);
+static void sub_80DCBE8(u8, u8);
+static u8 sub_80DC9EC(u8);
+static u16 SanitizeMove(u16);
+static void sub_80DE864(u8);
+static void SelectContestMoveBankTarget(u16);
+static void sub_80DE9B0(u8);
+static void sub_80DC674(u8);
+static void sub_80DE12C(void);
+static void sub_80DD45C(u8, u8);
+static void sub_80DD720(u8);
+static void sub_80DE008(bool8);
+static u8 sub_80DC028(s16, s16, u8);
+static bool8 sub_80DB5B8(u8, u8);
+static bool8 sub_80DB798(u8);
+static void sub_80DB884(void);
+static void sub_80DC9B4(u8);
+static void sub_80DDED0(s8, s8);
+static void sub_80DDCDC(s8);
+static void sub_80DDE0C(void);
+static void sub_80DD940(void);
+static void sub_80DB944(void);
+static void sub_80DBA18(void);
+static void sub_80DC3AC(void);
+static bool8 sub_80DC3C4(void);
+static void ContestBG_FillBoxWithTile(u8, u16, u8, u8, u8, u8, u8);
+static void Contest_PrintTextToBg0WindowStd(u32, const u8 *);
+static s16 sub_80DBD34(u8);
+static void DetermineFinalStandings(void);
+static bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *);
+static void sub_80DC0F4(u8);
+static void sub_80DC408(struct Sprite *);
+static void sub_80DC728(u8);
+static void sub_80DC6A4(u8);
+static void sub_80DC8D0(u8);
+static void sub_80DC81C(u8);
+static void sub_80DC87C(u8);
+static void sub_80DCC84(struct Sprite *);
+static void sub_80DCCD8(struct Sprite *sprite);
+static u8 sub_80DDA20(void);
+static void c3_08130B10(u8);
+static void sub_80DDB6C(u8);
+static void task08_080CD1CC(u8);
+static void sub_80DDD20(u8);
+static void sub_80DDE30(u8);
+static void sub_80DDF80(u8);
+static const u8 *GetTurnOrderNumberGfx(u8);
+static void sub_80DE464(u8);
+static void sub_80DE4A8(u8);
+static void sub_80DE5F4(u8);
+static void sub_80DE65C(u8);
+static void sub_80DE794(u8);
+static void sub_80DEA5C(void);
+static void sub_80DF250(void);
+static void sub_80DF4F8(void);
+static void sub_80DF080(u8);
+static void sub_80DF750(void);
+static void sub_80DF9D4(u8 *);
+static void sub_80DF9E0(u8 *, s32);
+static void sub_80DB2BC(void);
+
+// EWRAM vars.
 EWRAM_DATA struct ContestPokemon gContestMons[4] = {0};
 EWRAM_DATA s16 gContestMonConditions[4] = {0};
 EWRAM_DATA s16 gUnknown_02039F08[4] = {0};
@@ -187,10 +211,13 @@ EWRAM_DATA u16 gSpecialVar_ContestCategory = 0;
 EWRAM_DATA u16 gSpecialVar_ContestRank = 0;
 EWRAM_DATA u8 gNumLinkContestPlayers = 0;
 EWRAM_DATA u8 gHighestRibbonRank = 0;
-EWRAM_DATA struct ContestResources * gContestResources = NULL;
+EWRAM_DATA struct ContestResources *gContestResources = NULL;
 EWRAM_DATA u8 sContestBgCopyFlags = 0;
 EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0};
+EWRAM_DATA u8 gUnknown_02039F5C = 0;
+EWRAM_DATA u8 gUnknown_02039F5D = 0;
 
+// IWRAM common vars.
 u32 gContestRngValue;
 
 extern const u16 gUnknown_08587C30[];
@@ -199,6 +226,7 @@ extern const struct WindowTemplate gUnknown_08587F44[];
 extern const u8 *const gUnknown_08587D90[];
 extern const u8 *const gUnknown_08587F08[];
 extern const u8 *const gUnknown_08587F1C[];
+extern const u8 *const gUnknown_0827E8DA[];
 extern const u8 gText_0827D55A[];
 extern const u8 gText_0827E793[];
 extern const u8 gText_0827E32E[];
@@ -214,6 +242,14 @@ extern const u8 gText_0827E817[];
 extern const u8 gText_0827E58A[];
 extern const u8 gText_0827D56F[];
 extern const u8 gText_0827D597[];
+extern const u8 gText_Contest_Shyness[];
+extern const u8 gText_Contest_Anxiety[];
+extern const u8 gText_Contest_Laziness[];
+extern const u8 gText_Contest_Hesitancy[];
+extern const u8 gText_Contest_Fear[];
+extern const u8 gText_BDot[];
+extern const u8 gText_CDot[];
+extern const u8 *const gUnknown_08587E10[];
 extern const struct ContestPokemon gContestOpponents[96];
 extern const u8 gUnknown_085898A4[96];
 extern const struct CompressedSpriteSheet gUnknown_08587C00;
@@ -224,8 +260,25 @@ extern const struct SpriteTemplate gSpriteTemplate_8587C18;
 extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
 extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const u8 *const gContestEffectDescriptionPointers[];
-
-void TaskDummy1(u8 taskId)
+extern const struct SpriteSheet gUnknown_08587A74;
+extern const u8 gUnknown_08587A6C[];
+extern const struct SpriteTemplate gSpriteTemplate_8587AD0;
+extern const struct SpritePalette gUnknown_08587B08;
+extern const struct CompressedSpriteSheet gUnknown_08587AE8[];
+extern const struct SpriteTemplate gSpriteTemplate_8587B18[];
+extern const u8 gUnknown_08587A70[];
+extern const struct SubspriteTable gSubspriteTables_8587B80[];
+extern const struct CompressedSpriteSheet gUnknown_08587BB0;
+extern const struct SpritePalette gUnknown_08587BB8;
+extern const struct SpriteTemplate gSpriteTemplate_8587BC8;
+extern void (*const gContestEffectFuncs[])(void);
+extern const s8 gContestExcitementTable[][5];
+extern const struct ContestWinner gUnknown_08587FA4[];
+extern const struct CompressedSpriteSheet gUnknown_08589904[];
+extern const struct SpritePalette gUnknown_08589924[];
+extern const struct SpriteTemplate gSpriteTemplate_858998C[];
+
+static void TaskDummy1(u8 taskId)
 {
 }
 
@@ -234,7 +287,7 @@ void ResetLinkContestBoolean(void)
     gIsLinkContest = 0;
 }
 
-void sub_80D7678(void)
+static void sub_80D7678(void)
 {
     u16 savedIme;
 
@@ -278,7 +331,7 @@ void LoadContestBgAfterMoveAnim(void)
     }
 }
 
-void sub_80D779C(void)
+static void sub_80D779C(void)
 {
     s32 i;
 
@@ -291,7 +344,7 @@ void sub_80D779C(void)
     }
 }
 
-void sub_80D77E4(void)
+static void sub_80D77E4(void)
 {
     InitWindows(gUnknown_08587F44);
     DeactivateAllTextPrinters();
@@ -305,7 +358,7 @@ void sub_80D77E4(void)
     }
 }
 
-void sub_80D782C(void)
+static void sub_80D782C(void)
 {
     s32 i;
 
@@ -316,7 +369,7 @@ void sub_80D782C(void)
     FillPalette(RGB(31, 17, 31), 0xF3, 2);
 }
 
-void sub_80D787C(void)
+static void sub_80D787C(void)
 {
     s32 i;
 
@@ -347,10 +400,10 @@ void sub_80D787C(void)
         gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i];
     }
     sub_80DD590();
-    *gContestResources->field_1c = (struct ContestResourcesField1C){};
+    memset(gContestResources->field_1c, 0, sizeof(*gContestResources->field_1c) * 4);
 }
 
-void sub_80D7988(void)
+static void sub_80D7988(void)
 {
     gContestResources = AllocZeroed(sizeof(struct ContestResources));
     gContestResources->field_0 = AllocZeroed(sizeof(struct Contest));
@@ -360,7 +413,7 @@ void sub_80D7988(void)
     gContestResources->field_10 = AllocZeroed(sizeof(struct UnknownContestStruct5) * 4);
     gContestResources->field_14 = AllocZeroed(sizeof(struct UnknownContestStruct4) * 4);
     gContestResources->field_18 = AllocZeroed(sizeof(struct ContestStruct_field_18));
-    gContestResources->field_1c = AllocZeroed(sizeof(struct ContestResourcesField1C));
+    gContestResources->field_1c = AllocZeroed(sizeof(struct ContestResourcesField1C) * 4);
     gContestResources->field_20 = AllocZeroed(sizeof(struct ContestResourcesField20));
     gContestResources->field_24[0] = AllocZeroed(0x1000);
     gContestResources->field_24[1] = AllocZeroed(0x1000);
@@ -373,7 +426,7 @@ void sub_80D7988(void)
     gUnknown_02023060 = gContestResources->field_24[1];
 }
 
-void sub_80D7A5C(void)
+static void sub_80D7A5C(void)
 {
     FREE_AND_SET_NULL(gContestResources->field_0);
     FREE_AND_SET_NULL(gContestResources->field_4);
@@ -400,58 +453,58 @@ void sub_80D7B24(void)
 {
     switch (gMain.state)
     {
-        case 0:
-            sContestBgCopyFlags = 0;
-            sub_80D7988();
-            AllocateMonSpritesGfx();
-            FREE_AND_SET_NULL(gMonSpritesGfxPtr->firstDecompressed);
-            gMonSpritesGfxPtr->firstDecompressed = AllocZeroed(0x4000);
-            SetVBlankCallback(NULL);
-            sub_80D779C();
-            sub_80D77E4();
-            sub_80D7678();
-            ScanlineEffect_Clear();
-            ResetPaletteFade();
-            gPaletteFade.bufferTransferDisabled = TRUE;
-            ResetSpriteData();
-            ResetTasks();
-            FreeAllSpritePalettes();
-            gReservedSpritePaletteCount = 4;
-            //shared18000.unk18000 = 0;
-            gHeap[0x1a000] = 0;
-            ClearBattleMonForms();
-            sub_80D787C();
-            gMain.state++;
-            break;
-        case 1:
+    case 0:
+        sContestBgCopyFlags = 0;
+        sub_80D7988();
+        AllocateMonSpritesGfx();
+        FREE_AND_SET_NULL(gMonSpritesGfxPtr->firstDecompressed);
+        gMonSpritesGfxPtr->firstDecompressed = AllocZeroed(0x4000);
+        SetVBlankCallback(NULL);
+        sub_80D779C();
+        sub_80D77E4();
+        sub_80D7678();
+        ScanlineEffect_Clear();
+        ResetPaletteFade();
+        gPaletteFade.bufferTransferDisabled = TRUE;
+        ResetSpriteData();
+        ResetTasks();
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 4;
+        //shared18000.unk18000 = 0;
+        gHeap[0x1a000] = 0;
+        ClearBattleMonForms();
+        sub_80D787C();
+        gMain.state++;
+        break;
+    case 1:
+        gMain.state++;
+        break;
+    case 2:
+        if (sub_80D7E44(&gContestResources->field_0->unk1925D))
+        {
+            gContestResources->field_0->unk1925D = 0;
             gMain.state++;
-            break;
-        case 2:
-            if (sub_80D7E44(&gContestResources->field_0->unk1925D))
-            {
-                gContestResources->field_0->unk1925D = 0;
-                gMain.state++;
-            }
-            break;
-        case 3:
-            sub_80DE224();
-            gBattle_BG1_X = 0;
-            gBattle_BG1_Y = 0;
-            BeginFastPaletteFade(2);
-            gPaletteFade.bufferTransferDisabled = FALSE;
-            SetVBlankCallback(vblank_cb_battle);
-            gContestResources->field_0->mainTaskId = CreateTask(sub_80D7C7C, 10);
-            SetMainCallback2(sub_80D823C);
-            if (gIsLinkContest & 2)
-            {
-                sub_800E0E8();
-                CreateWirelessStatusIndicatorSprite(8, 8);
-            }
-            break;
+        }
+        break;
+    case 3:
+        sub_80DE224();
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        BeginFastPaletteFade(2);
+        gPaletteFade.bufferTransferDisabled = FALSE;
+        SetVBlankCallback(vblank_cb_battle);
+        gContestResources->field_0->mainTaskId = CreateTask(sub_80D7C7C, 10);
+        SetMainCallback2(sub_80D823C);
+        if (gIsLinkContest & 2)
+        {
+            sub_800E0E8();
+            CreateWirelessStatusIndicatorSprite(8, 8);
+        }
+        break;
     }
 }
 
-void sub_80D7C7C(u8 taskId)
+static void sub_80D7C7C(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -460,7 +513,7 @@ void sub_80D7C7C(u8 taskId)
     }
 }
 
-void sub_80D7CB4(u8 taskId)
+static void sub_80D7CB4(u8 taskId)
 {
     if (gIsLinkContest & 1)
     {
@@ -468,22 +521,22 @@ void sub_80D7CB4(u8 taskId)
         {
             switch (gTasks[taskId].data[0])
             {
-                case 0:
-                    sub_80DBF68();
+            case 0:
+                sub_80DBF68();
+                gTasks[taskId].data[0]++;
+                // fallthrough
+            case 1:
+                if (IsLinkTaskFinished())
+                {
+                    sub_800ADF8();
                     gTasks[taskId].data[0]++;
-                    // fallthrough
-                case 1:
-                    if (IsLinkTaskFinished())
-                    {
-                        sub_800ADF8();
-                        gTasks[taskId].data[0]++;
-                    }
+                }
+                return;
+            case 2:
+                if (IsLinkTaskFinished() != TRUE)
                     return;
-                case 2:
-                    if (IsLinkTaskFinished() != TRUE)
-                        return;
-                    gTasks[taskId].data[0]++;
-                    break;
+                gTasks[taskId].data[0]++;
+                break;
             }
         }
 
@@ -503,18 +556,18 @@ void sub_80D7CB4(u8 taskId)
     }
 }
 
-void sub_80D7DAC(u8 taskId)
+static void sub_80D7DAC(u8 taskId)
 {
     SetTaskFuncWithFollowupFunc(taskId, sub_80FC998, sub_80D7DC8);
 }
 
-void sub_80D7DC8(u8 taskId)
+static void sub_80D7DC8(u8 taskId)
 {
     gTasks[taskId].data[0] = 1;
     gTasks[taskId].func = sub_80D7DE8;
 }
 
-void sub_80D7DE8(u8 taskId)
+static void sub_80D7DE8(u8 taskId)
 {
     gTasks[taskId].data[0]--;
     if (gTasks[taskId].data[0] <= 0)
@@ -526,81 +579,81 @@ void sub_80D7DE8(u8 taskId)
     }
 }
 
-u8 sub_80D7E44(u8 *a)
+static u8 sub_80D7E44(u8 *a)
 {
     u16 sp0[16];
     u16 sp20[16];
 
     switch (*a)
     {
-        case 0:
-            gPaletteFade.bufferTransferDisabled = TRUE;
-            RequestDma3Fill(0, (void *)VRAM, 0x8000, 1);
-            RequestDma3Fill(0, (void *)VRAM + 0x8000, 0x8000, 1);
-            RequestDma3Fill(0, (void *)VRAM + 0x10000, 0x8000, 1);
-            break;
-        case 1:
-            LZDecompressVram(gContestMiscGfx, (void *)VRAM);
-            break;
-        case 2:
-            LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000));
-            DmaCopyLarge32(3, (void *)(VRAM + 0x2000), shared15800, 0x2000, 0x1000);
-            break;
-        case 3:
-            CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0);
-            CopyBgTilemapBufferToVram(3);
-            break;
-        case 4:
-            CopyToBgTilemapBuffer(2, gUnknown_08C17170, 0, 0);
-            CopyBgTilemapBufferToVram(2);
-            DmaCopy32Defvars(3, gContestResources->field_24[2], shared18000.unk18A04, 0x800);
-            break;
-        case 5:
-            LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200);
-            CpuCopy32(gPlttBufferUnfaded + 128, sp0, 16 * sizeof(u16));
-            CpuCopy32(gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, sp20, 16 * sizeof(u16));
-            CpuCopy32(sp20, gPlttBufferUnfaded + 128, 16 * sizeof(u16));
-            CpuCopy32(sp0, gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, 16 * sizeof(u16));
-            DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18004, 0x200);
-            sub_80D782C();
-            break;
-        case 6:
-            sub_80DD04C();
-            sub_80DBF90();
-            sub_80DB2BC();
-            gContestResources->field_0->unk19216 = sub_80DB120();
-            sub_80DC2BC();
-            sub_80DC4F0();
-            sub_80DC594();
-            sub_80DC5E8();
-            sub_80DC7EC();
-            gBattlerPositions[0] = 0;
-            gBattlerPositions[1] = 1;
-            gBattlerPositions[2] = 3;
-            gBattlerPositions[3] = 2;
-            gBattleTypeFlags = 0;
-            gBattlerAttacker = 2;
-            gBattlerTarget = 3;
-            gBattlerSpriteIds[gBattlerAttacker] = sub_80DB0C4();
-            sub_80DEA20();
-            CopyBgTilemapBufferToVram(3);
-            CopyBgTilemapBufferToVram(2);
-            CopyBgTilemapBufferToVram(1);
-            ShowBg(3);
-            ShowBg(2);
-            ShowBg(0);
-            ShowBg(1);
-            break;
-        default:
-            *a = 0;
-            return 1;
+    case 0:
+        gPaletteFade.bufferTransferDisabled = TRUE;
+        RequestDma3Fill(0, (void *)VRAM, 0x8000, 1);
+        RequestDma3Fill(0, (void *)VRAM + 0x8000, 0x8000, 1);
+        RequestDma3Fill(0, (void *)VRAM + 0x10000, 0x8000, 1);
+        break;
+    case 1:
+        LZDecompressVram(gContestMiscGfx, (void *)VRAM);
+        break;
+    case 2:
+        LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000));
+        DmaCopyLarge32(3, (void *)(VRAM + 0x2000), shared15800, 0x2000, 0x1000);
+        break;
+    case 3:
+        CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0);
+        CopyBgTilemapBufferToVram(3);
+        break;
+    case 4:
+        CopyToBgTilemapBuffer(2, gUnknown_08C17170, 0, 0);
+        CopyBgTilemapBufferToVram(2);
+        DmaCopy32Defvars(3, gContestResources->field_24[2], shared18000.unk18A04, 0x800);
+        break;
+    case 5:
+        LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200);
+        CpuCopy32(gPlttBufferUnfaded + 128, sp0, 16 * sizeof(u16));
+        CpuCopy32(gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, sp20, 16 * sizeof(u16));
+        CpuCopy32(sp20, gPlttBufferUnfaded + 128, 16 * sizeof(u16));
+        CpuCopy32(sp0, gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, 16 * sizeof(u16));
+        DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18004, 0x200);
+        sub_80D782C();
+        break;
+    case 6:
+        sub_80DD04C();
+        sub_80DBF90();
+        sub_80DB2BC();
+        gContestResources->field_0->unk19216 = sub_80DB120();
+        sub_80DC2BC();
+        sub_80DC4F0();
+        CreateApplauseMeterSprite();
+        sub_80DC5E8();
+        sub_80DC7EC();
+        gBattlerPositions[0] = 0;
+        gBattlerPositions[1] = 1;
+        gBattlerPositions[2] = 3;
+        gBattlerPositions[3] = 2;
+        gBattleTypeFlags = 0;
+        gBattlerAttacker = 2;
+        gBattlerTarget = 3;
+        gBattlerSpriteIds[gBattlerAttacker] = sub_80DB0C4();
+        sub_80DEA20();
+        CopyBgTilemapBufferToVram(3);
+        CopyBgTilemapBufferToVram(2);
+        CopyBgTilemapBufferToVram(1);
+        ShowBg(3);
+        ShowBg(2);
+        ShowBg(0);
+        ShowBg(1);
+        break;
+    default:
+        *a = 0;
+        return 1;
     }
 
     (*a)++;
     return 0;
 }
 
-void sub_80D80C8(u8 taskId)
+static void sub_80D80C8(u8 taskId)
 {
     gPaletteFade.bufferTransferDisabled = FALSE;
     if (!gPaletteFade.active)
@@ -611,52 +664,51 @@ void sub_80D80C8(u8 taskId)
     }
 }
 
-
-void sub_80D8108(u8 taskId)
+static void sub_80D8108(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
-        case 0:
-            if (gTasks[taskId].data[1]++ <= 60)
-                break;
-            gTasks[taskId].data[1] = 0;
-            PlaySE12WithPanning(SE_C_MAKU_U, 0);
-            gTasks[taskId].data[0]++;
-            break;
-        case 1:
-            (s16)gBattle_BG1_Y += 7;
-            if ((s16)gBattle_BG1_Y <= 160)
-                break;
-            gTasks[taskId].data[0]++;
-            break;
-        case 2:
-            sub_80DE350();
-            gTasks[taskId].data[0]++;
+    case 0:
+        if (gTasks[taskId].data[1]++ <= 60)
             break;
-        case 3:
-        {
-            u16 bg0Cnt = GetGpuReg(REG_OFFSET_BG0CNT);
-            u16 bg2Cnt = GetGpuReg(REG_OFFSET_BG2CNT);
-            ((struct BgCnt *)&bg0Cnt)->priority = 0;
-            ((struct BgCnt *)&bg2Cnt)->priority = 0;
-            SetGpuReg(REG_OFFSET_BG0CNT, bg0Cnt);
-            SetGpuReg(REG_OFFSET_BG2CNT, bg2Cnt);
-            sub_80DDB0C();
-            gTasks[taskId].data[0]++;
+        gTasks[taskId].data[1] = 0;
+        PlaySE12WithPanning(SE_C_MAKU_U, 0);
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        (s16)gBattle_BG1_Y += 7;
+        if ((s16)gBattle_BG1_Y <= 160)
             break;
-        }
-        case 4:
-        default:
-            if (gContestResources->field_0->unk1920A_6)
-                break;
-            gTasks[taskId].data[0] = 0;
-            gTasks[taskId].data[1] = 0;
-            gTasks[taskId].func = sub_80D833C;
+        gTasks[taskId].data[0]++;
+        break;
+    case 2:
+        sub_80DE350();
+        gTasks[taskId].data[0]++;
+        break;
+    case 3:
+    {
+        u16 bg0Cnt = GetGpuReg(REG_OFFSET_BG0CNT);
+        u16 bg2Cnt = GetGpuReg(REG_OFFSET_BG2CNT);
+        ((struct BgCnt *)&bg0Cnt)->priority = 0;
+        ((struct BgCnt *)&bg2Cnt)->priority = 0;
+        SetGpuReg(REG_OFFSET_BG0CNT, bg0Cnt);
+        SetGpuReg(REG_OFFSET_BG2CNT, bg2Cnt);
+        sub_80DDB0C();
+        gTasks[taskId].data[0]++;
+        break;
+    }
+    case 4:
+    default:
+        if (gContestResources->field_0->unk1920A_6)
             break;
+        gTasks[taskId].data[0] = 0;
+        gTasks[taskId].data[1] = 0;
+        gTasks[taskId].func = sub_80D833C;
+        break;
     }
 }
 
-void sub_80D823C(void)
+static void sub_80D823C(void)
 {
     s32 i;
 
@@ -673,7 +725,7 @@ void sub_80D823C(void)
     sContestBgCopyFlags = 0;
 }
 
-void vblank_cb_battle(void)
+static void vblank_cb_battle(void)
 {
     SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_X);
     SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_Y);
@@ -693,7 +745,7 @@ void vblank_cb_battle(void)
     ScanlineEffect_InitHBlankDmaTransfer();
 }
 
-void sub_80D833C(u8 taskId)
+static void sub_80D833C(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
@@ -721,7 +773,7 @@ void sub_80D833C(u8 taskId)
     }
 }
 
-void sub_80D8424(u8 taskId)
+static void sub_80D8424(u8 taskId)
 {
     if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys == B_BUTTON))
     {
@@ -738,7 +790,7 @@ void sub_80D8424(u8 taskId)
     }
 }
 
-void sub_80D8490(u8 taskId)
+static void sub_80D8490(u8 taskId)
 {
     u8 i;
     u8 sp8[32];
@@ -776,7 +828,7 @@ void sub_80D8490(u8 taskId)
     gTasks[taskId].func = sub_80D8610;
 }
 
-void sub_80D8610(u8 taskId)
+static void sub_80D8610(u8 taskId)
 {
     u8 numMoves = 0;
     s32 i;
@@ -796,66 +848,66 @@ void sub_80D8610(u8 taskId)
     {
         switch (gMain.newAndRepeatedKeys)
         {
-            case B_BUTTON:
+        case B_BUTTON:
+            PlaySE(SE_SELECT);
+            sub_80DC490(FALSE);
+            ConvertIntToDecimalStringN(gStringVar1, gContestResources->field_0->turnNumber + 1, STR_CONV_MODE_LEFT_ALIGN, 1);
+            if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex))
+                StringCopy(gDisplayedStringBattle, gText_0827D507);
+            else
+                StringCopy(gDisplayedStringBattle, gText_0827D531);
+            sub_80DB89C();
+            StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
+            Contest_StartTextPrinter(gStringVar4, 0);
+            gBattle_BG0_Y = 0;
+            gBattle_BG2_Y = 0;
+            gTasks[taskId].func = sub_80D8424;
+            break;
+        case DPAD_LEFT:
+        case DPAD_RIGHT:
+            break;
+        case DPAD_UP:
+            sub_80D883C(gContestResources->field_0->playerMoveChoice);
+            if (gContestResources->field_0->playerMoveChoice == 0)
+                gContestResources->field_0->playerMoveChoice = numMoves - 1;
+            else
+                gContestResources->field_0->playerMoveChoice--;
+            sub_80D880C(gContestResources->field_0->playerMoveChoice);
+            prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]);
+            if (numMoves > 1)
                 PlaySE(SE_SELECT);
-                sub_80DC490(FALSE);
-                ConvertIntToDecimalStringN(gStringVar1, gContestResources->field_0->turnNumber + 1, STR_CONV_MODE_LEFT_ALIGN, 1);
-                if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex))
-                    StringCopy(gDisplayedStringBattle, gText_0827D507);
-                else
-                    StringCopy(gDisplayedStringBattle, gText_0827D531);
-                sub_80DB89C();
-                StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
-                Contest_StartTextPrinter(gStringVar4, 0);
-                gBattle_BG0_Y = 0;
-                gBattle_BG2_Y = 0;
-                gTasks[taskId].func = sub_80D8424;
-                break;
-            case DPAD_LEFT:
-            case DPAD_RIGHT:
-                break;
-            case DPAD_UP:
-                sub_80D883C(gContestResources->field_0->playerMoveChoice);
-                if (gContestResources->field_0->playerMoveChoice == 0)
-                    gContestResources->field_0->playerMoveChoice = numMoves - 1;
-                else
-                    gContestResources->field_0->playerMoveChoice--;
-                sub_80D880C(gContestResources->field_0->playerMoveChoice);
-                prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]);
-                if (numMoves > 1)
-                    PlaySE(SE_SELECT);
-                break;
-            case DPAD_DOWN:
-                sub_80D883C(gContestResources->field_0->playerMoveChoice);
-                if (gContestResources->field_0->playerMoveChoice == numMoves - 1)
-                    gContestResources->field_0->playerMoveChoice = 0;
-                else
-                    gContestResources->field_0->playerMoveChoice++;
-                sub_80D880C(gContestResources->field_0->playerMoveChoice);
-                prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]);
-                if (numMoves > 1)
-                    PlaySE(SE_SELECT);
-                break;
+            break;
+        case DPAD_DOWN:
+            sub_80D883C(gContestResources->field_0->playerMoveChoice);
+            if (gContestResources->field_0->playerMoveChoice == numMoves - 1)
+                gContestResources->field_0->playerMoveChoice = 0;
+            else
+                gContestResources->field_0->playerMoveChoice++;
+            sub_80D880C(gContestResources->field_0->playerMoveChoice);
+            prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]);
+            if (numMoves > 1)
+                PlaySE(SE_SELECT);
+            break;
         }
     }
 }
 
-void sub_80D880C(s8 a0)
+static void sub_80D880C(s8 a0)
 {
     ContestBG_FillBoxWithIncrementingTile(2, 55, 0, 31 + a0 * 2, 2, 2, 17, 1);
 }
 
-void sub_80D883C(s8 a0)
+static void sub_80D883C(s8 a0)
 {
     ContestBG_FillBoxWithIncrementingTile(2, 11, 0, 31 + a0 * 2, 2, 1, 17, 1);
     ContestBG_FillBoxWithIncrementingTile(2, 11, 0, 32 + a0 * 2, 2, 1, 17, 1);
 }
 
-void sub_80D8894(u8 taskId)
+static void sub_80D8894(u8 taskId)
 {
     if (gIsLinkContest & 1)
     {
-        u16 var = sub_80DB8B8(gContestPlayerMonIndex);
+        u16 var = GetChosenMove(gContestPlayerMonIndex);
         u8 taskId2;
 
         gContestResources->field_4[gContestPlayerMonIndex].currMove = var;
@@ -872,13 +924,13 @@ void sub_80D8894(u8 taskId)
     }
 }
 
-void sub_80D892C(u8 taskId)
+static void sub_80D892C(u8 taskId)
 {
     DestroyTask(taskId);
     gTasks[gContestResources->field_0->mainTaskId].func = sub_80D895C;
 }
 
-void sub_80D895C(u8 taskId)
+static void sub_80D895C(u8 taskId)
 {
     s32 i;
 
@@ -902,7 +954,7 @@ void sub_80D895C(u8 taskId)
     gTasks[taskId].func = sub_80D8A04;
 }
 
-void sub_80D8A04(u8 taskId)
+static void sub_80D8A04(u8 taskId)
 {
     if (++gTasks[taskId].data[0] > 2)
     {
@@ -916,13 +968,13 @@ void sub_80D8A04(u8 taskId)
     }
 }
 
-void sub_80D8A50(u8 taskId)
+static void sub_80D8A50(u8 taskId)
 {
     if (!gContestResources->field_0->unk1920A_6 && !gContestResources->field_0->unk1920B_1)
         gTasks[taskId].func = sub_80D8A88;
 }
 
-void sub_80D8A88(u8 taskId)
+static void sub_80D8A88(u8 taskId)
 {
     if (++gTasks[taskId].data[0] > 19)
     {
@@ -934,7 +986,7 @@ void sub_80D8A88(u8 taskId)
 
             for (i = 0; i + gNumLinkContestPlayers < 4; i++)
             {
-                gContestResources->field_4[gNumLinkContestPlayers + i].currMove = sub_80DB8B8(gNumLinkContestPlayers + i);
+                gContestResources->field_4[gNumLinkContestPlayers + i].currMove = GetChosenMove(gNumLinkContestPlayers + i);
             }
         }
         gTasks[taskId].data[0] = 0;
@@ -942,7 +994,7 @@ void sub_80D8A88(u8 taskId)
     }
 }
 
-void sub_80D8B38(u8 taskId)
+static void sub_80D8B38(u8 taskId)
 {
     u8 spriteId;
     s32 i;
@@ -951,247 +1003,247 @@ void sub_80D8B38(u8 taskId)
 
     switch (gTasks[taskId].data[0])
     {
-        case 0:
-            sub_80DCD48();
-            for (i = 0; gContestResources->field_0->unk19214 != gContestResources->field_8->turnOrder[i]; i++)
-                ;
-            gContestResources->field_0->unk19215 = i;
-            r6 = gContestResources->field_0->unk19215;
-            if (gIsLinkContest & 1)
-            {
-                u8 taskId2;
+    case 0:
+        sub_80DCD48();
+        for (i = 0; gContestResources->field_0->unk19214 != gContestResources->field_8->turnOrder[i]; i++)
+            ;
+        gContestResources->field_0->unk19215 = i;
+        r6 = gContestResources->field_0->unk19215;
+        if (gIsLinkContest & 1)
+        {
+            u8 taskId2;
 
-                gContestResources->field_0->unk1920B_2 = 1;
-                if (sub_80DA8A4())
-                    sub_80DD080(gContestResources->field_0->unk19215);
-                taskId2 = CreateTask(sub_80FCC88, 0);
-                SetTaskFuncWithFollowupFunc(taskId2, sub_80FCC88, sub_80DA110);
-                sub_80DBF68();
-                gTasks[taskId].data[0] = 1;
-            }
-            else
-            {
+            gContestResources->field_0->unk1920B_2 = 1;
+            if (sub_80DA8A4())
                 sub_80DD080(gContestResources->field_0->unk19215);
-                gTasks[taskId].data[0] = 2;
-            }
-            return;
-        case 1:
-            if (!gContestResources->field_0->unk1920B_2)
-                gTasks[taskId].data[0] = 2;
-            return;
-        case 2:
-            sub_80DF080(r6);
-            sub_80DF750();
-            if (gContestResources->field_4[r6].numTurnsSkipped != 0
-                || gContestResources->field_4[r6].noMoreTurns)
-            {
-                gTasks[taskId].data[0] = 31;
-            }
-            else
-            {
-                sub_80DB89C();
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 3;
-            }
-            return;
-        case 3:
-            for (i = 0; i < 4; i++)
-                gBattleMonForms[i] = 0;
-            memset(gContestResources->field_18, 0, sizeof(*gContestResources->field_18));
-            sub_80DE9DC(gContestResources->field_0->unk19215);
-            spriteId = sub_80DB174(
-                gContestMons[gContestResources->field_0->unk19215].species,
-                gContestMons[gContestResources->field_0->unk19215].otId,
-                gContestMons[gContestResources->field_0->unk19215].personality,
-                gContestResources->field_0->unk19215);
-            gSprites[spriteId].pos2.x = 120;
-            gSprites[spriteId].callback = sub_80DA134;
-            gTasks[taskId].data[2] = spriteId;
-            gBattlerSpriteIds[gBattlerAttacker] = spriteId;
-            sub_80DCBE8(sub_80DC9EC(gContestResources->field_0->unk19215), FALSE);
-            gTasks[taskId].data[0] = 4;
-            return;
-        case 4:
-            spriteId = gTasks[taskId].data[2];
-            if (gSprites[spriteId].callback == SpriteCallbackDummy)
-            {
-                if (!gContestResources->field_14[r6].unk2_1)
-                    gTasks[taskId].data[0] = 5;
-            }
-            return;
-        case 5:
-            if (gContestResources->field_4[r6].nervous)
-            {
-                gTasks[taskId].data[0] = 33;
-            }
+            taskId2 = CreateTask(sub_80FCC88, 0);
+            SetTaskFuncWithFollowupFunc(taskId2, sub_80FCC88, sub_80DA110);
+            sub_80DBF68();
+            gTasks[taskId].data[0] = 1;
+        }
+        else
+        {
+            sub_80DD080(gContestResources->field_0->unk19215);
+            gTasks[taskId].data[0] = 2;
+        }
+        return;
+    case 1:
+        if (!gContestResources->field_0->unk1920B_2)
+            gTasks[taskId].data[0] = 2;
+        return;
+    case 2:
+        sub_80DF080(r6);
+        sub_80DF750();
+        if (gContestResources->field_4[r6].numTurnsSkipped != 0
+            || gContestResources->field_4[r6].noMoreTurns)
+        {
+            gTasks[taskId].data[0] = 31;
+        }
+        else
+        {
+            sub_80DB89C();
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 3;
+        }
+        return;
+    case 3:
+        for (i = 0; i < 4; i++)
+            gBattleMonForms[i] = 0;
+        memset(gContestResources->field_18, 0, sizeof(*gContestResources->field_18));
+        sub_80DE9DC(gContestResources->field_0->unk19215);
+        spriteId = sub_80DB174(
+            gContestMons[gContestResources->field_0->unk19215].species,
+            gContestMons[gContestResources->field_0->unk19215].otId,
+            gContestMons[gContestResources->field_0->unk19215].personality,
+            gContestResources->field_0->unk19215);
+        gSprites[spriteId].pos2.x = 120;
+        gSprites[spriteId].callback = sub_80DA134;
+        gTasks[taskId].data[2] = spriteId;
+        gBattlerSpriteIds[gBattlerAttacker] = spriteId;
+        sub_80DCBE8(sub_80DC9EC(gContestResources->field_0->unk19215), FALSE);
+        gTasks[taskId].data[0] = 4;
+        return;
+    case 4:
+        spriteId = gTasks[taskId].data[2];
+        if (gSprites[spriteId].callback == SpriteCallbackDummy)
+        {
+            if (!gContestResources->field_14[r6].unk2_1)
+                gTasks[taskId].data[0] = 5;
+        }
+        return;
+    case 5:
+        if (gContestResources->field_4[r6].nervous)
+        {
+            gTasks[taskId].data[0] = 33;
+        }
+        else
+        {
+            sub_80DB89C();
+            StringCopy(gStringVar1, gContestMons[r6].nickname);
+            if (gContestResources->field_4[r6].currMove < MOVES_COUNT)
+                StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]);
             else
-            {
-                sub_80DB89C();
-                StringCopy(gStringVar1, gContestMons[r6].nickname);
-                if (gContestResources->field_4[r6].currMove < MOVES_COUNT)
-                    StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]);
-                else
-                    StringCopy(gStringVar2, gUnknown_08587F1C[gContestResources->field_4[r6].moveCategory]);
-                StringExpandPlaceholders(gStringVar4, gText_0827D55A);
-                Contest_StartTextPrinter(gStringVar4, 1);
-                gTasks[taskId].data[0] = 6;
-            }
-            return;
-        case 6:
-            if (!Contest_RunTextPrinters())
-            {
-                gContestResources->field_0->unk1925E = 0;
-                gTasks[taskId].data[0] = 7;
-            }
-            return;
-        case 7:
+                StringCopy(gStringVar2, gUnknown_08587F1C[gContestResources->field_4[r6].moveCategory]);
+            StringExpandPlaceholders(gStringVar4, gText_0827D55A);
+            Contest_StartTextPrinter(gStringVar4, 1);
+            gTasks[taskId].data[0] = 6;
+        }
+        return;
+    case 6:
+        if (!Contest_RunTextPrinters())
+        {
+            gContestResources->field_0->unk1925E = 0;
+            gTasks[taskId].data[0] = 7;
+        }
+        return;
+    case 7:
         {
-            u16 move = sub_80DE834(gContestResources->field_4[gContestResources->field_0->unk19215].currMove);
+            u16 move = SanitizeMove(gContestResources->field_4[gContestResources->field_0->unk19215].currMove);
 
             sub_80DE864(gContestResources->field_0->unk19215);
             sub_80DE9DC(gContestResources->field_0->unk19215);
-            sub_80DEAA8(move);
+            SelectContestMoveBankTarget(move);
             DoMoveAnim(move);
             gTasks[taskId].data[0] = 8;
         }
-            return;
-        case 8:
-            gAnimScriptCallback();
-            if (!gAnimScriptActive)
-            {
-                sub_80DE9B0(r6);
-                if (gContestResources->field_0->unk1925E != 0)
-                {
-                    gTasks[taskId].data[10] = 0;
-                    gTasks[taskId].data[0] = 9;
-                }
-                else
-                {
-                    if (!gContestResources->field_4[r6].hasJudgesAttention)
-                        sub_80DC674(r6);
-                    sub_80DE12C();
-                    gTasks[taskId].data[0] = 23;
-                }
-            }
-            return;
-        case 9:
-            if (gTasks[taskId].data[10]++ > 30)
+        return;
+    case 8:
+        gAnimScriptCallback();
+        if (!gAnimScriptActive)
+        {
+            sub_80DE9B0(r6);
+            if (gContestResources->field_0->unk1925E != 0)
             {
                 gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 7;
+                gTasks[taskId].data[0] = 9;
             }
-            return;
-        case 23:
-            gTasks[taskId].data[1] = 0;
-            if (gContestResources->field_4[r6].effectStringId != CONTEST_STRING_NONE)
+            else
             {
-                sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId);
-                gContestResources->field_4[r6].effectStringId = CONTEST_STRING_NONE;
-                gTasks[taskId].data[0] = 24;
+                if (!gContestResources->field_4[r6].hasJudgesAttention)
+                    sub_80DC674(r6);
+                sub_80DE12C();
+                gTasks[taskId].data[0] = 23;
             }
-            else
+        }
+        return;
+    case 9:
+        if (gTasks[taskId].data[10]++ > 30)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 7;
+        }
+        return;
+    case 23:
+        gTasks[taskId].data[1] = 0;
+        if (gContestResources->field_4[r6].effectStringId != CONTEST_STRING_NONE)
+        {
+            sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId);
+            gContestResources->field_4[r6].effectStringId = CONTEST_STRING_NONE;
+            gTasks[taskId].data[0] = 24;
+        }
+        else
+        {
+            if (gContestResources->field_4[r6].effectStringId2 != CONTEST_STRING_NONE)
             {
-                if (gContestResources->field_4[r6].effectStringId2 != CONTEST_STRING_NONE)
+                for (i = 0; i < 4; i++)
                 {
-                    for (i = 0; i < 4; i++)
-                    {
-                        if (i != r6 && gContestResources->field_4[i].effectStringId != CONTEST_STRING_NONE)
-                            break;
-                    }
-                    if (i == 4)
-                    {
-                        sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId2);
-                        gContestResources->field_4[r6].effectStringId2 = CONTEST_STRING_NONE;
-                        gTasks[taskId].data[0] = 24;
-                    }
-                    else
-                    {
-                        gTasks[taskId].data[0] = 48;
-                    }
+                    if (i != r6 && gContestResources->field_4[i].effectStringId != CONTEST_STRING_NONE)
+                        break;
+                }
+                if (i == 4)
+                {
+                    sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId2);
+                    gContestResources->field_4[r6].effectStringId2 = CONTEST_STRING_NONE;
+                    gTasks[taskId].data[0] = 24;
                 }
                 else
                 {
                     gTasks[taskId].data[0] = 48;
                 }
             }
-            return;
-        case 24:
-            if (!Contest_RunTextPrinters())
-                gTasks[taskId].data[0] = 23;
-            return;
-        case 48:
-            if (gContestResources->field_4[r6].turnOrderModAction == 1)
-            {
-                sub_80DD720(5);
-            }
-            else if (gContestResources->field_4[r6].turnOrderModAction == 2)
-            {
-                sub_80DD720(6);
-            }
-            else if (gContestResources->field_4[r6].turnOrderModAction == 3)
-            {
-                sub_80DD720(7);
-            }
             else
             {
-                gTasks[taskId].data[0] = 47;
-                return;
+                gTasks[taskId].data[0] = 48;
             }
-            gTasks[taskId].data[0] = 49;
-            return;
-        case 49:
-            if (!gContestResources->field_0->unk1920A_4)
-                gTasks[taskId].data[0] = 47;
-            return;
-        case 47:
-            sub_80DE008(TRUE);
-            gTasks[taskId].data[0] = 12;
-            return;
-        case 12:
-            sub_80DC028(0, gContestResources->field_4[r6].appeal2, r6);
-            gTasks[taskId].data[0] = 13;
-            return;
-        case 13:
-            if (!gContestResources->field_14[gContestResources->field_0->unk19215].unk2_2)
-                gTasks[taskId].data[0] = 35;
-            return;
-        case 35:
-            if (gContestResources->field_4[r6].conditionMod == 1)
-                sub_80DD720(8);
-            gTasks[taskId].data[0] = 36;
-            return;
-        case 36:
-            if (!gContestResources->field_0->unk1920A_4)
-                gTasks[taskId].data[0] = 37;
-            return;
-        case 37:
-            if (sub_80DB5B8(r6, 1))
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 38;
-            }
-            else
-            {
-                gTasks[taskId].data[0] = 50;
-            }
-            return;
-        case 38:
-            if (++gTasks[taskId].data[10] > 20)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 50;
-            }
-            return;
-        case 50:
-            if (sub_80DB798(r6))
-                PlaySE(SE_C_PASI);
-            gTasks[taskId].data[0] = 25;
-            return;
-        case 25:
-            gTasks[taskId].data[1] = 0;
-            gTasks[taskId].data[0] = 26;
+        }
+        return;
+    case 24:
+        if (!Contest_RunTextPrinters())
+            gTasks[taskId].data[0] = 23;
+        return;
+    case 48:
+        if (gContestResources->field_4[r6].turnOrderModAction == 1)
+        {
+            sub_80DD720(5);
+        }
+        else if (gContestResources->field_4[r6].turnOrderModAction == 2)
+        {
+            sub_80DD720(6);
+        }
+        else if (gContestResources->field_4[r6].turnOrderModAction == 3)
+        {
+            sub_80DD720(7);
+        }
+        else
+        {
+            gTasks[taskId].data[0] = 47;
             return;
-        case 26:
+        }
+        gTasks[taskId].data[0] = 49;
+        return;
+    case 49:
+        if (!gContestResources->field_0->unk1920A_4)
+            gTasks[taskId].data[0] = 47;
+        return;
+    case 47:
+        sub_80DE008(TRUE);
+        gTasks[taskId].data[0] = 12;
+        return;
+    case 12:
+        sub_80DC028(0, gContestResources->field_4[r6].appeal2, r6);
+        gTasks[taskId].data[0] = 13;
+        return;
+    case 13:
+        if (!gContestResources->field_14[gContestResources->field_0->unk19215].unk2_2)
+            gTasks[taskId].data[0] = 35;
+        return;
+    case 35:
+        if (gContestResources->field_4[r6].conditionMod == 1)
+            sub_80DD720(8);
+        gTasks[taskId].data[0] = 36;
+        return;
+    case 36:
+        if (!gContestResources->field_0->unk1920A_4)
+            gTasks[taskId].data[0] = 37;
+        return;
+    case 37:
+        if (sub_80DB5B8(r6, 1))
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 38;
+        }
+        else
+        {
+            gTasks[taskId].data[0] = 50;
+        }
+        return;
+    case 38:
+        if (++gTasks[taskId].data[10] > 20)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 50;
+        }
+        return;
+    case 50:
+        if (sub_80DB798(r6))
+            PlaySE(SE_C_PASI);
+        gTasks[taskId].data[0] = 25;
+        return;
+    case 25:
+        gTasks[taskId].data[1] = 0;
+        gTasks[taskId].data[0] = 26;
+        return;
+    case 26:
         {
             s32 r2 = 0;
 
@@ -1226,435 +1278,435 @@ void sub_80D8B38(u8 taskId)
                 sub_80DB884();
             }
         }
-            return;
-        case 27:
-            if (!Contest_RunTextPrinters())
-                gTasks[taskId].data[0] = 28;
-            return;
-        case 28:
-            for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++)
-                ;
-            sub_80DC028(gContestResources->field_4[i].appeal2 + gContestResources->field_4[i].jam, -gContestResources->field_4[i].jam, i);
-            gTasks[taskId].data[0] = 29;
-            return;
-        case 29:
-            for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++)
-                ;
-            if (!gContestResources->field_14[i].unk2_2)
-                gTasks[taskId].data[0] = 39;
-            return;
-        case 39:
-            for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++)
-                ;
-            if (sub_80DB5B8(i, 1))
+        return;
+    case 27:
+        if (!Contest_RunTextPrinters())
+            gTasks[taskId].data[0] = 28;
+        return;
+    case 28:
+        for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++)
+            ;
+        sub_80DC028(gContestResources->field_4[i].appeal2 + gContestResources->field_4[i].jam, -gContestResources->field_4[i].jam, i);
+        gTasks[taskId].data[0] = 29;
+        return;
+    case 29:
+        for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++)
+            ;
+        if (!gContestResources->field_14[i].unk2_2)
+            gTasks[taskId].data[0] = 39;
+        return;
+    case 39:
+        for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++)
+            ;
+        if (sub_80DB5B8(i, 1))
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 40;
+        }
+        else
+        {
+            gTasks[taskId].data[0] = 30;
+        }
+        return;
+    case 40:
+        if (++gTasks[taskId].data[10] > 20)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 30;
+        }
+        return;
+    case 30:
+        for (i = 0; i < 4; i++)
+        {
+            if (gUnknown_02039F26[i] == gTasks[taskId].data[1])
+                break;
+        }
+        if (sub_80DB798(i))
+            PlaySE(SE_C_PASI);
+        else
+            PlaySE(SE_C_SYU);
+        if (gContestResources->field_4[i].judgesAttentionWasRemoved)
+        {
+            sub_80DC674(i);
+            gContestResources->field_4[i].judgesAttentionWasRemoved = 0;
+        }
+        gTasks[taskId].data[1]++;
+        gTasks[taskId].data[0] = 26;
+        return;
+    case 51:
+        if (gTasks[taskId].data[10]++ > 9)
+        {
+            gTasks[taskId].data[10] = 0;
+            if (gContestResources->field_4[r6].numTurnsSkipped != 0
+                || gContestResources->field_4[r6].turnSkipped)
             {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 40;
+                sub_80DB89C();
+                StringCopy(gStringVar1, gContestMons[r6].nickname);
+                StringExpandPlaceholders(gStringVar4, gText_0827E793);
+                Contest_StartTextPrinter(gStringVar4, 1);
             }
+            gTasks[taskId].data[0] = 52;
+        }
+        return;
+    case 52:
+        if (!Contest_RunTextPrinters())
+        {
+            if (!gContestResources->field_4[r6].unk15_6)
+                gTasks[taskId].data[0] = 17;
             else
+                gTasks[taskId].data[0] = 14;
+        }
+        return;
+    case 14:
+        r3 = gContestResources->field_4[r6].unk16;
+        if (gContestResources->field_4[r6].unk16 != 0)
+        {
+            sub_80DB89C();
+            if (r3 == 1)
+                Contest_StartTextPrinter(gText_0827E32E, 1);
+            else if (r3 == 2)
+                Contest_StartTextPrinter(gText_0827E35B, 1);
+            else
+                Contest_StartTextPrinter(gText_0827E38D, 1);
+            sub_80DD720(3);
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 45;
+        }
+        else
+        {
+            sub_80DB89C();
+            StringCopy(gStringVar1, gContestMons[r6].nickname);
+            StringExpandPlaceholders(gStringVar4, gText_0827E2FE);
+            Contest_StartTextPrinter(gStringVar4, 1);
+            sub_80DD720(2);
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 45;
+        }
+        return;
+    case 45:
+        if (!gContestResources->field_0->unk1920A_4)
+        {
+            sub_80DC9B4(gContestResources->field_0->unk19215);
+            gTasks[taskId].data[0] = 15;
+        }
+        return;
+    case 15:
+        if (!Contest_RunTextPrinters())
+        {
+            if (++gTasks[taskId].data[10] > 50)
             {
-                gTasks[taskId].data[0] = 30;
-            }
-            return;
-        case 40:
-            if (++gTasks[taskId].data[10] > 20)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 30;
+                if (!gContestResources->field_4[r6].hasJudgesAttention)
+                {
+                    sub_80DC028(
+                        gContestResources->field_4[r6].appeal2,
+                        gContestResources->field_4[r6].unk17,
+                        r6);
+                    gContestResources->field_4[r6].appeal2 += gContestResources->field_4[r6].unk17;
+                }
+                gTasks[taskId].data[0] = 16;
             }
-            return;
-        case 30:
-            for (i = 0; i < 4; i++)
+        }
+        return;
+    case 16:
+        if (!gContestResources->field_14[r6].unk2_2)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 17;
+        }
+        return;
+    case 17:
+        if (gContestResources->field_4[r6].disappointedRepeat)
+        {
+            sub_80DB89C();
+            StringCopy(gStringVar1, gContestMons[r6].nickname);
+            StringExpandPlaceholders(gStringVar4, gText_0827E6E3);
+            Contest_StartTextPrinter(gStringVar4, 1);
+            gTasks[taskId].data[10] = 0;
+            sub_80DD720(0);
+            gTasks[taskId].data[0] = 46;
+        }
+        else
+        {
+            gTasks[taskId].data[0] = 41;
+        }
+        return;
+    case 46:
+        if (!gContestResources->field_0->unk1920A_4)
+            gTasks[taskId].data[0] = 19;
+        return;
+    case 19:
+        if (!Contest_RunTextPrinters())
+        {
+            sub_80DC028(gContestResources->field_4[r6].appeal2, -gContestResources->field_4[r6].unk18, r6);
+            gContestResources->field_4[r6].appeal2 -= gContestResources->field_4[r6].unk18;
+            gTasks[taskId].data[0] = 18;
+        }
+        return;
+    case 18:
+        sub_80DCD48();
+        if (!gContestResources->field_14[r6].unk2_2)
+        {
+            gTasks[taskId].data[10] = 0;
+            sub_80DB89C();
+            gTasks[taskId].data[0] = 41;
+        }
+        return;
+    case 41:
+        if (gContestResources->field_10->excitementFrozen && r6 != gContestResources->field_10->excitementFreezer)
+        {
+            gTasks[taskId].data[0] = 57;
+        }
+        else
+        {
+            r3 = gContestResources->field_10->bits_0;
+            if (gContestResources->field_4[r6].overrideCategoryExcitementMod)
             {
-                if (gUnknown_02039F26[i] == gTasks[taskId].data[1])
-                    break;
+                r3 = 1;
+                StringCopy(gStringVar3, gMoveNames[gContestResources->field_4[r6].currMove]);
             }
-            if (sub_80DB798(i))
-                PlaySE(SE_C_PASI);
             else
-                PlaySE(SE_C_SYU);
-            if (gContestResources->field_4[i].judgesAttentionWasRemoved)
             {
-                sub_80DC674(i);
-                gContestResources->field_4[i].judgesAttentionWasRemoved = 0;
+                StringCopy(gStringVar3, gUnknown_08587F08[gContestMoves[gContestResources->field_4[r6].currMove].contestCategory]);
             }
-            gTasks[taskId].data[1]++;
-            gTasks[taskId].data[0] = 26;
-            return;
-        case 51:
-            if (gTasks[taskId].data[10]++ > 9)
-            {
-                gTasks[taskId].data[10] = 0;
-                if (gContestResources->field_4[r6].numTurnsSkipped != 0
-                    || gContestResources->field_4[r6].turnSkipped)
-                {
-                    sub_80DB89C();
-                    StringCopy(gStringVar1, gContestMons[r6].nickname);
-                    StringExpandPlaceholders(gStringVar4, gText_0827E793);
-                    Contest_StartTextPrinter(gStringVar4, 1);
-                }
-                gTasks[taskId].data[0] = 52;
-            }
-            return;
-        case 52:
-            if (!Contest_RunTextPrinters())
+            if (r3 > 0)
             {
-                if (!gContestResources->field_4[r6].unk15_6)
-                    gTasks[taskId].data[0] = 17;
-                else
-                    gTasks[taskId].data[0] = 14;
+                if (gContestResources->field_4[r6].disappointedRepeat)
+                    r3 = 0;
             }
-            return;
-        case 14:
-            r3 = gContestResources->field_4[r6].unk16;
-            if (gContestResources->field_4[r6].unk16 != 0)
+            sub_80DB89C();
+            StringCopy(gStringVar1, gContestMons[r6].nickname);
+            gContestResources->field_0->applauseLevel += r3;
+            if (gContestResources->field_0->applauseLevel < 0)
+                gContestResources->field_0->applauseLevel = 0;
+            if (r3 == 0)
             {
-                sub_80DB89C();
-                if (r3 == 1)
-                    Contest_StartTextPrinter(gText_0827E32E, 1);
-                else if (r3 == 2)
-                    Contest_StartTextPrinter(gText_0827E35B, 1);
-                else
-                    Contest_StartTextPrinter(gText_0827E38D, 1);
-                sub_80DD720(3);
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 45;
+                gTasks[taskId].data[0] = 55;
             }
             else
             {
-                sub_80DB89C();
-                StringCopy(gStringVar1, gContestMons[r6].nickname);
-                StringExpandPlaceholders(gStringVar4, gText_0827E2FE);
+                if (r3 < 0)
+                    StringExpandPlaceholders(gStringVar4, gText_0827E73C);
+                else if (r3 > 0 && gContestResources->field_0->applauseLevel <= 4)
+                    StringExpandPlaceholders(gStringVar4, gText_0827E717);
+                else
+                    StringExpandPlaceholders(gStringVar4, gText_0827E76A);
                 Contest_StartTextPrinter(gStringVar4, 1);
-                sub_80DD720(2);
                 gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 45;
+                gTasks[taskId].data[11] = 0;
+                if (r3 < 0)
+                    gTasks[taskId].data[0] = 53;
+                else
+                    gTasks[taskId].data[0] = 54;
             }
-            return;
-        case 45:
-            if (!gContestResources->field_0->unk1920A_4)
+        }
+        return;
+    case 53:
+        switch (gTasks[taskId].data[10])
+        {
+        case 0:
+            sub_80DDED0(-1, 1);
+            PlayFanfare(MUS_ME_ZANNEN);
+            gTasks[taskId].data[10]++;
+            break;
+        case 1:
+            if (!gContestResources->field_0->unk1920B_0 && !Contest_RunTextPrinters())
             {
-                sub_80DC9B4(gContestResources->field_0->unk19215);
-                gTasks[taskId].data[0] = 15;
+                sub_80DDCDC(-1);
+                gTasks[taskId].data[10]++;
             }
-            return;
-        case 15:
-            if (!Contest_RunTextPrinters())
+            break;
+        case 2:
+            if (!gContestResources->field_0->unk1920A_5)
             {
-                if (++gTasks[taskId].data[10] > 50)
+                if (gTasks[taskId].data[11]++ > 29)
                 {
-                    if (!gContestResources->field_4[r6].hasJudgesAttention)
-                    {
-                        sub_80DC028(
-                            gContestResources->field_4[r6].appeal2,
-                            gContestResources->field_4[r6].unk17,
-                            r6);
-                        gContestResources->field_4[r6].appeal2 += gContestResources->field_4[r6].unk17;
-                    }
-                    gTasks[taskId].data[0] = 16;
+                    gTasks[taskId].data[11] = 0;
+                    sub_80DDED0(-1, -1);
+                    gTasks[taskId].data[10]++;
                 }
             }
-            return;
-        case 16:
-            if (!gContestResources->field_14[r6].unk2_2)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 17;
-            }
-            return;
-        case 17:
-            if (gContestResources->field_4[r6].disappointedRepeat)
+            break;
+        case 3:
+            if (!gPaletteFade.active)
             {
-                sub_80DB89C();
-                StringCopy(gStringVar1, gContestMons[r6].nickname);
-                StringExpandPlaceholders(gStringVar4, gText_0827E6E3);
-                Contest_StartTextPrinter(gStringVar4, 1);
                 gTasks[taskId].data[10] = 0;
-                sub_80DD720(0);
-                gTasks[taskId].data[0] = 46;
-            }
-            else
-            {
-                gTasks[taskId].data[0] = 41;
+                gTasks[taskId].data[11] = 0;
+                gTasks[taskId].data[0] = 43;
             }
-            return;
-        case 46:
-            if (!gContestResources->field_0->unk1920A_4)
-                gTasks[taskId].data[0] = 19;
-            return;
-        case 19:
+            break;
+        }
+        return;
+    case 54:
+        switch (gTasks[taskId].data[10])
+        {
+        case 0:
             if (!Contest_RunTextPrinters())
             {
-                sub_80DC028(gContestResources->field_4[r6].appeal2, -gContestResources->field_4[r6].unk18, r6);
-                gContestResources->field_4[r6].appeal2 -= gContestResources->field_4[r6].unk18;
-                gTasks[taskId].data[0] = 18;
+                sub_80DDED0(1, 1);
+                gTasks[taskId].data[10]++;
             }
-            return;
-        case 18:
-            sub_80DCD48();
-            if (!gContestResources->field_14[r6].unk2_2)
-            {
-                gTasks[taskId].data[10] = 0;
-                sub_80DB89C();
-                gTasks[taskId].data[0] = 41;
-            }
-            return;
-        case 41:
-            if (gContestResources->field_10->excitementFrozen && r6 != gContestResources->field_10->excitementFreezer)
+            break;
+        case 1:
+            if (!gContestResources->field_0->unk1920B_0)
             {
-                gTasks[taskId].data[0] = 57;
+                sub_80DDE0C();
+                PlaySE(SE_W227B);
+                sub_80DDCDC(1);
+                gTasks[taskId].data[10]++;
             }
-            else
+            break;
+        case 2:
+            if (!gContestResources->field_0->unk1920A_5)
             {
-                r3 = gContestResources->field_10->bits_0;
-                if (gContestResources->field_4[r6].overrideCategoryExcitementMod)
-                {
-                    r3 = 1;
-                    StringCopy(gStringVar3, gMoveNames[gContestResources->field_4[r6].currMove]);
-                }
-                else
-                {
-                    StringCopy(gStringVar3, gUnknown_08587F08[gContestMoves[gContestResources->field_4[r6].currMove].contestCategory]);
-                }
-                if (r3 > 0)
-                {
-                    if (gContestResources->field_4[r6].disappointedRepeat)
-                        r3 = 0;
-                }
-                sub_80DB89C();
-                StringCopy(gStringVar1, gContestMons[r6].nickname);
-                gContestResources->field_0->applauseLevel += r3;
-                if (gContestResources->field_0->applauseLevel < 0)
-                    gContestResources->field_0->applauseLevel = 0;
-                if (r3 == 0)
-                {
-                    gTasks[taskId].data[0] = 55;
-                }
-                else
+                if (gTasks[taskId].data[11]++ > 29)
                 {
-                    if (r3 < 0)
-                        StringExpandPlaceholders(gStringVar4, gText_0827E73C);
-                    else if (r3 > 0 && gContestResources->field_0->applauseLevel <= 4)
-                        StringExpandPlaceholders(gStringVar4, gText_0827E717);
-                    else
-                        StringExpandPlaceholders(gStringVar4, gText_0827E76A);
-                    Contest_StartTextPrinter(gStringVar4, 1);
-                    gTasks[taskId].data[10] = 0;
                     gTasks[taskId].data[11] = 0;
-                    if (r3 < 0)
-                        gTasks[taskId].data[0] = 53;
-                    else
-                        gTasks[taskId].data[0] = 54;
-                }
-            }
-            return;
-        case 53:
-            switch (gTasks[taskId].data[10])
-            {
-                case 0:
-                    sub_80DDED0(-1, 1);
-                    PlayFanfare(MUS_ME_ZANNEN);
+                    sub_80DC028(gContestResources->field_4[r6].appeal2, gContestResources->field_10->unk2, r6);
+                    gContestResources->field_4[r6].appeal2 += gContestResources->field_10->unk2;
                     gTasks[taskId].data[10]++;
-                    break;
-                case 1:
-                    if (!gContestResources->field_0->unk1920B_0 && !Contest_RunTextPrinters())
-                    {
-                        sub_80DDCDC(-1);
-                        gTasks[taskId].data[10]++;
-                    }
-                    break;
-                case 2:
-                    if (!gContestResources->field_0->unk1920A_5)
-                    {
-                        if (gTasks[taskId].data[11]++ > 29)
-                        {
-                            gTasks[taskId].data[11] = 0;
-                            sub_80DDED0(-1, -1);
-                            gTasks[taskId].data[10]++;
-                        }
-                    }
-                    break;
-                case 3:
-                    if (!gPaletteFade.active)
-                    {
-                        gTasks[taskId].data[10] = 0;
-                        gTasks[taskId].data[11] = 0;
-                        gTasks[taskId].data[0] = 43;
-                    }
-                    break;
-            }
-            return;
-        case 54:
-            switch (gTasks[taskId].data[10])
-            {
-                case 0:
-                    if (!Contest_RunTextPrinters())
-                    {
-                        sub_80DDED0(1, 1);
-                        gTasks[taskId].data[10]++;
-                    }
-                    break;
-                case 1:
-                    if (!gContestResources->field_0->unk1920B_0)
-                    {
-                        sub_80DDE0C();
-                        PlaySE(SE_W227B);
-                        sub_80DDCDC(1);
-                        gTasks[taskId].data[10]++;
-                    }
-                    break;
-                case 2:
-                    if (!gContestResources->field_0->unk1920A_5)
-                    {
-                        if (gTasks[taskId].data[11]++ > 29)
-                        {
-                            gTasks[taskId].data[11] = 0;
-                            sub_80DC028(gContestResources->field_4[r6].appeal2, gContestResources->field_10->unk2, r6);
-                            gContestResources->field_4[r6].appeal2 += gContestResources->field_10->unk2;
-                            gTasks[taskId].data[10]++;
-                        }
-                    }
-                    break;
-                case 3:
-                    if (!gContestResources->field_14[r6].unk2_2)
-                    {
-                        if (!gContestResources->field_0->unk1920A_7)
-                        {
-                            sub_80DDED0(1, -1);
-                            gTasks[taskId].data[10]++;
-                        }
-                    }
-                    break;
-                case 4:
-                    if (!gPaletteFade.active)
-                    {
-                        gTasks[taskId].data[10] = 0;
-                        gTasks[taskId].data[11] = 0;
-                        gTasks[taskId].data[0] = 43;
-                    }
-                    break;
+                }
             }
-            return;
-        case 43:
+            break;
+        case 3:
             if (!gContestResources->field_14[r6].unk2_2)
             {
-                sub_80DB89C();
-                gTasks[taskId].data[0] = 55;
-            }
-            return;
-        case 57:
-            sub_80DB89C();
-            StringCopy(gStringVar3, gContestMons[gContestResources->field_10->excitementFreezer].nickname);
-            StringCopy(gStringVar1, gContestMons[r6].nickname);
-            StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]);
-            StringExpandPlaceholders(gStringVar4, gText_0827E7EA);
-            Contest_StartTextPrinter(gStringVar4, 1);
-            gTasks[taskId].data[0] = 58;
-            return;
-        case 58:
-            if (!Contest_RunTextPrinters())
-            {
-                sub_80DB89C();
-                StringExpandPlaceholders(gStringVar4, gText_0827E817);
-                Contest_StartTextPrinter(gStringVar4, 1);
-                gTasks[taskId].data[0] = 59;
-            }
-            return;
-        case 59:
-            if (!Contest_RunTextPrinters())
-            {
-                sub_80DB89C();
-                gTasks[taskId].data[0] = 55;
-            }
-            return;
-        case 33:
-            if (gContestResources->field_4[r6].hasJudgesAttention)
-                gContestResources->field_4[r6].hasJudgesAttention = 0;
-            sub_80DC9B4(r6);
-            StringCopy(gStringVar1, gContestMons[r6].nickname);
-            StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]);
-            StringExpandPlaceholders(gStringVar4, gText_0827E58A);
-            Contest_StartTextPrinter(gStringVar4, 1);
-            gTasks[taskId].data[0] = 34;
-            return;
-        case 34:
-            if (!Contest_RunTextPrinters())
-                gTasks[taskId].data[0] = 55;
-            return;
-        case 55:
-            sub_80DDBE8();
-            gTasks[taskId].data[0] = 56;
-            return;
-        case 56:
-            if (!gContestResources->field_0->unk1920A_6)
-            {
-                if (gContestResources->field_0->applauseLevel > 4)
+                if (!gContestResources->field_0->unk1920A_7)
                 {
-                    gContestResources->field_0->applauseLevel = 0;
-                    sub_80DD940();
+                    sub_80DDED0(1, -1);
+                    gTasks[taskId].data[10]++;
                 }
-                gTasks[taskId].data[0] = 10;
             }
-            return;
-        case 10:
-            spriteId = gTasks[taskId].data[2];
-            gSprites[spriteId].callback = sub_80DA164;
-            gTasks[taskId].data[0] = 11;
-            return;
-        case 11:
-            spriteId = gTasks[taskId].data[2];
-            if (gSprites[spriteId].invisible)
+            break;
+        case 4:
+            if (!gPaletteFade.active)
             {
-                FreeSpriteOamMatrix(&gSprites[spriteId]);
-                DestroySprite(&gSprites[spriteId]);
-                gTasks[taskId].data[0] = 20;
+                gTasks[taskId].data[10] = 0;
+                gTasks[taskId].data[11] = 0;
+                gTasks[taskId].data[0] = 43;
             }
-            return;
-        case 20:
-            gTasks[taskId].data[10] = 0;
-            gTasks[taskId].data[0] = 21;
-            return;
-        case 31:
+            break;
+        }
+        return;
+    case 43:
+        if (!gContestResources->field_14[r6].unk2_2)
+        {
             sub_80DB89C();
-            StringCopy(gStringVar1, gContestMons[r6].nickname);
-            StringExpandPlaceholders(gStringVar4, gText_0827D56F);
+            gTasks[taskId].data[0] = 55;
+        }
+        return;
+    case 57:
+        sub_80DB89C();
+        StringCopy(gStringVar3, gContestMons[gContestResources->field_10->excitementFreezer].nickname);
+        StringCopy(gStringVar1, gContestMons[r6].nickname);
+        StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]);
+        StringExpandPlaceholders(gStringVar4, gText_0827E7EA);
+        Contest_StartTextPrinter(gStringVar4, 1);
+        gTasks[taskId].data[0] = 58;
+        return;
+    case 58:
+        if (!Contest_RunTextPrinters())
+        {
+            sub_80DB89C();
+            StringExpandPlaceholders(gStringVar4, gText_0827E817);
             Contest_StartTextPrinter(gStringVar4, 1);
-            gTasks[taskId].data[0] = 32;
-            return;
-        case 32:
-            if (!Contest_RunTextPrinters())
-                gTasks[taskId].data[0] = 21;
-            return;
-        case 21:
-            if (++gTasks[taskId].data[10] > 29)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[0] = 22;
-            }
-            return;
-        case 22:
-            if (++gContestResources->field_0->unk19214 == 4)
-            {
-                gTasks[taskId].data[0] = 0;
-                gTasks[taskId].data[1] = 0;
-                gTasks[taskId].data[2] = 0;
-                gTasks[taskId].func = sub_80DA198;
-            }
-            else
+            gTasks[taskId].data[0] = 59;
+        }
+        return;
+    case 59:
+        if (!Contest_RunTextPrinters())
+        {
+            sub_80DB89C();
+            gTasks[taskId].data[0] = 55;
+        }
+        return;
+    case 33:
+        if (gContestResources->field_4[r6].hasJudgesAttention)
+            gContestResources->field_4[r6].hasJudgesAttention = 0;
+        sub_80DC9B4(r6);
+        StringCopy(gStringVar1, gContestMons[r6].nickname);
+        StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]);
+        StringExpandPlaceholders(gStringVar4, gText_0827E58A);
+        Contest_StartTextPrinter(gStringVar4, 1);
+        gTasks[taskId].data[0] = 34;
+        return;
+    case 34:
+        if (!Contest_RunTextPrinters())
+            gTasks[taskId].data[0] = 55;
+        return;
+    case 55:
+        sub_80DDBE8();
+        gTasks[taskId].data[0] = 56;
+        return;
+    case 56:
+        if (!gContestResources->field_0->unk1920A_6)
+        {
+            if (gContestResources->field_0->applauseLevel > 4)
             {
-                gTasks[taskId].data[0] = 0;
+                gContestResources->field_0->applauseLevel = 0;
+                sub_80DD940();
             }
-            return;
+            gTasks[taskId].data[0] = 10;
+        }
+        return;
+    case 10:
+        spriteId = gTasks[taskId].data[2];
+        gSprites[spriteId].callback = sub_80DA164;
+        gTasks[taskId].data[0] = 11;
+        return;
+    case 11:
+        spriteId = gTasks[taskId].data[2];
+        if (gSprites[spriteId].invisible)
+        {
+            FreeSpriteOamMatrix(&gSprites[spriteId]);
+            DestroySprite(&gSprites[spriteId]);
+            gTasks[taskId].data[0] = 20;
+        }
+        return;
+    case 20:
+        gTasks[taskId].data[10] = 0;
+        gTasks[taskId].data[0] = 21;
+        return;
+    case 31:
+        sub_80DB89C();
+        StringCopy(gStringVar1, gContestMons[r6].nickname);
+        StringExpandPlaceholders(gStringVar4, gText_0827D56F);
+        Contest_StartTextPrinter(gStringVar4, 1);
+        gTasks[taskId].data[0] = 32;
+        return;
+    case 32:
+        if (!Contest_RunTextPrinters())
+            gTasks[taskId].data[0] = 21;
+        return;
+    case 21:
+        if (++gTasks[taskId].data[10] > 29)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[0] = 22;
+        }
+        return;
+    case 22:
+        if (++gContestResources->field_0->unk19214 == 4)
+        {
+            gTasks[taskId].data[0] = 0;
+            gTasks[taskId].data[1] = 0;
+            gTasks[taskId].data[2] = 0;
+            gTasks[taskId].func = sub_80DA198;
+        }
+        else
+        {
+            gTasks[taskId].data[0] = 0;
+        }
+        return;
     }
 }
 
-void sub_80DA110(u8 taskId)
+static void sub_80DA110(u8 taskId)
 {
     sContest.unk1920B_2 = 0;
     DestroyTask(taskId);
 }
 
-void sub_80DA134(struct Sprite *sprite)
+static void sub_80DA134(struct Sprite *sprite)
 {
     if (sprite->pos2.x != 0)
     {
@@ -1670,7 +1722,7 @@ void sub_80DA134(struct Sprite *sprite)
     }
 }
 
-void sub_80DA164(struct Sprite *sprite)
+static void sub_80DA164(struct Sprite *sprite)
 {
     sprite->pos2.x -= 6;
     if (sprite->pos1.x + sprite->pos2.x < -32)
@@ -1680,7 +1732,7 @@ void sub_80DA164(struct Sprite *sprite)
     }
 }
 
-void sub_80DA198(u8 taskId)
+static void sub_80DA198(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -1718,7 +1770,7 @@ void sub_80DA198(u8 taskId)
     }
 }
 
-void sub_80DA25C(u8 taskId)
+static void sub_80DA25C(u8 taskId)
 {
     sub_80DE008(FALSE);
     gTasks[taskId].data[0] = 0;
@@ -1726,7 +1778,7 @@ void sub_80DA25C(u8 taskId)
     gTasks[taskId].func = sub_80DA28C;
 }
 
-void sub_80DA28C(u8 taskId)
+static void sub_80DA28C(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -1757,13 +1809,13 @@ void sub_80DA28C(u8 taskId)
     }
 }
 
-void sub_80DA31C(u8 taskId)
+static void sub_80DA31C(u8 taskId)
 {
     if (sub_80DC3C4())
         gTasks[taskId].func = sub_80DA348;
 }
 
-void sub_80DA348(u8 taskId)
+static void sub_80DA348(u8 taskId)
 {
     DmaCopy32Defvars(3, shared18000.unk18204, gPlttBufferUnfaded, 0x400);
     gTasks[taskId].data[0] = 0;
@@ -1771,7 +1823,7 @@ void sub_80DA348(u8 taskId)
     gTasks[taskId].func = sub_80DA38C;
 }
 
-void sub_80DA38C(u8 taskId)
+static void sub_80DA38C(u8 taskId)
 {
     if (++gTasks[taskId].data[0] > 2)
     {
@@ -1781,7 +1833,7 @@ void sub_80DA38C(u8 taskId)
     }
 }
 
-void sub_80DA3CC(u8 taskId)
+static void sub_80DA3CC(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
@@ -1804,7 +1856,7 @@ void sub_80DA3CC(u8 taskId)
     }
 }
 
-void sub_80DA464(u8 taskId)
+static void sub_80DA464(u8 taskId)
 {
     if (gTasks[taskId].data[0]++ > 29)
     {
@@ -1814,7 +1866,7 @@ void sub_80DA464(u8 taskId)
     }
 }
 
-void sub_80DA49C(u8 taskId)
+static void sub_80DA49C(u8 taskId)
 {
     if (sub_80DC3C4())
     {
@@ -1823,19 +1875,19 @@ void sub_80DA49C(u8 taskId)
     }
 }
 
-void sub_80DA4CC(u8 taskId)
+static void sub_80DA4CC(u8 taskId)
 {
     sub_80DE224();
     gTasks[taskId].func = sub_80DE424;
 }
 
-void sub_80DA4F4(u8 taskId)
+static void sub_80DA4F4(u8 taskId)
 {
     sub_80DE350();
     gTasks[taskId].func = sub_80DA51C;
 }
 
-void sub_80DA51C(u8 taskId)
+static void sub_80DA51C(u8 taskId)
 {
     vu16 sp0 = GetGpuReg(REG_OFFSET_BG0CNT);
     vu16 sp2 = GetGpuReg(REG_OFFSET_BG2CNT);
@@ -1855,13 +1907,13 @@ void sub_80DA51C(u8 taskId)
     }
 }
 
-void sub_80DA5B4(u8 taskId)
+static void sub_80DA5B4(u8 taskId)
 {
     if (!sContest.unk1920A_6)
         gTasks[taskId].func = sub_80D833C;
 }
 
-void sub_80DA5E8(u8 taskId)
+static void sub_80DA5E8(u8 taskId)
 {
     s32 i;
 
@@ -1886,7 +1938,7 @@ void sub_80DA5E8(u8 taskId)
     gTasks[taskId].func = sub_80DA6B4;
 }
 
-void sub_80DA6B4(u8 taskId)
+static void sub_80DA6B4(u8 taskId)
 {
     if (!Contest_RunTextPrinters())
     {
@@ -1899,7 +1951,7 @@ void sub_80DA6B4(u8 taskId)
     }
 }
 
-void sub_80DA700(u8 taskId)
+static void sub_80DA700(u8 taskId)
 {
     gBattle_BG1_Y -= 7;
     if ((s16)gBattle_BG1_Y < 0)
@@ -1911,7 +1963,7 @@ void sub_80DA700(u8 taskId)
     }
 }
 
-void sub_80DA740(u8 taskId)
+static void sub_80DA740(u8 taskId)
 {
     if (gTasks[taskId].data[0]++ >= 50)
     {
@@ -1928,7 +1980,7 @@ void sub_80DA740(u8 taskId)
     }
 }
 
-void sub_80DA7A0(u8 taskId)
+static void sub_80DA7A0(u8 taskId)
 {
     u8 taskId2 = CreateTask(sub_80FCACC, 0);
 
@@ -1938,14 +1990,14 @@ void sub_80DA7A0(u8 taskId)
     sub_80DC490(FALSE);
 }
 
-void sub_80DA7EC(u8 taskId)
+static void sub_80DA7EC(u8 taskId)
 {
     DestroyTask(taskId);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
     gTasks[sContest.mainTaskId].func = sub_80DA830;
 }
 
-void sub_80DA830(u8 taskId)
+static void sub_80DA830(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -1958,26 +2010,25 @@ void sub_80DA830(u8 taskId)
     }
 }
 
-void sub_80DA874(void)
+static void sub_80DA874(void)
 {
     ScriptContext2_Disable();
     EnableBothScriptContexts();
 }
 
-void sub_80DA884(void)
+static void sub_80DA884(void)
 {
     if (!(gIsLinkContest & 1))
         gContestPlayerMonIndex = 3;
 }
 
-bool8 sub_80DA8A4(void)
+static bool8 sub_80DA8A4(void)
 {
     if (gContestPlayerMonIndex == gUnknown_02039F2B)
         return TRUE;
     return FALSE;
 }
 
-
 void sub_80DA8C8(u8 partyIndex)
 {
     u8 name[20];
@@ -2113,48 +2164,41 @@ void sub_80DAB8C(u8 contestType, u8 rank)
     sub_80DA8C8(gContestMonPartyIndex);
 }
 
-#ifdef NONMATCHING
 void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
 {
-    s32 i;
+    s32 i, j;
     u8 opponentsCount = 0;
     u8 opponents[100];
-    const u8 * r6;
 
     if (gNumLinkContestPlayers == 4)
         return;
 
-    r6 = gUnknown_085898A4;
     for (i = 0; i < ARRAY_COUNT(gContestOpponents); i++)
     {
         if (rank != gContestOpponents[i].whichRank)
             continue;
+
         if (isPostgame == TRUE)
         {
-            if (r6[i] == 1)
+            if (gUnknown_085898A4[i] == 1)
                 continue;
         }
         else
         {
-            if (r6[i] == 2)
+            if (gUnknown_085898A4[i] == 2)
                 continue;
         }
-        if      (contestType == CONTEST_CATEGORY_COOL && gContestOpponents[i].aiPool_Cool)
-            opponents[opponentsCount++] = i;
-        else if (contestType == CONTEST_CATEGORY_BEAUTY && gContestOpponents[i].aiPool_Beauty)
-            opponents[opponentsCount++] = i;
-        else if (contestType == CONTEST_CATEGORY_CUTE && gContestOpponents[i].aiPool_Cute)
-            opponents[opponentsCount++] = i;
-        else if (contestType == CONTEST_CATEGORY_SMART && gContestOpponents[i].aiPool_Smart)
-            opponents[opponentsCount++] = i;
-        else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough)
+        if ((contestType == CONTEST_CATEGORY_COOL && gContestOpponents[i].aiPool_Cool)
+            || (contestType == CONTEST_CATEGORY_BEAUTY && gContestOpponents[i].aiPool_Beauty)
+            || (contestType == CONTEST_CATEGORY_CUTE && gContestOpponents[i].aiPool_Cute)
+            || (contestType == CONTEST_CATEGORY_SMART && gContestOpponents[i].aiPool_Smart)
+            || (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough))
             opponents[opponentsCount++] = i;
     }
     opponents[opponentsCount] = 0xFF;
     for (i = 0; i < 4 - gNumLinkContestPlayers; i++)
     {
         u16 rnd = sub_80F903C() % opponentsCount;
-        s32 j;
 
         gContestMons[gNumLinkContestPlayers + i] = gContestOpponents[opponents[rnd]];
         sub_80DF9D4(gContestMons[gNumLinkContestPlayers + i].trainerName);
@@ -2164,180 +2208,6 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
         opponentsCount--;
     }
 }
-#else
-NAKED void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                "\tmov r7, r9\n"
-                "\tmov r6, r8\n"
-                "\tpush {r6,r7}\n"
-                "\tsub sp, 0x64\n"
-                "\tmov r8, r2\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tlsls r1, 24\n"
-                "\tlsrs r2, r1, 24\n"
-                "\tmovs r7, 0\n"
-                "\tldr r0, =gNumLinkContestPlayers\n"
-                "\tldrb r1, [r0]\n"
-                "\tmov r9, r0\n"
-                "\tcmp r1, 0x4\n"
-                "\tbne _080DACDE\n"
-                "\tb _080DADF6\n"
-                "_080DACDE:\n"
-                "\tmovs r5, 0\n"
-                "\tldr r3, =gContestOpponents\n"
-                "\tldr r6, =gUnknown_085898A4\n"
-                "_080DACE4:\n"
-                "\tldrb r0, [r3, 0x1C]\n"
-                "\tlsls r0, 30\n"
-                "\tlsrs r0, 30\n"
-                "\tcmp r2, r0\n"
-                "\tbne _080DAD56\n"
-                "\tmov r0, r8\n"
-                "\tcmp r0, 0x1\n"
-                "\tbne _080DAD08\n"
-                "\tldrb r0, [r6]\n"
-                "\tcmp r0, 0x1\n"
-                "\tbeq _080DAD56\n"
-                "\tb _080DAD0E\n"
-                "\t.pool\n"
-                "_080DAD08:\n"
-                "\tldrb r0, [r6]\n"
-                "\tcmp r0, 0x2\n"
-                "\tbeq _080DAD56\n"
-                "_080DAD0E:\n"
-                "\tcmp r4, 0\n"
-                "\tbne _080DAD1A\n"
-                "\tldrb r0, [r3, 0x1C]\n"
-                "\tlsls r0, 29\n"
-                "\tcmp r0, 0\n"
-                "\tblt _080DAD4A\n"
-                "_080DAD1A:\n"
-                "\tcmp r4, 0x1\n"
-                "\tbne _080DAD26\n"
-                "\tldrb r0, [r3, 0x1C]\n"
-                "\tlsls r0, 28\n"
-                "\tcmp r0, 0\n"
-                "\tblt _080DAD4A\n"
-                "_080DAD26:\n"
-                "\tcmp r4, 0x2\n"
-                "\tbne _080DAD32\n"
-                "\tldrb r0, [r3, 0x1C]\n"
-                "\tlsls r0, 27\n"
-                "\tcmp r0, 0\n"
-                "\tblt _080DAD4A\n"
-                "_080DAD32:\n"
-                "\tcmp r4, 0x3\n"
-                "\tbne _080DAD3E\n"
-                "\tldrb r0, [r3, 0x1C]\n"
-                "\tlsls r0, 26\n"
-                "\tcmp r0, 0\n"
-                "\tblt _080DAD4A\n"
-                "_080DAD3E:\n"
-                "\tcmp r4, 0x4\n"
-                "\tbne _080DAD56\n"
-                "\tldrb r0, [r3, 0x1C]\n"
-                "\tlsls r0, 25\n"
-                "\tcmp r0, 0\n"
-                "\tbge _080DAD56\n"
-                "_080DAD4A:\n"
-                "\tadds r0, r7, 0\n"
-                "\tadds r1, r0, 0x1\n"
-                "\tlsls r1, 24\n"
-                "\tlsrs r7, r1, 24\n"
-                "\tadd r0, sp\n"
-                "\tstrb r5, [r0]\n"
-                "_080DAD56:\n"
-                "\tadds r3, 0x40\n"
-                "\tadds r6, 0x1\n"
-                "\tadds r5, 0x1\n"
-                "\tcmp r5, 0x5F\n"
-                "\tbls _080DACE4\n"
-                "\tmov r3, sp\n"
-                "\tadds r1, r3, r7\n"
-                "\tmovs r0, 0xFF\n"
-                "\tstrb r0, [r1]\n"
-                "\tmovs r5, 0\n"
-                "\tmov r0, r9\n"
-                "\tldrb r1, [r0]\n"
-                "\tmovs r0, 0x4\n"
-                "\tsubs r0, r1\n"
-                "\tcmp r5, r0\n"
-                "\tbge _080DADF6\n"
-                "\tldr r3, =gContestMons\n"
-                "\tmov r8, r3\n"
-                "\tmov r6, r9\n"
-                "\tmovs r0, 0x2\n"
-                "\tadd r0, r8\n"
-                "\tmov r9, r0\n"
-                "_080DAD82:\n"
-                "\tbl sub_80F903C\n"
-                "\tlsls r0, 16\n"
-                "\tlsrs r0, 16\n"
-                "\tadds r1, r7, 0\n"
-                "\tbl __modsi3\n"
-                "\tadds r1, r0, 0\n"
-                "\tlsls r1, 16\n"
-                "\tlsrs r1, 16\n"
-                "\tldrb r0, [r6]\n"
-                "\tadds r0, r5\n"
-                "\tlsls r0, 6\n"
-                "\tadd r0, r8\n"
-                "\tldr r2, =gContestOpponents\n"
-                "\tmov r3, sp\n"
-                "\tadds r4, r3, r1\n"
-                "\tldrb r1, [r4]\n"
-                "\tlsls r1, 6\n"
-                "\tadds r1, r2\n"
-                "\tmovs r2, 0x40\n"
-                "\tbl memcpy\n"
-                "\tldrb r0, [r6]\n"
-                "\tadds r0, r5\n"
-                "\tlsls r0, 6\n"
-                "\tmov r1, r8\n"
-                "\tadds r1, 0xD\n"
-                "\tadds r0, r1\n"
-                "\tbl sub_80DF9D4\n"
-                "\tldrb r0, [r6]\n"
-                "\tadds r0, r5\n"
-                "\tlsls r0, 6\n"
-                "\tadd r0, r9\n"
-                "\tmovs r1, 0x2\n"
-                "\tbl sub_80DF9E0\n"
-                "\tldrb r0, [r4]\n"
-                "\tadds r3, r5, 0x1\n"
-                "\tsubs r1, r7, 0x1\n"
-                "\tcmp r0, 0xFF\n"
-                "\tbeq _080DADE6\n"
-                "\tadds r2, r4, 0\n"
-                "_080DADDA:\n"
-                "\tldrb r0, [r2, 0x1]\n"
-                "\tstrb r0, [r2]\n"
-                "\tadds r2, 0x1\n"
-                "\tldrb r0, [r2]\n"
-                "\tcmp r0, 0xFF\n"
-                "\tbne _080DADDA\n"
-                "_080DADE6:\n"
-                "\tlsls r0, r1, 24\n"
-                "\tlsrs r7, r0, 24\n"
-                "\tadds r5, r3, 0\n"
-                "\tldrb r1, [r6]\n"
-                "\tmovs r0, 0x4\n"
-                "\tsubs r0, r1\n"
-                "\tcmp r5, r0\n"
-                "\tblt _080DAD82\n"
-                "_080DADF6:\n"
-                "\tadd sp, 0x64\n"
-                "\tpop {r3,r4}\n"
-                "\tmov r8, r3\n"
-                "\tmov r9, r4\n"
-                "\tpop {r4-r7}\n"
-                "\tpop {r0}\n"
-                "\tbx r0\n"
-                "\t.pool");
-}
-#endif
 
 // GetContestAvailability?
 u8 sub_80DAE0C(struct Pokemon *pkmn)
@@ -2382,7 +2252,7 @@ u8 sub_80DAE0C(struct Pokemon *pkmn)
     return retVal;
 }
 
-void sub_80DAEA4(void)
+static void sub_80DAEA4(void)
 {
     s32 i;
 
@@ -2394,7 +2264,7 @@ void sub_80DAEA4(void)
     }
 }
 
-u8 * sub_80DAED4(const u8 * src, u8 color)
+static u8 *sub_80DAED4(const u8 *src, u8 color)
 {
     u8 * ptr = StringCopy(gDisplayedStringBattle, gText_ColorTransparent);
     ptr[-1] = color;
@@ -2403,12 +2273,12 @@ u8 * sub_80DAED4(const u8 * src, u8 color)
     return ptr;
 }
 
-void sub_80DAF04(u8 a0)
+static void sub_80DAF04(u8 a0)
 {
     sub_80DAF1C(a0, a0 + 10);
 }
 
-void sub_80DAF1C(u8 a0, u8 a1)
+static void sub_80DAF1C(u8 a0, u8 a1)
 {
     u8 buffer[32];
     s32 offset;
@@ -2422,18 +2292,18 @@ void sub_80DAF1C(u8 a0, u8 a1)
     Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[a0], gDisplayedStringBattle, offset, 1, 7);
 }
 
-void sub_80DAF88(u8 a0)
+static void sub_80DAF88(u8 a0)
 {
     sub_80DAFA0(a0, a0 + 10);
 }
 
-void sub_80DAFA0(u8 a0, u8 a1)
+static void sub_80DAFA0(u8 a0, u8 a1)
 {
     sub_80DAED4(gContestMons[a0].nickname, a1);
     Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[a0], gDisplayedStringBattle, 5, 1, 7);
 }
 
-u16 sub_80DAFE0(u8 who, u8 contestCategory)
+static u16 sub_80DAFE0(u8 who, u8 contestCategory)
 {
     u8 statMain;
     u8 statSub1;
@@ -2441,32 +2311,32 @@ u16 sub_80DAFE0(u8 who, u8 contestCategory)
 
     switch (contestCategory)
     {
-        case CONTEST_CATEGORY_COOL:
-            statMain = gContestMons[who].cool;
-            statSub1 = gContestMons[who].tough;
-            statSub2 = gContestMons[who].beauty;
-            break;
-        case CONTEST_CATEGORY_BEAUTY:
-            statMain = gContestMons[who].beauty;
-            statSub1 = gContestMons[who].cool;
-            statSub2 = gContestMons[who].cute;
-            break;
-        case CONTEST_CATEGORY_CUTE:
-            statMain = gContestMons[who].cute;
-            statSub1 = gContestMons[who].beauty;
-            statSub2 = gContestMons[who].smart;
-            break;
-        case CONTEST_CATEGORY_SMART:
-            statMain = gContestMons[who].smart;
-            statSub1 = gContestMons[who].cute;
-            statSub2 = gContestMons[who].tough;
-            break;
-        case CONTEST_CATEGORY_TOUGH:
-        default:
-            statMain = gContestMons[who].tough;
-            statSub1 = gContestMons[who].smart;
-            statSub2 = gContestMons[who].cool;
-            break;
+    case CONTEST_CATEGORY_COOL:
+        statMain = gContestMons[who].cool;
+        statSub1 = gContestMons[who].tough;
+        statSub2 = gContestMons[who].beauty;
+        break;
+    case CONTEST_CATEGORY_BEAUTY:
+        statMain = gContestMons[who].beauty;
+        statSub1 = gContestMons[who].cool;
+        statSub2 = gContestMons[who].cute;
+        break;
+    case CONTEST_CATEGORY_CUTE:
+        statMain = gContestMons[who].cute;
+        statSub1 = gContestMons[who].beauty;
+        statSub2 = gContestMons[who].smart;
+        break;
+    case CONTEST_CATEGORY_SMART:
+        statMain = gContestMons[who].smart;
+        statSub1 = gContestMons[who].cute;
+        statSub2 = gContestMons[who].tough;
+        break;
+    case CONTEST_CATEGORY_TOUGH:
+    default:
+        statMain = gContestMons[who].tough;
+        statSub1 = gContestMons[who].smart;
+        statSub2 = gContestMons[who].cool;
+        break;
     }
     return statMain + (statSub1 + statSub2 + gContestMons[who].sheen) / 2;
 }
@@ -2479,7 +2349,7 @@ void sub_80DB09C(u8 contestCategory)
         gContestMonConditions[i] = sub_80DAFE0(i, contestCategory);
 }
 
-u8 sub_80DB0C4(void)
+static u8 sub_80DB0C4(void)
 {
     u8 spriteId;
 
@@ -2491,7 +2361,7 @@ u8 sub_80DB0C4(void)
     return spriteId;
 }
 
-u8 sub_80DB120(void)
+static u8 sub_80DB120(void)
 {
     u8 spriteId;
 
@@ -2503,10 +2373,10 @@ u8 sub_80DB120(void)
     return spriteId;
 }
 
-u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index)
+static u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index)
 {
     u8 spriteId;
-    species = sub_80DE84C(species);
+    species = SanitizeSpecies(species);
 
     if (index == gContestPlayerMonIndex)
         HandleLoadSpecialPokePic_2(gMonBackPicTable + species, gMonSpritesGfxPtr->sprites[0], species, personality);
@@ -2540,36 +2410,36 @@ bool8 IsSpeciesNotUnown(u16 species)
         return TRUE;
 }
 
-void sub_80DB2BC(void)
+static void sub_80DB2BC(void)
 {
     CpuCopy16(gContestResources->field_24[0], gContestResources->field_24[0] + 0x500, 0x280);
     CpuCopy16(gContestResources->field_24[2], gContestResources->field_24[2] + 0x500, 0x280);
 }
 
-u16 sub_80DB2EC(u16 a0, u8 a1)
+static u16 sub_80DB2EC(u16 a0, u8 a1)
 {
     u16 var;
 
     switch (gContestEffects[gContestMoves[a0].effect].effectType)
     {
-        case 0:
-        case 1:
-        case 8:
-            var = 0x9082;
-            break;
-        case 2:
-        case 3:
-            var = 0x9088;
-            break;
-        default:
-            var = 0x9086;
-            break;
+    case 0:
+    case 1:
+    case 8:
+        var = 0x9082;
+        break;
+    case 2:
+    case 3:
+        var = 0x9088;
+        break;
+    default:
+        var = 0x9086;
+        break;
     }
     var += 0x9000 + (a1 << 12);
     return var;
 }
 
-void prints_contest_move_description(u16 a)
+static void prints_contest_move_description(u16 a)
 {
     u8 category;
     u16 categoryTile;
@@ -2613,7 +2483,7 @@ void prints_contest_move_description(u16 a)
     Contest_PrintTextToBg0WindowStd(9, gText_Slash);
 }
 
-void sub_80DB4E0(u16 move, u8 b)
+static void sub_80DB4E0(u16 move, u8 b)
 {
     u8 r7 = gUnknown_02039F26[b] * 5 + 2;
 
@@ -2630,7 +2500,7 @@ void sub_80DB4E0(u16 move, u8 b)
     }
 }
 
-void sub_80DB584(void)
+static void sub_80DB584(void)
 {
     s32 i;
 
@@ -2638,12 +2508,12 @@ void sub_80DB584(void)
         sub_80DB4E0(gContestResources->field_4[i].currMove, i);
 }
 
-u16 sub_80DB5B0(void)
+static u16 sub_80DB5B0(void)
 {
     return 0x2034;
 }
 
-bool8 sub_80DB5B8(u8 contestantIdx, bool8 resetMod)
+static bool8 sub_80DB5B8(u8 contestantIdx, bool8 resetMod)
 {
     u8 r6;
     s32 r4;
@@ -2673,7 +2543,7 @@ bool8 sub_80DB5B8(u8 contestantIdx, bool8 resetMod)
     return TRUE;
 }
 
-void sub_80DB69C(void)
+static void sub_80DB69C(void)
 {
     s32 i;
     s32 r6;
@@ -2689,33 +2559,33 @@ void sub_80DB69C(void)
     }
 }
 
-u16 sub_80DB748(u8 status)
+static u16 sub_80DB748(u8 status)
 {
     u16 var = 0;
 
     switch (status)
     {
-        case 0:
-            var = 0x80;
-            break;
-        case 1:
-            var = 0x84;
-            break;
-        case 2:
-            var = 0x86;
-            break;
-        case 3:
-            var = 0x88;
-            break;
-        case 4:
-            var = 0x82;
-            break;
+    case 0:
+        var = 0x80;
+        break;
+    case 1:
+        var = 0x84;
+        break;
+    case 2:
+        var = 0x86;
+        break;
+    case 3:
+        var = 0x88;
+        break;
+    case 4:
+        var = 0x82;
+        break;
     }
     var += 0x9000;
     return var;
 }
 
-bool8 sub_80DB798(u8 a)
+static bool8 sub_80DB798(u8 a)
 {
     bool8 r9 = TRUE;
     u16 r8 = 0;
@@ -2740,3 +2610,2581 @@ bool8 sub_80DB798(u8 a)
     }
     return r9;
 }
+
+static void sub_80DB884(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+        sub_80DB798(i);
+}
+
+static void sub_80DB89C(void)
+{
+    FillWindowPixelBuffer(4, 0);
+    CopyWindowToVram(4, 2);
+    Contest_SetBgCopyFlags(0);
+}
+
+static u16 GetChosenMove(u8 a)
+{
+    if (Contest_IsMonsTurnDisabled(a))
+        return 0;
+    if (a == gContestPlayerMonIndex)
+    {
+        return gContestMons[a].moves[sContest.playerMoveChoice];
+    }
+    else
+    {
+        u8 moveChoice;
+
+        ContestAI_ResetAI(a);
+        moveChoice = ContestAI_GetActionToUse();
+        return gContestMons[a].moves[moveChoice];
+    }
+}
+
+static void sub_80DB918(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+        sContestantStatus[i].currMove = GetChosenMove(i);
+}
+
+static void sub_80DB944(void)
+{
+    s32 i;
+    s32 j;
+    s16 arr[4];
+
+    for (i = 0; i < 4; i++)
+    {
+        sContestantStatus[i].unk4 += sContestantStatus[i].appeal2;
+        arr[i] = sContestantStatus[i].unk4;
+    }
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 3; j > i; j--)
+        {
+            if (arr[j - 1] < arr[j])
+            {
+                u16 temp = arr[j];
+
+                arr[j] = arr[j - 1];
+                arr[j - 1] = temp;
+            }
+        }
+    }
+    for (i = 0; i < 4; i++)
+    {
+        for (j = 0; j < 4; j++)
+        {
+            if (sContestantStatus[i].unk4 == arr[j])
+            {
+                sContestantStatus[i].unkB_0 = j;
+                break;
+            }
+        }
+    }
+    sub_80DCE58(1);
+    sub_80DD590();
+}
+
+static void sub_80DBA18(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        u8 attentionLevel;
+
+        if (sContestantStatus[i].currMove == MOVE_NONE)
+            attentionLevel = 5;
+        else if (sContestantStatus[i].appeal2 <= 0)
+            attentionLevel = 0;
+        else if (sContestantStatus[i].appeal2 < 30)
+            attentionLevel = 1;
+        else if (sContestantStatus[i].appeal2 < 60)
+            attentionLevel = 2;
+        else if (sContestantStatus[i].appeal2 < 80)
+            attentionLevel = 3;
+        else
+            attentionLevel = 4;
+
+        sContestantStatus[i].attentionLevel = attentionLevel;
+    }
+}
+
+static bool8 sub_80DBA68(u8 a)
+{
+    if (sContestantStatus[a].numTurnsSkipped != 0 || sContestantStatus[a].noMoreTurns)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+static void sub_80DBAA0(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        sContestantStatus[i].appeal2 = 0;
+        sContestantStatus[i].appeal1 = 0;
+        sContestantStatus[i].jamSafetyCount = 0;
+        if (sContestantStatus[i].numTurnsSkipped > 0)
+            sContestantStatus[i].numTurnsSkipped--;
+        sContestantStatus[i].jam = 0;
+        sContestantStatus[i].resistant = 0;
+        sContestantStatus[i].jamReduction = 0;
+        sContestantStatus[i].immune = 0;
+        sContestantStatus[i].moreEasilyStartled = 0;
+        sContestantStatus[i].usedRepeatableMove = 0;
+        sContestantStatus[i].nervous = 0;
+        sContestantStatus[i].effectStringId = CONTEST_STRING_NONE;
+        sContestantStatus[i].effectStringId2 = CONTEST_STRING_NONE;
+        sContestantStatus[i].conditionMod = 0;
+        sContestantStatus[i].unk15_2 = sContestantStatus[i].disappointedRepeat;
+        sContestantStatus[i].disappointedRepeat = FALSE;
+        sContestantStatus[i].turnOrderModAction = 0;
+        sContestantStatus[i].appealTripleCondition = 0;
+        if (sContestantStatus[i].turnSkipped)
+        {
+            sContestantStatus[i].numTurnsSkipped = 1;
+            sContestantStatus[i].turnSkipped = 0;
+        }
+        if (sContestantStatus[i].exploded)
+        {
+            sContestantStatus[i].noMoreTurns = 1;
+            sContestantStatus[i].exploded = 0;
+        }
+        sContestantStatus[i].overrideCategoryExcitementMod = 0;
+    }
+    for (i = 0; i < 4; i++)
+    {
+        sContestantStatus[i].prevMove = sContestantStatus[i].currMove;
+        sContest.unk19220[sContest.turnNumber][i] = sContestantStatus[i].currMove;
+        sContest.unk19248[sContest.turnNumber][i] = Contest_GetMoveExcitement(sContestantStatus[i].currMove);
+        sContestantStatus[i].currMove = MOVE_NONE;
+    }
+    shared19328.excitementFrozen = 0;
+}
+
+bool8 Contest_IsMonsTurnDisabled(u8 a)
+{
+    if (sContestantStatus[a].numTurnsSkipped != 0 || sContestantStatus[a].noMoreTurns)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void sub_80DBCE0(u8 a)
+{
+    gUnknown_02039F18[a] = sub_80DBD34(a);
+    gUnknown_02039F08[a] = gContestMonConditions[a] + gUnknown_02039F18[a];
+}
+
+static void sub_80DBD18(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+        sub_80DBCE0(i);
+    DetermineFinalStandings();
+}
+
+static s16 sub_80DBD34(u8 a)
+{
+    return gUnknown_02039F10[a] * 2;
+}
+
+static void DetermineFinalStandings(void)
+{
+    u16 sp0[4] = {0};
+    struct UnknownContestStruct6 sp8[4];
+    s32 i;
+    s32 j;
+
+    for (i = 0; i < 4; i++)
+    {
+        s32 r2;
+
+        sp0[i] = Random();
+        for (r2 = 0; r2 < i; r2++)
+        {
+            if (sp0[i] == sp0[r2])
+            {
+                i--;
+                break;
+            }
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        sp8[i].unk0 = gUnknown_02039F08[i];
+        sp8[i].unk4 = gContestMonConditions[i];
+        sp8[i].unk8 = sp0[i];
+        sp8[i].unkC = i;
+    }
+
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 3; j > i; j--)
+        {
+            if (sub_80DBF30(j - 1, j, sp8))
+            {
+                struct UnknownContestStruct6 temp;
+
+                temp.unk0 = sp8[j - 1].unk0;
+                temp.unk4 = sp8[j - 1].unk4;
+                temp.unk8 = sp8[j - 1].unk8;
+                temp.unkC = sp8[j - 1].unkC;
+
+                sp8[j - 1].unk0 = sp8[j].unk0;
+                sp8[j - 1].unk4 = sp8[j].unk4;
+                sp8[j - 1].unk8 = sp8[j].unk8;
+                sp8[j - 1].unkC = sp8[j].unkC;
+
+                sp8[j].unk0 = temp.unk0;
+                sp8[j].unk4 = temp.unk4;
+                sp8[j].unk8 = temp.unk8;
+                sp8[j].unkC = temp.unkC;
+            }
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+        gContestFinalStandings[sp8[i].unkC] = i;
+}
+
+void sub_80DBED4(void)
+{
+    if ((gIsLinkContest & 1))
+    {
+        gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] =
+        ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 9999) ? 9999 :
+        (gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1);
+
+    }
+}
+
+static bool8 sub_80DBF30(s32 a, s32 b, struct UnknownContestStruct6 *c)
+{
+    bool8 retVal;
+
+    if (c[a].unk0 < c[b].unk0)
+        retVal = TRUE;
+    else if (c[a].unk0 > c[b].unk0)
+        retVal = FALSE;
+    else if (c[a].unk4 < c[b].unk4)
+        retVal = TRUE;
+    else if (c[a].unk4 > c[b].unk4)
+        retVal = FALSE;
+    else if (c[a].unk8 < c[b].unk8)
+        retVal = TRUE;
+    else
+        retVal = FALSE;
+    return retVal;
+}
+
+static void sub_80DBF68(void)
+{
+    gBattle_BG0_Y = 0;
+    gBattle_BG2_Y = 0;
+    sub_80DB89C();
+    Contest_StartTextPrinter((u8*) &gUnknown_0827E8DA, 0);
+}
+
+static void sub_80DBF90(void)
+{
+    int i;
+
+    for(i = 0; i < 4; i++)
+    {
+        ContestBG_FillBoxWithTile(0, 0, 0x16, 2 + i * 5, 8, 2, 0x11);
+    }
+}
+
+static u16 sub_80DBFC8(u8 a)
+{
+    u16 var;
+
+    if (a == 0)
+        var = 0x5011;
+    else if (a == 1)
+        var = 0x6011;
+    else if (a == 2)
+        var = 0x7011;
+    else
+        var = 0x8011;
+    return var + 1;
+}
+
+static s8 sub_80DBFFC(s16 a)
+{
+    s8 retVal = a / 10;
+
+    if (retVal > 16)
+        retVal = 16;
+    else if (retVal < -16)
+        retVal = -16;
+    return retVal;
+}
+
+static u8 sub_80DC028(s16 a, s16 b, u8 c)
+{
+    u8 taskId;
+    s8 r4;
+    s8 r5;
+
+    gContestResources->field_14[c].unk2_2 = 1;
+    taskId = CreateTask(sub_80DC0F4, 20);
+    r4 = sub_80DBFFC(a);
+    r5 = sub_80DBFFC(a + b) - r4;
+    sub_80DBFC8(c);  // unused return value
+    gTasks[taskId].data[0] = abs(r4);
+    gTasks[taskId].data[1] = r5;
+    if (r4 > 0 || (r4 == 0 && r5 > 0))
+        gTasks[taskId].data[2] = 1;
+    else
+        gTasks[taskId].data[2] = -1;
+    gTasks[taskId].data[3] = c;
+    return taskId;
+}
+
+static void sub_80DC0F4(u8 taskId)
+{
+    u8 r7 = gTasks[taskId].data[3];
+    s16 r3 = gTasks[taskId].data[0];
+    s16 r1 = gTasks[taskId].data[1];
+
+    if (++gTasks[taskId].data[10] > 14)
+    {
+        u16 r6;
+        u8 r5;
+        u8 r10;
+        u8 r11;
+
+        gTasks[taskId].data[10] = 0;
+        if (gTasks[taskId].data[1] == 0)
+        {
+            DestroyTask(taskId);
+            gContestResources->field_14[r7].unk2_2 = 0;
+            return;
+        }
+        else if (r3 == 0)
+        {
+            if (r1 < 0)
+            {
+                r6 = sub_80DBFC8(r7) + 2;
+                gTasks[taskId].data[1]++;
+            }
+            else
+            {
+                r6 = sub_80DBFC8(r7);
+                gTasks[taskId].data[1]--;
+            }
+            r5 = gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            if (gTasks[taskId].data[2] < 0)
+            {
+                if (r1 < 0)
+                {
+                    r5 = gTasks[taskId].data[0]++;
+                    gTasks[taskId].data[1]++;
+                    r6 = sub_80DBFC8(r7) + 2;
+                }
+                else
+                {
+                    r5 = --gTasks[taskId].data[0];
+                    r6 = 0;
+                    gTasks[taskId].data[1]--;
+                }
+            }
+            else
+            {
+                if (r1 < 0)
+                {
+                    r5 = --gTasks[taskId].data[0];
+                    r6 = 0;
+                    gTasks[taskId].data[1]++;
+                }
+                else
+                {
+                    r5 = gTasks[taskId].data[0]++;
+                    gTasks[taskId].data[1]--;
+                    r6 = sub_80DBFC8(r7);
+                }
+            }
+        }
+        r10 = r5;
+        r11 = 0;
+
+        if (r5 > 7)
+        {
+            r11 = 1;
+            r5-= 8;
+        }
+        ContestBG_FillBoxWithTile(0, r6, r5 + 22, gUnknown_02039F26[r7] * 5 + 2 + r11,  1, 1, 17);
+        if (r1 > 0)
+        {
+            PlaySE(SE_C_GAJI);
+            m4aMPlayImmInit(&gMPlayInfo_SE1);
+            m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256);
+        }
+        else
+        {
+            PlaySE(SE_BOO);
+        }
+
+        if (!r11 && !r5 && !r6)
+            gTasks[taskId].data[2] = -gTasks[taskId].data[2];
+    }
+}
+
+static void sub_80DC2BC(void)
+{
+    s32 i;
+
+    LoadSpriteSheet(&gUnknown_08587A74);
+    for (i = 0; i < 4; i++)
+    {
+        u8 y = gUnknown_08587A6C[gUnknown_02039F26[i]];
+
+        gContestResources->field_14[i].unk0 = CreateSprite(&gSpriteTemplate_8587AD0, 180, y, 1);
+    }
+}
+
+static void sub_80DC308(u8 a)
+{
+    u8 spriteId;
+    s16 r5;
+
+    gContestResources->field_14[a].unk2_0 = 1;
+    spriteId = gContestResources->field_14[a].unk0;
+    r5 = sContestantStatus[a].unk4 / 10 * 2;
+    if (r5 > 56)
+        r5 = 56;
+    else if (r5 < 0)
+        r5 = 0;
+    gSprites[spriteId].invisible = FALSE;
+    gSprites[spriteId].data[0] = a;
+    gSprites[spriteId].data[1] = r5;
+    if (gSprites[spriteId].data[1] > gSprites[spriteId].pos2.x)
+        gSprites[spriteId].data[2] = 1;
+    else
+        gSprites[spriteId].data[2] = -1;
+    gSprites[spriteId].callback = sub_80DC408;
+}
+
+static void sub_80DC3AC(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+        sub_80DC308(i);
+}
+
+static bool8 sub_80DC3C4(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (gContestResources->field_14[i].unk2_0)
+            break;
+    }
+    if (i == 4)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void sub_80DC408(struct Sprite *sprite)
+{
+    if (sprite->pos2.x == sprite->data[1])
+    {
+        gContestResources->field_14[sprite->data[0]].unk2_0 = 0;
+        sprite->callback = SpriteCallbackDummy;
+    }
+    else
+    {
+        sprite->pos2.x += sprite->data[2];
+    }
+}
+
+static void sub_80DC44C(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+        gSprites[gContestResources->field_14[i].unk0].pos1.y = gUnknown_08587A6C[gUnknown_02039F26[i]];
+}
+
+static void sub_80DC490(bool8 a)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (gUnknown_02039F26[i] > 1)
+        {
+            if (!a)
+                gSprites[gContestResources->field_14[i].unk0].pos1.x = 180;
+            else
+                gSprites[gContestResources->field_14[i].unk0].pos1.x = 256;
+        }
+    }
+}
+
+static void sub_80DC4F0(void)
+{
+    s32 i;
+
+    LoadSpritePalette(&gUnknown_08587B08);
+    for (i = 0; i < 4; i++)
+    {
+        LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]);
+        gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i],
+                                                           204,
+                                                           gUnknown_08587A70[gUnknown_02039F26[i]],
+                                                           0);
+        SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80);
+        gSprites[gContestResources->field_14[i].unk1].invisible = TRUE;
+    }
+}
+
+static void CreateApplauseMeterSprite(void)
+{
+    u8 spriteId;
+
+    LoadCompressedSpriteSheet(&gUnknown_08587BB0);
+    LoadSpritePalette(&gUnknown_08587BB8);
+    spriteId = CreateSprite(&gSpriteTemplate_8587BC8, 30, 44, 1);
+    gSprites[spriteId].invisible = TRUE;
+    sContest.applauseMeterSpriteId = spriteId;
+}
+
+static void sub_80DC5E8(void)
+{
+    u8 i;
+    u8 taskId = CreateTask(sub_80DC728, 30);
+
+    sContest.unk19211 = taskId;
+    for (i = 0; i < 4; i++)
+        gTasks[taskId].data[i * 4] = 0xFF;
+}
+
+static void sub_80DC630(u8 a)
+{
+    gTasks[sContest.unk19211].data[a * 4 + 0] = 0;
+    gTasks[sContest.unk19211].data[a * 4 + 1] = 0;
+}
+
+static void sub_80DC674(u8 a)
+{
+    u8 taskId = CreateTask(sub_80DC6A4, 31);
+
+    gTasks[taskId].data[0] = a;
+}
+
+static void sub_80DC6A4(u8 taskId)
+{
+    u8 r4 = gTasks[taskId].data[0];
+
+    if (gTasks[sContest.unk19211].data[r4 * 4 + 0] == 0
+     || gTasks[sContest.unk19211].data[r4 * 4 + 0] == 0xFF)
+    {
+        gTasks[sContest.unk19211].data[r4 * 4 + 0] = 0xFF;
+        gTasks[sContest.unk19211].data[r4 * 4 + 1] = 0;
+        BlendPalette((sContest.unk19218[r4] + 5) * 16 + 6, 2, 0, RGB(31, 31, 18));
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_80DC728(u8 taskId)
+{
+    u8 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        u8 r3 = i * 4;
+
+        if (gTasks[taskId].data[r3 + 0] != 0xFF)
+        {
+            if (gTasks[taskId].data[r3 + 1] == 0)
+                gTasks[taskId].data[r3 + 0]++;
+            else
+                gTasks[taskId].data[r3 + 0]--;
+
+            if (gTasks[taskId].data[r3 + 0] == 16
+             || gTasks[taskId].data[r3 + 0] == 0)
+                gTasks[taskId].data[r3 + 1] ^= 1;
+
+            BlendPalette(
+              (sContest.unk19218[i] + 5) * 16 + 6,
+              2,
+              gTasks[taskId].data[r3 + 0],
+              RGB(31, 31, 18));
+        }
+    }
+}
+
+static void sub_80DC7EC(void)
+{
+    s32 i;
+
+    sContest.unk19212 = CreateTask(sub_80DC8D0, 30);
+    for (i = 0; i < 4; i++)
+        sub_80DC81C(i);
+}
+
+static void sub_80DC81C(u8 a)
+{
+    gTasks[sContest.unk19212].data[a * 4 + 0] = 0xFF;
+    gTasks[sContest.unk19212].data[a * 4 + 1] = 0;
+}
+
+static void sub_80DC864(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+        sub_80DC87C(i);
+}
+
+static void sub_80DC87C(u8 a)
+{
+    u32 var;
+    u32 r0;
+
+    sub_80DC81C(a);
+
+    r0 = a + 5;
+    DmaCopy16Defvars(3,
+                     gPlttBufferUnfaded + r0 * 16 + 10,
+                     gPlttBufferFaded   + r0 * 16 + 10,
+                     2);
+    var = (a + 5) * 16 + 12 + a;
+    DmaCopy16Defvars(3,
+                     gPlttBufferUnfaded + var,
+                     gPlttBufferFaded + var,
+                     2);
+}
+
+static void sub_80DC8D0(u8 taskId)
+{
+    u8 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        u8 r3 = i * 4;
+
+        if (gTasks[taskId].data[r3 + 0] != 0xFF)
+        {
+            if (++gTasks[taskId].data[r3 + 2] > 2)
+            {
+                gTasks[taskId].data[r3 + 2] = 0;
+
+                if (gTasks[taskId].data[r3 + 1] == 0)
+                    gTasks[taskId].data[r3 + 0]++;
+                else
+                    gTasks[taskId].data[r3 + 0]--;
+
+                if (gTasks[taskId].data[r3 + 0] == 16
+                 || gTasks[taskId].data[r3 + 0] == 0)
+                    gTasks[taskId].data[r3 + 1] ^= 1;
+
+                BlendPalette((i + 5) * 16 + 10, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18));
+                BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18));
+            }
+        }
+    }
+}
+
+static void sub_80DC9B4(u8 a)
+{
+    if (sContestantStatus[a].hasJudgesAttention)
+        sub_80DC630(a);
+    else
+        sub_80DC674(a);
+}
+
+static u8 sub_80DC9EC(u8 a)
+{
+    u8 spriteId1, spriteId2;
+    u8 x = gUnknown_02039F26[a] * 40 + 32;
+
+    LoadCompressedSpriteSheet(&gUnknown_08589904[a]);
+    LoadSpritePalette(&gUnknown_08589924[a]);
+    spriteId1 = CreateSprite(&gSpriteTemplate_858998C[a], 184, x, 29);
+    spriteId2 = CreateSprite(&gSpriteTemplate_858998C[a], 248, x, 29);
+    gSprites[spriteId2].oam.tileNum += 64;
+
+    CopySpriteTiles(0,
+                    3,
+                    (void *)VRAM,
+                    (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x26),
+                    gContestResources->field_34);
+
+    CopySpriteTiles(0,
+                    3, (void *)VRAM,
+                    (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36),
+                    gContestResources->field_38);
+
+    CpuFill32(0, gContestResources->field_34 + 0x500, 0x300);
+    CpuFill32(0, gContestResources->field_38 + 0x500, 0x300);
+
+    RequestDma3Copy(gContestResources->field_34,
+                    (u8 *)(VRAM + 0x10000 + gSprites[spriteId1].oam.tileNum * 32),
+                    0x800,
+                    1);
+
+    RequestDma3Copy(gContestResources->field_38,
+                    (u8 *)(VRAM + 0x10000 + gSprites[spriteId2].oam.tileNum * 32),
+                    0x800,
+                    1);
+
+    gSprites[spriteId1].data[0] = spriteId2;
+    gSprites[spriteId2].data[0] = spriteId1;
+
+    gSprites[spriteId1].data[1] = a;
+    gSprites[spriteId2].data[1] = a;
+
+    return spriteId1;
+}
+
+static void sub_80DCB78(u8 spriteId)
+{
+    u8 spriteId2 = gSprites[spriteId].data[0];
+
+    FreeSpriteOamMatrix(&gSprites[spriteId2]);
+    DestroySprite(&gSprites[spriteId2]);
+    DestroySpriteAndFreeResources(&gSprites[spriteId]);
+}
+
+static void sub_80DCBB4(void)
+{
+    SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND);
+    SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(7, 9));
+}
+
+static void sub_80DCBD0(void)
+{
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+}
+
+static void sub_80DCBE8(u8 a, bool8 b)
+{
+    u8 r5;
+
+    sub_80DCBB4();
+    gContestResources->field_14[gSprites[a].data[1]].unk2_1 = 1;
+    r5 = gSprites[a].data[0];
+    StartSpriteAffineAnim(&gSprites[a], 1);
+    StartSpriteAffineAnim(&gSprites[r5], 1);
+    gSprites[a].callback = sub_80DCC84;
+    gSprites[r5].callback = SpriteCallbackDummy;
+    if (b == FALSE)
+        PlaySE(SE_C_PIKON);
+    else
+        PlaySE(SE_PC_LOGIN);
+}
+
+static void sub_80DCC84(struct Sprite *sprite)
+{
+    if (sprite->affineAnimEnded)
+    {
+        u8 r1 = sprite->data[0];
+
+        if (gSprites[r1].affineAnimEnded)
+        {
+            sprite->invisible = TRUE;
+            gSprites[r1].invisible = TRUE;
+            sprite->callback = sub_80DCCD8;
+        }
+    }
+}
+
+static void sub_80DCCD8(struct Sprite *sprite)
+{
+    gContestResources->field_14[sprite->data[1]].unk2_1 = 0;
+    sub_80DCB78(sprite->data[0]);
+    sub_80DCBD0();
+}
+
+static void sub_80DCD08(void)
+{
+    if(gHeap[0x1A000] == 1)
+        gHeap[0x1A000] = 0;
+    else
+        gHeap[0x1A000] = 1;
+
+    if(gHeap[0x1A000] == 0)
+    {
+        sub_80DAEA4();
+        sub_80DB2BC();
+    }
+    else
+    {
+        sub_80DCD48();
+    }
+}
+
+static void sub_80DCD48(void)
+{
+    u8 i;
+    s16 value;
+    u8 *txtPtr;
+    u8 text[8];
+
+    if (gUnknown_020322D5 == 0)
+        return;
+
+    switch (gHeap[0x1A000])
+    {
+    case 0:
+        break;
+    case 2:
+    case 3:
+        sub_80DF750();
+        break;
+    default:
+        for (i = 0; i < 4; i++)
+            FillWindowPixelBuffer(i, 0);
+        for (i = 0; i < 4; i++)
+        {
+            value = sContestantStatus[i].unk4;
+            txtPtr = text;
+            if (sContestantStatus[i].unk4 < 0)
+            {
+                value *= -1;
+                txtPtr = StringCopy(txtPtr, gText_OneDash);
+            }
+            ConvertIntToDecimalStringN(txtPtr, value, STR_CONV_MODE_LEFT_ALIGN, 4);
+            Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text, 55, 1, 7);
+        }
+        for (i = 0; i < 4; i++)
+        {
+            value = sContestantStatus[i].appeal2;
+            txtPtr = text;
+            if (sContestantStatus[i].appeal2 < 0)
+            {
+                value *= -1;
+                txtPtr = StringCopy(txtPtr, gText_OneDash);
+            }
+            ConvertIntToDecimalStringN(txtPtr, value, STR_CONV_MODE_LEFT_ALIGN, 4);
+            Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text, 5, 1, 7);
+        }
+        sub_80DB2BC();
+        break;
+    }
+}
+
+void sub_80DCE58(u8 a)
+{
+    u8 sp0[4];
+    u16 sp4[4] = {0};
+    s32 i;
+    s32 r2;
+    s32 r4;
+
+    for (i = 0; i < 4; i++)
+    {
+        sp4[i] = Random();
+        for (r2 = 0; r2 < i; r2++)
+        {
+            if (sp4[i] == sp4[r2])
+            {
+                i--;
+                break;
+            }
+        }
+    }
+
+    if (a == 0)
+    {
+        for (i = 0; i < 4; i++)
+        {
+            gUnknown_02039F26[i] = i;
+            for (r4 = 0; r4 < i; r4++)
+            {
+                if (gContestMonConditions[gUnknown_02039F26[r4]] < gContestMonConditions[i]
+                 || (gContestMonConditions[gUnknown_02039F26[r4]] == gContestMonConditions[i] && sp4[gUnknown_02039F26[r4]] < sp4[i]))
+                {
+                    for (r2 = i; r2 > r4; r2--)
+                        gUnknown_02039F26[r2] = gUnknown_02039F26[r2 - 1];
+                    gUnknown_02039F26[r4] = i;
+                    break;
+                }
+            }
+            if (r4 == i)
+                gUnknown_02039F26[i] = i;
+        }
+        memcpy(sp0, gUnknown_02039F26, sizeof(sp0));
+        for (i = 0; i < 4; i++)
+            gUnknown_02039F26[sp0[i]] = i;
+    }
+    else
+    {
+        memset(sp0, 0xFF, sizeof(sp0));
+        for (i = 0; i < 4; i++)
+        {
+            u8 r2 = sContestantStatus[i].unkB_0;
+
+            while (1)
+            {
+                u8 *ptr = &sp0[r2];
+                if (*ptr == 0xFF)
+                {
+                    *ptr = i;
+                    gUnknown_02039F26[i] = r2;
+                    break;
+                }
+                r2++;
+            }
+        }
+        for (i = 0; i < 3; i++)
+        {
+            for (r4 = 3; r4 > i; r4--)
+            {
+                if (sContestantStatus[r4 - 1].unkB_0 == sContestantStatus[r4].unkB_0
+                 && gUnknown_02039F26[r4 - 1] < gUnknown_02039F26[r4]
+                 && sp4[r4 - 1] < sp4[r4])
+                {
+                    u8 temp = gUnknown_02039F26[r4];
+
+                    gUnknown_02039F26[r4] = gUnknown_02039F26[r4 - 1];
+                    gUnknown_02039F26[r4 - 1] = temp;
+                }
+            }
+        }
+    }
+}
+
+static void sub_80DD04C(void)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        LoadPalette(&gHeap[0x1A004] + (i + 5) * 32, (gUnknown_02039F26[i] + 5) * 16, 32);
+    }
+    sub_80DAEA4();
+}
+
+static void sub_80DD080(u8 contestant)
+{
+    u16 move;
+    u8 effect;
+    u8 rnd;
+    bool8 r8;
+    s32 i;
+
+    sContestantStatus[contestant].appeal2 = 0;
+    sContestantStatus[contestant].appeal1 = 0;
+    r8 = sub_80DBA68(contestant);
+    if (!r8)
+        return;
+
+    move = sContestantStatus[contestant].currMove;
+    effect = gContestMoves[move].effect;
+
+    sContestantStatus[contestant].moveCategory = gContestMoves[sContestantStatus[contestant].currMove].contestCategory;
+    if (sContestantStatus[contestant].currMove == sContestantStatus[contestant].prevMove && sContestantStatus[contestant].currMove != MOVE_NONE)
+    {
+        sContestantStatus[contestant].disappointedRepeat = TRUE;
+        sContestantStatus[contestant].moveRepeatCount++;
+    }
+    else
+    {
+        sContestantStatus[contestant].moveRepeatCount = 0;
+    }
+    sContestantStatus[contestant].appeal1 = gContestEffects[effect].appeal;
+    sContestantStatus[contestant].appeal2 = sContestantStatus[contestant].appeal1;
+    shared192D0.jam = gContestEffects[effect].jam;
+    shared192D0.jam2 = shared192D0.jam;
+
+    shared192D0.contestant = contestant;
+    for (i = 0; i < 4; i++)
+    {
+        sContestantStatus[i].jam = 0;
+        shared192D0.unnervedPokes[i] = 0;
+    }
+
+    if (sContestantStatus[contestant].hasJudgesAttention
+        && !AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove))
+        sContestantStatus[contestant].hasJudgesAttention = 0;
+
+    gContestEffectFuncs[effect]();
+
+    if (sContestantStatus[contestant].conditionMod == 1)
+        sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition - 10;
+    else if (sContestantStatus[contestant].appealTripleCondition)
+        sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition * 3;
+    else
+        sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition;
+
+    sContestantStatus[contestant].unk16 = 0;
+    sContestantStatus[contestant].unk15_6 = 0;
+    if (sub_80DE1E8(contestant))
+    {
+        u8 r2 = AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove);
+
+        if (r2 != 0 && sContestantStatus[contestant].hasJudgesAttention)
+        {
+            sContestantStatus[contestant].unk16 = r2;
+            sContestantStatus[contestant].unk15_6 = 1;
+            sContestantStatus[contestant].hasJudgesAttention = 0;
+            sContestantStatus[contestant].unk17 = sContestantStatus[contestant].appeal1 * sContestantStatus[contestant].unk16;
+            sContestantStatus[contestant].unk15_3 = 1;
+        }
+        else
+        {
+            if (gContestMoves[sContestantStatus[contestant].currMove].comboStarterId != 0)
+            {
+                sContestantStatus[contestant].hasJudgesAttention = 1;
+                sContestantStatus[contestant].unk15_6 = 1;
+            }
+            else
+            {
+                sContestantStatus[contestant].hasJudgesAttention = 0;
+            }
+        }
+    }
+    if (sContestantStatus[contestant].disappointedRepeat)
+        sContestantStatus[contestant].unk18 = (sContestantStatus[contestant].moveRepeatCount + 1) * 10;
+
+    if (sContestantStatus[contestant].nervous)
+    {
+        sContestantStatus[contestant].hasJudgesAttention = 0;
+        sContestantStatus[contestant].appeal2 = 0;
+        sContestantStatus[contestant].appeal1 = 0;
+    }
+    shared19328.bits_0 = Contest_GetMoveExcitement(sContestantStatus[contestant].currMove);
+    if (sContestantStatus[contestant].overrideCategoryExcitementMod)
+        shared19328.bits_0 = 1;
+
+    if (shared19328.bits_0 > 0)
+    {
+        if (sContest.applauseLevel + shared19328.bits_0 > 4)
+            shared19328.unk2 = 60;
+        else
+            shared19328.unk2 = 10;
+    }
+    else
+    {
+        shared19328.unk2 = 0;
+    }
+
+    rnd = Random() % 3;
+    for (i = 0; i < 4; i++)
+    {
+        if (i != contestant)
+        {
+            if (rnd == 0)
+                break;
+            rnd--;
+        }
+    }
+    sContestantStatus[contestant].unk1B = i;
+}
+
+void SetContestantEffectStringID(u8 a, u8 b)
+{
+    sContestantStatus[a].effectStringId = b;
+}
+
+void SetContestantEffectStringID2(u8 a, u8 b)
+{
+    sContestantStatus[a].effectStringId2 = b;
+}
+
+void SetStartledString(u8 contestant, u8 jam)
+{
+    if      (jam >= 60)
+        SetContestantEffectStringID(contestant, CONTEST_STRING_TRIPPED_OVER);
+    else if (jam >= 40)
+        SetContestantEffectStringID(contestant, CONTEST_STRING_LEAPT_UP);
+    else if (jam >= 30)
+        SetContestantEffectStringID(contestant, CONTEST_STRING_UTTER_CRY);
+    else if (jam >= 20)
+        SetContestantEffectStringID(contestant, CONTEST_STRING_TURNED_BACK);
+    else if (jam >= 10)
+        SetContestantEffectStringID(contestant, CONTEST_STRING_LOOKED_DOWN);
+}
+
+static void sub_80DD45C(u8 contestant, u8 stringId)
+{
+    StringCopy(gStringVar1, gContestMons[contestant].nickname);
+    StringCopy(gStringVar2, gMoveNames[sContestantStatus[contestant].currMove]);
+    if      (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL)
+        StringCopy(gStringVar3, gText_Contest_Shyness);
+    else if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY)
+        StringCopy(gStringVar3, gText_Contest_Anxiety);
+    else if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_CUTE)
+        StringCopy(gStringVar3, gText_Contest_Laziness);
+    else if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_SMART)
+        StringCopy(gStringVar3, gText_Contest_Hesitancy);
+    else
+        StringCopy(gStringVar3, gText_Contest_Fear);
+    StringExpandPlaceholders(gStringVar4, gUnknown_08587E10[stringId]);
+    sub_80DB89C();
+    Contest_StartTextPrinter(gStringVar4, 1);
+}
+
+void MakeContestantNervous(u8 p)
+{
+    sContestantStatus[p].nervous = 1;
+    sContestantStatus[p].currMove = MOVE_NONE;
+}
+
+static void sub_80DD590(void)
+{
+    u8 r12 = 0;
+    s32 i;
+    s32 j;
+    u8 sp0[4];
+    u8 sp4[4];
+
+    for (i = 0; i < 4; i++)
+    {
+        sp0[i] = gUnknown_02039F26[i];
+        sp4[i] = 0;
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        for (j = 0; j < 4; j++)
+        {
+            if (sContestantStatus[j].nextTurnOrder == i)
+            {
+                sp0[j] = i;
+                sp4[j] = 1;
+                break;
+            }
+        }
+        if (j == 4)
+        {
+            for (j = 0; j < 4; j++)
+            {
+                if (sp4[j] == 0 && sContestantStatus[j].nextTurnOrder == 0xFF)
+                {
+                    r12 = j;
+                    j++;
+                    break;
+                }
+            }
+            for (; j < 4; j++)
+            {
+                if (sp4[j] == 0 && sContestantStatus[j].nextTurnOrder == 0xFF
+                 && gUnknown_02039F26[r12] > gUnknown_02039F26[j])
+                    r12 = j;
+            }
+            sp0[r12] = i;
+            sp4[r12] = 1;
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        shared192D0.turnOrder[i] = sp0[i];
+        sContestantStatus[i].nextTurnOrder = 0xFF;
+        sContestantStatus[i].turnOrderMod = 0;
+        gUnknown_02039F26[i] = sp0[i];
+    }
+}
+
+static void sub_80DD6DC(struct Sprite *sprite)
+{
+    if (sprite->data[1]++ > 84)
+    {
+        sprite->data[1] = 0;
+        sprite->invisible = TRUE;
+        sprite->callback = SpriteCallbackDummy;
+        sContest.unk1920A_4 = 0;
+    }
+}
+
+static void sub_80DD720(u8 a)
+{
+    u8 spriteId = sContest.unk19216;
+
+    switch (a)
+    {
+    case 0:
+    case 1:
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0];
+        PlaySE(SE_HAZURE);
+        break;
+    case 2:
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 4;
+        PlaySE(SE_SEIKAI);
+        break;
+    case 3:
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 8;
+        PlaySE(SE_SEIKAI);
+        break;
+    case 4:
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12;
+        PlaySE(SE_TK_WARPIN);
+        break;
+    case 5:  // exactly the same as case 4
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12;
+        PlaySE(SE_TK_WARPIN);
+        break;
+    case 6:
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 16;
+        PlaySE(SE_TK_WARPIN);
+        break;
+    case 8:
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 24;
+        PlaySE(SE_W215);
+        break;
+    case 7:
+    default:
+        gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 20;
+        PlaySE(SE_TK_WARPIN);
+        break;
+    }
+    gSprites[spriteId].data[1] = 0;
+    gSprites[spriteId].invisible = FALSE;
+    gSprites[spriteId].callback = sub_80DD6DC;
+    sContest.unk1920A_4 = 1;
+}
+
+static void sub_80DD940(void)
+{
+    s32 i;
+
+    for (i = 0; i < 5; i++)
+    {
+        const u8 *src;
+
+        if (i < sContest.applauseLevel)
+            src = gContestApplauseMeterGfx + 64;
+        else
+            src = gContestApplauseMeterGfx;
+        CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32);
+        CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32);
+
+        if (sContest.applauseLevel > 4)
+            sub_80DDA20();
+    }
+}
+
+s8 Contest_GetMoveExcitement(u16 move)
+{
+    return gContestExcitementTable[gSpecialVar_ContestCategory][gContestMoves[move].contestCategory];
+}
+
+static u8 sub_80DDA20(void)
+{
+    u8 taskId = CreateTask(c3_08130B10, 10);
+
+    gTasks[taskId].data[1] = 1;
+    gTasks[taskId].data[2] = IndexOfSpritePaletteTag(0x0ABE2);
+    return taskId;
+}
+
+static void c3_08130B10(u8 taskId)
+{
+    if (++gTasks[taskId].data[0] == 1)
+    {
+        gTasks[taskId].data[0] = 0;
+        if (gTasks[taskId].data[3] == 0)
+            gTasks[taskId].data[4]++;
+        else
+            gTasks[taskId].data[4]--;
+        BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], RGB(31, 31, 31));
+        if (gTasks[taskId].data[4] == 0 || gTasks[taskId].data[4] == 16)
+        {
+            gTasks[taskId].data[3] ^= 1;
+            if (sContest.applauseLevel < 5)
+            {
+                BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, RGB(31, 0, 0));
+                DestroyTask(taskId);
+            }
+        }
+    }
+}
+
+static void sub_80DDB0C(void)
+{
+    CreateTask(sub_80DDB6C, 10);
+    gSprites[sContest.applauseMeterSpriteId].pos2.x = -70;
+    gSprites[sContest.applauseMeterSpriteId].invisible = FALSE;
+    sContest.unk1920A_6 = 1;
+}
+
+static void sub_80DDB6C(u8 taskId)
+{
+    struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId];
+
+    gTasks[taskId].data[10] += 1664;
+    sprite->pos2.x += gTasks[taskId].data[10] >> 8;
+    gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF;
+    if (sprite->pos2.x > 0)
+        sprite->pos2.x = 0;
+    if (sprite->pos2.x == 0)
+    {
+        sContest.unk1920A_6 = 0;
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_80DDBE8(void)
+{
+    if (gSprites[sContest.applauseMeterSpriteId].invisible == TRUE)
+    {
+        sContest.unk1920A_6 = 0;
+    }
+    else
+    {
+        CreateTask(task08_080CD1CC, 10);
+        gSprites[sContest.applauseMeterSpriteId].pos2.x = 0;
+        sContest.unk1920A_6 = 1;
+    }
+}
+
+static void task08_080CD1CC(u8 taskId)
+{
+    struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId];
+
+    gTasks[taskId].data[10] += 1664;
+    sprite->pos2.x -= gTasks[taskId].data[10] >> 8;
+    gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF;
+    if (sprite->pos2.x < -70)
+        sprite->pos2.x = -70;
+    if (sprite->pos2.x == -70)
+    {
+        sprite->invisible = TRUE;
+        sContest.unk1920A_6 = 0;
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_80DDCDC(s8 a)
+{
+    u8 taskId = CreateTask(sub_80DDD20, 5);
+
+    gTasks[taskId].data[0] = a;
+    sContest.unk1920A_5 = 1;
+}
+
+static void sub_80DDD20(u8 taskId)
+{
+    switch (gTasks[taskId].data[10])
+    {
+    case 0:
+        sub_80DDB0C();
+        gTasks[taskId].data[10]++;
+        break;
+    case 1:
+        if (!sContest.unk1920A_6)
+        {
+            gTasks[taskId].data[10]++;
+        }
+        break;
+    case 2:
+        if (gTasks[taskId].data[11]++ > 20)
+        {
+            gTasks[taskId].data[11] = 0;
+            sub_80DD940();
+            sContest.unk1920A_5 = 0;
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+void unref_sub_80DDDA8(void)
+{
+    gSprites[sContest.applauseMeterSpriteId].pos2.x = 0;
+    gSprites[sContest.applauseMeterSpriteId].invisible = FALSE;
+}
+
+void unref_sub_80DDDE4(void)
+{
+    gSprites[sContest.applauseMeterSpriteId].invisible = TRUE;
+}
+
+static void sub_80DDE0C(void)
+{
+    CreateTask(sub_80DDE30, 15);
+    sContest.unk1920A_7 = 1;
+}
+
+static void sub_80DDE30(u8 taskId)
+{
+    if (gTasks[taskId].data[10]++ > 6)
+    {
+        gTasks[taskId].data[10] = 0;
+        if (gTasks[taskId].data[11] == 0)
+        {
+            RequestDma3Copy(shared16800, (void *)(VRAM + 0x2000), 0x1000, 1);
+        }
+        else
+        {
+            RequestDma3Copy(shared15800, (void *)(VRAM + 0x2000), 0x1000, 1);
+            gTasks[taskId].data[12]++;
+        }
+
+        gTasks[taskId].data[11] ^= 1;
+
+        if (gTasks[taskId].data[12] == 9)
+        {
+            sContest.unk1920A_7 = 0;
+            DestroyTask(taskId);
+        }
+    }
+}
+
+#define tBlendColor data[0]
+#define tBlendCoeff data[1]
+
+static void sub_80DDED0(s8 a, s8 b)
+{
+    u8 taskId = CreateTask(sub_80DDF80, 10);
+    u16 blendColor;
+    u8 blendCoeff;
+    u8 r3;
+
+    if (a > 0)
+    {
+        blendColor = RGB(30, 27, 8);
+        if (b > 0)
+        {
+            blendCoeff = 0;
+            r3 = sContest.applauseLevel * 3;
+        }
+        else
+        {
+            blendCoeff = sContest.applauseLevel * 3;
+            r3 = 0;
+        }
+    }
+    else
+    {
+        blendColor = 0;
+        if (b > 0)
+        {
+            blendCoeff = 0;
+            r3 = 12;
+        }
+        else
+        {
+            blendCoeff = 12;
+            r3 = 0;
+        }
+    }
+    gTasks[taskId].tBlendColor = blendColor;
+    gTasks[taskId].tBlendCoeff = blendCoeff;
+    gTasks[taskId].data[2] = b;
+    gTasks[taskId].data[3] = r3;
+    sContest.unk1920B_0 = 0;
+}
+
+static void sub_80DDF80(u8 taskId)
+{
+    if (gTasks[taskId].data[10]++ >= 0)
+    {
+        gTasks[taskId].data[10] = 0;
+        if (gTasks[taskId].data[2] > 0)
+            gTasks[taskId].tBlendCoeff++;
+        else
+            gTasks[taskId].tBlendCoeff--;
+        BlendPalette(17, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
+        BlendPalette(26, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
+        if (gTasks[taskId].tBlendCoeff == gTasks[taskId].data[3])
+        {
+            DestroyTask(taskId);
+            sContest.unk1920B_0 = 0;
+        }
+    }
+}
+
+#undef tBlendColor
+#undef tBlendCoeff
+
+static void sub_80DE008(bool8 a)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (sContestantStatus[i].turnOrderMod != 0 && a)
+        {
+            CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32);
+            gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]];
+            gSprites[gContestResources->field_14[i].unk1].invisible = FALSE;
+        }
+        else
+        {
+            gSprites[gContestResources->field_14[i].unk1].invisible = TRUE;
+        }
+    }
+}
+
+static const u8 *GetTurnOrderNumberGfx(u8 contestant)
+{
+    if (sContestantStatus[contestant].turnOrderMod != 1)
+        return gContestNextTurnRandomGfx;
+    else
+        return gContestNextTurnNumbersGfx + sContestantStatus[contestant].nextTurnOrder * 32;
+}
+
+static void sub_80DE12C(void)
+{
+    s32 r7 = 0;
+    u8 r10 = 2;
+    u8 r8 = 1;
+    u8 r9 = 0x11;
+
+    for (r7 = 0; r7 < 4; r7++)
+    {
+        if (shared192D0.unnervedPokes[r7] != 0 && !Contest_IsMonsTurnDisabled(r7))
+        {
+            u32 r6 = gUnknown_02039F26[r7] * 5 + 2;
+            u16 var = sub_80DB748(3);
+
+            ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6, r10, r8, r9, r8);
+            var += 16;
+            ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6 + 1, r10, r8, r9, r8);
+            PlaySE(SE_C_PASI);
+        }
+    }
+}
+
+bool8 sub_80DE1E8(u8 a)
+{
+    if (sContestantStatus[a].disappointedRepeat || sContestantStatus[a].nervous)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+static void sub_80DE224(void)
+{
+    s32 i;
+    u16 bg0Cnt, bg1Cnt, bg2Cnt;
+
+    bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT);
+    ((vBgCnt *)&bg1Cnt)->priority = 0;
+    ((vBgCnt *)&bg1Cnt)->screenSize = 2;
+    ((vBgCnt *)&bg1Cnt)->areaOverflowMode = 0;
+    ((vBgCnt *)&bg1Cnt)->charBaseBlock = 0;
+
+    SetGpuReg(REG_OFFSET_BG1CNT, bg1Cnt);
+
+    bg0Cnt = GetGpuReg(REG_OFFSET_BG0CNT);
+    bg2Cnt = GetGpuReg(REG_OFFSET_BG2CNT);
+    ((vBgCnt *)&bg0Cnt)->priority = 1;
+    ((vBgCnt *)&bg2Cnt)->priority = 1;
+
+    SetGpuReg(REG_OFFSET_BG0CNT, bg0Cnt);
+    SetGpuReg(REG_OFFSET_BG2CNT, bg2Cnt);
+
+    gBattle_BG1_X = DISPLAY_WIDTH;
+    gBattle_BG1_Y = DISPLAY_HEIGHT;
+    SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
+    SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
+
+    CpuFill32(0, gContestResources->field_24[1], 0x1000);
+
+    CopyToBgTilemapBuffer(1, gUnknown_08C17980, 0, 0);
+    Contest_SetBgCopyFlags(1);
+
+    for (i = 0; i < 4; i++)
+    {
+        gSprites[gContestResources->field_14[i].unk0].oam.priority = 1;
+        gSprites[gContestResources->field_14[i].unk1].oam.priority = 1;
+    }
+}
+
+static void sub_80DE350(void)
+{
+    s32 i;
+    u16 bg1Cnt;
+
+    RequestDma3Fill(0,(void *)(VRAM + 0x8000), 0x2000, 0x1);
+    CpuFill32(0, gContestResources->field_24[1], 0x1000);
+    Contest_SetBgCopyFlags(1);
+    bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT);
+    ((vBgCnt *) &bg1Cnt)->priority = 1;
+    ((vBgCnt *) &bg1Cnt)->screenSize = 0;
+    ((vBgCnt *) &bg1Cnt)->areaOverflowMode = 0;
+    ((vBgCnt *) &bg1Cnt)->charBaseBlock = 2;
+
+    SetGpuReg(REG_OFFSET_BG1CNT, bg1Cnt);
+
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        gSprites[gContestResources->field_14[i].unk0].oam.priority = 0;
+        gSprites[gContestResources->field_14[i].unk1].oam.priority = 0;
+    }
+}
+
+static void sub_80DE424(u8 taskId)
+{
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = DISPLAY_HEIGHT;
+    PlaySE12WithPanning(SE_C_MAKU_D, 0);
+    gTasks[taskId].func = sub_80DE464;
+}
+
+static void sub_80DE464(u8 taskId)
+{
+    if ((s16)(gBattle_BG1_Y -= 7) < 0)
+        gBattle_BG1_Y = 0;
+    if (gBattle_BG1_Y == 0)
+    {
+        gTasks[taskId].data[0] = 0;
+        gTasks[taskId].data[1] = 0;
+        gTasks[taskId].data[2] = 0;
+        gTasks[taskId].func = sub_80DE4A8;
+    }
+}
+
+static void sub_80DE4A8(u8 taskId)
+{
+    s32 i;
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        for (i = 0; i < 4; i++)
+            sContest.unk19218[i] = gUnknown_02039F26[i];
+        sub_80DBF90();
+        sub_80DC864();
+        sub_80DB69C();
+        sub_80DD04C();
+        sub_80DE008(TRUE);
+        sub_80DC44C();
+        gTasks[taskId].data[0] = 1;
+        break;
+    case 1:
+        if (gIsLinkContest & 1)
+        {
+            u8 taskId2;
+
+            sContest.unk1920B_2 = 1;
+            if (sub_80DA8A4())
+                sub_80DBAA0();
+            taskId2 = CreateTask(sub_80FCC88, 0);
+            SetTaskFuncWithFollowupFunc(taskId2, sub_80FCC88, sub_80DA110);
+            sub_80DBF68();
+            gTasks[taskId].data[0] = 2;
+        }
+        else
+        {
+            sub_80DBAA0();
+            gTasks[taskId].data[0] = 3;
+        }
+        break;
+    case 2:
+        if (!sContest.unk1920B_2)
+            gTasks[taskId].data[0] = 3;
+        break;
+    case 3:
+        sub_80DB884();
+        sub_80DB2BC();
+        gTasks[taskId].data[0] = 0;
+        gTasks[taskId].func = sub_80DE5F4;
+        break;
+    }
+}
+
+static void sub_80DE5C0(u8 taskId)
+{
+    if ((s16)(gBattle_BG1_Y += 7) > DISPLAY_HEIGHT)
+        gTasks[taskId].func = sub_80DA4F4;
+}
+
+static void sub_80DE5F4(u8 taskId)
+{
+    if (gTasks[taskId].data[2] < 10)
+    {
+        gTasks[taskId].data[2]++;
+    }
+    else
+    {
+        if (gTasks[taskId].data[1] == 0)
+        {
+            if (gTasks[taskId].data[0] == 16)
+                gTasks[taskId].data[1]++;
+            else
+                gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            if (gTasks[taskId].data[0] == 0)
+            {
+                gTasks[taskId].data[1] = 0;
+                gTasks[taskId].data[2] = 0;
+                gTasks[taskId].func = sub_80DE65C;
+            }
+            else
+            {
+                gTasks[taskId].data[0]--;
+            }
+        }
+    }
+}
+
+static void sub_80DE65C(u8 taskId)
+{
+    if (gTasks[taskId].data[2] < 10)
+    {
+        gTasks[taskId].data[2]++;
+    }
+    else
+    {
+        gTasks[taskId].data[2] = 0;
+        PlaySE12WithPanning(SE_C_MAKU_U, 0);
+        gTasks[taskId].func = sub_80DE5C0;
+    }
+}
+
+static void sub_80DE69C(u8 a)
+{
+    s32 i;
+    u8 taskId;
+
+    for (i = 0; i < 4; i++)
+    {
+        gSprites[gContestResources->field_14[i].unk0].oam.matrixNum = AllocOamMatrix();
+        gSprites[gContestResources->field_14[i].unk0].oam.affineMode = 1;
+        StartSpriteAffineAnim(&gSprites[gContestResources->field_14[i].unk0], a);
+        if (a == 2)
+        {
+            AnimateSprite(&gSprites[gContestResources->field_14[i].unk0]);
+            gSprites[gContestResources->field_14[i].unk0].invisible = FALSE;
+        }
+    }
+    taskId = CreateTask(sub_80DE794, 5);
+    gTasks[taskId].data[0] = a;
+    sContest.unk1920B_1 = 1;
+}
+
+static void sub_80DE794(u8 taskId)
+{
+    s32 i;
+
+    if (gSprites[gContestResources->field_14[0].unk0].affineAnimEnded)
+    {
+        if ((u8)gTasks[taskId].data[0] == 1)
+        {
+            for (i = 0; i < 4; i++)
+                gSprites[gContestResources->field_14[i].unk0].invisible = TRUE;
+        }
+        for (i = 0; i < 4; i++)
+            FreeSpriteOamMatrix(&gSprites[gContestResources->field_14[i].unk0]);
+        sContest.unk1920B_1 = 0;
+        DestroyTask(taskId);
+    }
+}
+
+static u16 SanitizeMove(u16 move)
+{
+    if (move >= MOVES_COUNT)
+        move = MOVE_POUND;
+    return move;
+}
+
+static u16 SanitizeSpecies(u16 species)
+{
+    if (species >= NUM_SPECIES)
+        species = SPECIES_NONE;
+    return species;
+}
+
+static void sub_80DE864(u8 a)
+{
+    s32 i;
+    u16 move = SanitizeMove(sContestantStatus[a].currMove);
+    u16 species = SanitizeSpecies(gContestMons[a].species);
+    u8 r5_2;
+
+    memset(&gContestResources->field_18->species, 0, 0x14);
+    ClearBattleAnimationVars();
+    for (i = 0; i < 4; i++)
+        gBattleMonForms[i] = 0;
+    switch (move)
+    {
+    case MOVE_CURSE:
+        if (gBaseStats[species].type1 == TYPE_GHOST || gBaseStats[species].type2 == TYPE_GHOST)
+            gAnimMoveTurn = 0;
+        else
+            gAnimMoveTurn = 1;
+        break;
+    case MOVE_TRANSFORM:
+    case MOVE_ROLE_PLAY:
+        r5_2 = sContestantStatus[a].unk1B;
+        gContestResources->field_18->unk2 = SanitizeSpecies(gContestMons[r5_2].species);
+        gContestResources->field_18->unk10 = gContestMons[r5_2].personality;
+        gContestResources->field_18->unk4_0 = 1;
+        break;
+    case MOVE_RETURN:
+        gAnimFriendship = 0xFF;
+        break;
+    case MOVE_FRUSTRATION:
+        gAnimFriendship = 0;
+        break;
+    case MOVE_SOLAR_BEAM:
+    case MOVE_RAZOR_WIND:
+    case MOVE_SKULL_BASH:
+    case MOVE_SKY_ATTACK:
+        if (sContest.unk1925E == 0)
+        {
+            sContest.unk1925E = 2;
+            gAnimMoveTurn = 0;
+        }
+        else
+        {
+            gAnimMoveTurn = 1;
+        }
+        break;
+    }
+    sub_80DEA5C();
+}
+
+static void sub_80DE9B0(u8 unused)
+{
+    memset(&gContestResources->field_18->species, 0, 0x14);
+    if (sContest.unk1925E != 0)
+        sContest.unk1925E--;
+}
+
+static void sub_80DE9DC(u8 a)
+{
+    gContestResources->field_18->unk5 = a;
+    gContestResources->field_18->species = SanitizeSpecies(gContestMons[a].species);
+    gContestResources->field_18->unk8 = gContestMons[a].personality;
+    gContestResources->field_18->unkC = gContestMons[a].otId;
+}
+
+static void sub_80DEA20(void)
+{
+    gBattlerSpriteIds[3] = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
+    InitSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattlerTarget]]);
+    sub_80DEA5C();
+}
+
+static void sub_80DEA5C(void)
+{
+    struct Sprite *sprite = &gSprites[gBattlerSpriteIds[3]];
+
+    sprite->pos2.x = 0;
+    sprite->pos2.y = 0;
+    sprite->pos1.x = GetBattlerSpriteCoord(3, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(3, 1);
+    sprite->invisible = TRUE;
+}
+
+static void SelectContestMoveBankTarget(u16 move)
+{
+    switch (gBattleMoves[move].target)
+    {
+    case MOVE_TARGET_USER_OR_SELECTED:
+    case MOVE_TARGET_USER:
+        gBattlerTarget = 2;
+        break;
+    case MOVE_TARGET_SELECTED:
+    case MOVE_TARGET_RANDOM:
+    case MOVE_TARGET_BOTH:
+    case MOVE_TARGET_FOES_AND_ALLY:
+    default:
+        gBattlerTarget = 3;
+        break;
+    }
+}
+
+static void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b)
+{
+    struct TextPrinterTemplate printerTemplate;
+
+    printerTemplate.currentChar = b;
+    printerTemplate.windowId = a;
+    printerTemplate.fontId = 1;
+    printerTemplate.x = 0;
+    printerTemplate.y = 1;
+    printerTemplate.currentX = 0;
+    printerTemplate.currentY = 1;
+    printerTemplate.letterSpacing = 0;
+    printerTemplate.lineSpacing = 0;
+    printerTemplate.unk = 0;
+    printerTemplate.fgColor = 15;
+    printerTemplate.bgColor = 0;
+    printerTemplate.shadowColor = 8;
+
+    AddTextPrinter(&printerTemplate, 0, 0);
+    PutWindowTilemap(a);
+    Contest_SetBgCopyFlags(0);
+}
+
+void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s32 fontId)
+{
+    struct TextPrinterTemplate printerTemplate;
+
+    printerTemplate.currentChar = currChar;
+    printerTemplate.windowId = windowId;
+    printerTemplate.fontId = fontId;
+    printerTemplate.x = x;
+    printerTemplate.y = y;
+    printerTemplate.currentX = x;
+    printerTemplate.currentY = y;
+    printerTemplate.letterSpacing = 0;
+    printerTemplate.lineSpacing = 0;
+    printerTemplate.unk = 0;
+    printerTemplate.fgColor = 15;
+    printerTemplate.bgColor = 0;
+    printerTemplate.shadowColor = 8;
+
+    AddTextPrinter(&printerTemplate, 0, 0);
+    PutWindowTilemap(windowId);
+    Contest_SetBgCopyFlags(0);
+}
+
+static void Contest_StartTextPrinter(const u8 *currChar, bool32 b)
+{
+    struct TextPrinterTemplate printerTemplate;
+    u8 speed;
+
+    printerTemplate.currentChar = currChar;
+    printerTemplate.windowId = 4;
+    printerTemplate.fontId = 1;
+    printerTemplate.x = 0;
+    printerTemplate.y = 1;
+    printerTemplate.currentX = 0;
+    printerTemplate.currentY = 1;
+    printerTemplate.letterSpacing = 0;
+    printerTemplate.lineSpacing = 0;
+    printerTemplate.unk = 0;
+    printerTemplate.fgColor = 1;
+    printerTemplate.bgColor = 0;
+    printerTemplate.shadowColor = 8;
+
+    if (!b)
+    {
+        AddTextPrinter(&printerTemplate, 0, 0);
+    }
+    else
+    {
+        if (gIsLinkContest & 1)
+            speed = 4;
+        else
+            speed = GetPlayerTextSpeedDelay();
+        AddTextPrinter(&printerTemplate, speed, 0);
+    }
+
+    PutWindowTilemap(4);
+    Contest_SetBgCopyFlags(0);
+}
+
+static void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, s16 h)
+{
+    WriteSequenceToBgTilemapBuffer(a, b, c, d, e, f, g, h);
+    Contest_SetBgCopyFlags(a);
+}
+
+static void ContestBG_FillBoxWithTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g)
+{
+    ContestBG_FillBoxWithIncrementingTile(a, b, c, d, e, f, g, 0);
+}
+
+static bool32 Contest_RunTextPrinters(void)
+{
+    RunTextPrinters();
+    return IsTextPrinterActive(4);
+}
+
+static void Contest_SetBgCopyFlags(u32 var)
+{
+    sContestBgCopyFlags |= 1 << var;
+}
+
+void ResetContestLinkResults(void)
+{
+    s32 i;
+    s32 j;
+
+    for(i = 0; i < 5; i++)
+        for(j = 0; j < 4; j++)
+            gSaveBlock2Ptr->contestLinkResults[i][j] = 0;
+}
+
+bool8 sub_80DEDA8(u8 a)
+{
+    s32 i;
+    u8 r7 = Random() % 3;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (gContestFinalStandings[i] == 0)
+            break;
+    }
+    if (a == 0xFF && i != gContestPlayerMonIndex)
+        return FALSE;
+    switch (gSpecialVar_ContestCategory)
+    {
+    case CONTEST_CATEGORY_COOL:
+        r7 += 0;
+        break;
+    case CONTEST_CATEGORY_BEAUTY:
+        r7 += 3;
+        break;
+    case CONTEST_CATEGORY_CUTE:
+        r7 += 6;
+        break;
+    case CONTEST_CATEGORY_SMART:
+        r7 += 9;
+        break;
+    case CONTEST_CATEGORY_TOUGH:
+        r7 += 12;
+        break;
+    }
+    if (a != 0xFE)
+    {
+        u8 r4 = sub_80DEFA8(a, 1);
+
+        gSaveBlock1Ptr->contestWinners[r4].personality = gContestMons[i].personality;
+        gSaveBlock1Ptr->contestWinners[r4].species = gContestMons[i].species;
+        gSaveBlock1Ptr->contestWinners[r4].trainerId = gContestMons[i].otId;
+        StringCopy(gSaveBlock1Ptr->contestWinners[r4].monName, gContestMons[i].nickname);
+        StringCopy(gSaveBlock1Ptr->contestWinners[r4].trainerName, gContestMons[i].trainerName);
+        if(gIsLinkContest & 1)
+            gSaveBlock1Ptr->contestWinners[r4].contestRank = 4;
+        else
+            gSaveBlock1Ptr->contestWinners[r4].contestRank = gSpecialVar_ContestRank;
+
+        if (a != 0xFF)
+            gSaveBlock1Ptr->contestWinners[r4].contestCategory = gSpecialVar_ContestCategory;
+        else
+            gSaveBlock1Ptr->contestWinners[r4].contestCategory = r7;
+    }
+    else
+    {
+        gUnknown_02039F3C.personality = gContestMons[i].personality;
+        gUnknown_02039F3C.trainerId = gContestMons[i].otId;
+        gUnknown_02039F3C.species = gContestMons[i].species;
+        StringCopy(gUnknown_02039F3C.monName, gContestMons[i].nickname);
+        StringCopy(gUnknown_02039F3C.trainerName, gContestMons[i].trainerName);
+        gUnknown_02039F3C.contestCategory = r7;
+    }
+    return TRUE;
+}
+
+u8 sub_80DEFA8(u8 a, u8 b)
+{
+    s32 i;
+
+    switch (a)
+    {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+        if (b != 0)
+        {
+            for (i = 5; i >= 1; i--)
+                memcpy(&gSaveBlock1Ptr->contestWinners[i], &gSaveBlock1Ptr->contestWinners[i - 1], sizeof(struct ContestWinner));
+        }
+        return 0;
+    default:
+        switch (gSpecialVar_ContestCategory)
+        {
+        case CONTEST_CATEGORY_COOL:
+            return 8;
+        case CONTEST_CATEGORY_BEAUTY:
+            return 9;
+        case CONTEST_CATEGORY_CUTE:
+            return 10;
+        case CONTEST_CATEGORY_SMART:
+            return 11;
+        case CONTEST_CATEGORY_TOUGH:
+        default:
+            return 12;
+        }
+    }
+}
+
+void ClearContestWinnerPicsInContestHall(void)
+{
+    s32 i;
+
+    for (i = 0; i < 8; i++)
+        gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i];
+}
+
+// The functions below are probably related to Contests in TV.
+static void sub_80DF080(u8 contestant)
+{
+    s32 i;
+
+    if (!gContestResources->field_10->excitementFrozen
+        && gContestResources->field_10->bits_0 > 0
+        && !gContestResources->field_4[contestant].disappointedRepeat)
+    {
+        gContestResources->field_1c[contestant].unkC |= 1;
+        gContestResources->field_1c[contestant].unkE_2 = 1;
+    }
+
+    if (gContestResources->field_4[contestant].nervous)
+        gContestResources->field_1c[contestant].unkC |= 2;
+
+    if (!gContestResources->field_10->excitementFrozen
+        && gContestResources->field_10->bits_0 != 0
+        && gContestResources->field_10->unk2 == 60)
+    {
+        gContestResources->field_1c[contestant].unkC |= 4;
+    }
+
+    if (gContestResources->field_4[contestant].unk15_6
+        && gContestResources->field_4[contestant].unk16 != 0)
+    {
+        gContestResources->field_1c[contestant].unkC |= 8;
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        if (i != contestant && gContestResources->field_4[i].jam != 0)
+        {
+            gContestResources->field_1c[contestant].unkC |= 0x10;
+            gContestResources->field_1c[i].unkC |= 0x40;
+        }
+    }
+
+    if (gContestResources->field_4[contestant].numTurnsSkipped != 0
+        || gContestResources->field_4[contestant].noMoreTurns)
+    {
+        gContestResources->field_1c[contestant].unkC |= 0x20;
+    }
+    else if (!gContestResources->field_4[contestant].nervous)
+    {
+        gContestResources->field_1c[contestant].unkC |= 0x80;
+        gContestResources->field_1c[contestant].unkE_1 = 1;
+        gContestResources->field_1c[contestant].unk0[gContestResources->field_0->turnNumber] = gContestResources->field_4[contestant].currMove;
+    }
+
+    if (gContestResources->field_4[contestant].disappointedRepeat)
+        gContestResources->field_1c[contestant].unkD |= 2;
+
+    if (gContestResources->field_0->applauseLevel == 4
+        && !gContestResources->field_10->excitementFrozen
+        && gContestResources->field_10->bits_0 < 0)
+    {
+        gContestResources->field_1c[contestant].unkD |= 0x20;
+    }
+}
+
+static void sub_80DF250(void)
+{
+    u8 r1;
+    s32 i, j;
+    bool32 r12, r8;
+    u16 sp0[6];
+    u8 spC[6];
+    u16 sp14[5];
+    u8 var_38;
+    u8 r3;
+    u8 count;
+
+    r1 = 0;
+    var_38 = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (gContestFinalStandings[i] == 0)
+            var_38 = i;
+        else if (gContestFinalStandings[i] == 3)
+            r1 = i;
+    }
+
+    gContestResources->field_1c[r1].unkD |= 1;
+    for (i = 0; i < 4; i++)
+    {
+        if (i != var_38 && gUnknown_02039F08[var_38] - gUnknown_02039F08[i] <= 50)
+            gContestResources->field_1c[i].unkD |= 4;
+
+        if (!gContestResources->field_1c[i].unkE_2)
+            gContestResources->field_1c[i].unkD |= 8;
+
+        for (j = 0; j < 4; j++)
+        {
+            if (gContestMonConditions[i] < gContestMonConditions[j])
+                break;
+        }
+        if (j == 4 && gContestFinalStandings[i] != 0)
+            gContestResources->field_1c[i].unkD |= 0x10;
+
+        r12 = FALSE;
+        r8 = FALSE;
+        for (j = 0; j < 4; j++)
+        {
+            if (gContestMonConditions[i] > gContestMonConditions[j])
+                r12 = TRUE;
+            if (gUnknown_02039F18[i] > gUnknown_02039F18[j])
+                r8 = TRUE;
+        }
+        if (!r12 && !r8)
+            gContestResources->field_1c[i].unkD |= 0x40;
+
+        if (!gContestResources->field_1c[i].unkE_1)
+            gContestResources->field_1c[i].unkD |= 0x80;
+    }
+
+    for (i = 0; i < 5; i++)
+    {
+        sp0[i] = 0;
+        spC[i] = 0;
+    }
+    sp0[5] = 0xFFFF;
+    spC[5] = 0;
+
+    for (i = 0; i < 5; i++)
+    {
+        if (gContestResources->field_1c[var_38].unk0[i] != 0)
+        {
+            for (j = 0; j < 5; j++)
+            {
+                if (gContestResources->field_1c[var_38].unk0[i] != sp0[j])
+                {
+                    if (sp0[j] == 0)
+                    {
+                        sp0[j] = gContestResources->field_1c[var_38].unk0[i];
+                        spC[j]++;
+                    }
+                }
+                else
+                {
+                    spC[j]++;
+                }
+            }
+        }
+    }
+
+    sp14[0] = sp0[0];
+    r3 = spC[0];
+    count = 0;
+    for (i = 1; sp0[i] != 0xFFFF; i++)
+    {
+        if (r3 < spC[i])
+        {
+            sp14[0] = sp0[i];
+            r3 = spC[i];
+            count = 1;
+        }
+        else if (r3 == spC[i])
+        {
+            sp14[count] = sp0[i];
+            count++;
+        }
+    }
+
+    gContestResources->field_1c[var_38].unkA = sp14[Random() % count];
+}
+
+static void sub_80DF4F8(void)
+{
+    s32 i;
+    u32 bits;
+    u8 r7;
+    u8 r9, r10;
+    u8 count;
+    u8 r5;
+    u8 r2;
+    u16 var;
+    u8 r4;
+    u8 r6;
+    u8 sp0[4];
+
+    if (gContestFinalStandings[gContestPlayerMonIndex] != 0)
+        return;
+
+    r7 = 0;
+    for (i = 0; i < 4; i++)
+    {
+        if (gContestFinalStandings[i] == 0)
+            r7 = i;
+    }
+
+    r9 = 0;
+    r10 = 0;
+    for (i = 0; i < 4; i++)
+    {
+        if (gContestMonConditions[r7] < gContestMonConditions[i])
+            r9++;
+        if (gUnknown_02039F18[r7] < gUnknown_02039F18[i])
+            r10++;
+    }
+
+    bits = gContestResources->field_1c[r7].unkC;
+    count = 0;
+    for (i = 0; i < 8; bits >>= 1, i++)
+    {
+        if (bits & 1)
+            count++;
+    }
+
+    r5 = Random() % count;
+    bits = gContestResources->field_1c[r7].unkC;
+    count = 0;
+    r2 = 0;
+    for (i = 0; i < 8; bits >>= 1, r2++, i++)
+    {
+        if (!(bits & 1))
+            continue;
+        if (r5 == count)
+            break;
+        count++;
+    }
+
+    var = 1 << r2;
+    if (r7 == 0)
+    {
+        sp0[0] = 1;
+        r4 = gContestResources->field_1c[1].unkD;
+        i = 2;
+    }
+    else
+    {
+        sp0[0] = 0;
+        r4 = gContestResources->field_1c[0].unkD;
+        i = 1;
+    }
+
+    r5 = 1;
+    for (; i < 4; i++)
+    {
+        if (i != r7)
+        {
+            if (r4 < gContestResources->field_1c[i].unkD)
+            {
+                sp0[0] = i;
+                r4 = gContestResources->field_1c[i].unkD;
+                r5 = 1;
+            }
+            else if (r4 == gContestResources->field_1c[i].unkD)
+            {
+                sp0[r5] = i;
+                r5++;
+            }
+        }
+    }
+
+    r6 = sp0[Random() % r5];
+    r2 = 0x80;
+    for (i = 0; i < 8; r2 >>= 1, i++)
+    {
+        r4 = gContestResources->field_1c[r6].unkD & r2;
+        if (r4)
+            break;
+    }
+
+    ContestLiveUpdates_BeforeInterview_1(r9);
+    ContestLiveUpdates_BeforeInterview_2(r10);
+    ContestLiveUpdates_BeforeInterview_3(var);
+    ContestLiveUpdates_BeforeInterview_4(gContestResources->field_1c[r7].unkA);
+    ContestLiveUpdates_BeforeInterview_5(r4, r6);
+}
+
+// Unused
+void sub_80DF704(u8 arg0)
+{
+    if (gHeap[0x1A000] == 0)
+    {
+        if (arg0 == 0)
+            gHeap[0x1A000] = 2;
+        else
+            gHeap[0x1A000] = 3;
+    }
+    else
+    {
+        gHeap[0x1A000] = 0;
+    }
+
+    if (gHeap[0x1A000] == 0)
+    {
+        sub_80DAEA4();
+        sub_80DB2BC();
+    }
+    else
+    {
+        sub_80DF750();
+    }
+}
+
+static void sub_80DF750(void)
+{
+    u8 i;
+    s8 j;
+    u8 text1[20];
+    u8 text2[20];
+    u8 *txtPtr;
+    u32 bits;
+
+    if (gUnknown_020322D5 == 0)
+        return;
+    if (gHeap[0x1A000] != 2 && gHeap[0x1A000] != 3)
+        return;
+
+    for (i = 0; i < 4; i++)
+        FillWindowPixelBuffer(i, 0);
+
+    if (gHeap[0x1A000] == 2)
+    {
+        for (i = 0; i < 4; i++)
+        {
+            txtPtr = StringCopy(text1, gText_CDot);
+            Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text1, 5, 1, 7);
+            bits = gContestResources->field_1c[i].unkC;
+            for (j = 7; j > -1; j--) // Weird loop.
+            {
+                txtPtr = ConvertIntToDecimalStringN(txtPtr, bits & 1, STR_CONV_MODE_LEFT_ALIGN, 1);
+                bits >>= 1;
+            }
+
+            for (j = 0; j < 5; j++)
+                text2[j] = text1[j];
+
+            text2[j] = EOS;
+            Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text2, 5, 1, 7);
+            Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text1 + j, 55, 1, 7);
+        }
+    }
+    else
+    {
+        for (i = 0; i < 4; i++)
+        {
+            StringCopy(text1, gText_BDot);
+            bits = gContestResources->field_1c[i].unkD;
+            txtPtr = &text1[2];
+            for (j = 7; j > -1; j--) // Weird loop.
+            {
+                txtPtr = ConvertIntToDecimalStringN(txtPtr, bits & 1, STR_CONV_MODE_LEFT_ALIGN, 1);
+                bits >>= 1;
+            }
+
+            for (j = 0; j < 5; j++)
+                text2[j] = text1[j];
+
+            text2[j] = EOS;
+            Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text2, 5, 1, 7);
+            Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text1 + j, 55, 1, 7);
+        }
+    }
+    sub_80DB2BC();
+}
+
+static u8 sub_80DF940(u8 *nickname)
+{
+    u8 ret = GAME_LANGUAGE;
+
+    if (nickname[0] == EXT_CTRL_CODE_BEGIN && nickname[1] == EXT_CTRL_CODE_JPN)
+        return LANGUAGE_ENGLISH;
+
+    if (StringLength(nickname) < 6)
+    {
+        while (*nickname != EOS)
+        {
+            if ((*nickname >= CHAR_A && *nickname <= CHAR_z)
+                || (*nickname >= CHAR_0 && *nickname <= CHAR_9)
+                || *nickname == CHAR_SPACE
+                || *nickname == CHAR_PERIOD
+                || *nickname == CHAR_COMMA
+                || *nickname == CHAR_EXCL_MARK
+                || *nickname == CHAR_QUESTION_MARK
+                || *nickname == CHAR_MALE
+                || *nickname == CHAR_FEMALE
+                || *nickname == CHAR_SLASH
+                || *nickname == CHAR_HYPHEN
+                || *nickname == CHAR_ELLIPSIS
+                || *nickname == CHAR_DBL_QUOT_LEFT
+                || *nickname == CHAR_DBL_QUOT_RIGHT
+                || *nickname == CHAR_SGL_QUOT_LEFT
+                || *nickname == CHAR_DBL_QUOT_LEFT) // Most likely a typo, CHAR_SGL_QUOT_RIGHT should be here instead.
+            {
+                nickname++;
+            }
+            else
+            {
+                ret = LANGUAGE_JAPANESE;
+                break;
+            }
+        }
+    }
+
+    return ret;
+}
+
+static void sub_80DF9D4(u8 *playerName)
+{
+    u8 chr = playerName[5];
+
+    playerName[5] = EOS;
+    playerName[PLAYER_NAME_LENGTH] = chr;
+}
+
+static void sub_80DF9E0(u8 *monName, s32 language)
+{
+    u8 chr;
+
+    StripExtCtrlCodes(monName);
+    if (language == LANGUAGE_JAPANESE)
+    {
+        monName[5] = EOS;
+        monName[POKEMON_NAME_LENGTH] = EXT_CTRL_CODE_BEGIN;
+    }
+    else
+    {
+        chr = monName[5];
+        monName[5] = EOS;
+        monName[POKEMON_NAME_LENGTH] = chr;
+    }
+}
+
+void sub_80DFA08(struct ContestPokemon *mon, s32 language)
+{
+    u8 *name = mon->nickname;
+
+    if (language == LANGUAGE_JAPANESE)
+    {
+        ConvertInternationalString(name, sub_80DF940(name));
+    }
+    else if (name[POKEMON_NAME_LENGTH] == EXT_CTRL_CODE_BEGIN)
+    {
+        ConvertInternationalString(name, LANGUAGE_JAPANESE);
+    }
+    else
+    {
+        name[5] = name[POKEMON_NAME_LENGTH];
+        name[POKEMON_NAME_LENGTH] = EOS;
+    }
+
+    name = mon->trainerName;
+    if (language == LANGUAGE_JAPANESE)
+    {
+        name[PLAYER_NAME_LENGTH] = EOS;
+        name[6] = name[4];
+        name[5] = name[3];
+        name[4] = name[2];
+        name[3] = name[1];
+        name[2] = mon->trainerName[0];
+        name[1] = EXT_CTRL_CODE_JPN;
+        name[0] = EXT_CTRL_CODE_BEGIN;
+    }
+    else
+    {
+        name[5] = name[PLAYER_NAME_LENGTH];
+        name[PLAYER_NAME_LENGTH] = EOS;
+    }
+}
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index 721a4f870..381fb34fa 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -3,7 +3,6 @@
 #include "bg.h"
 #include "contest.h"
 #include "contest_link_80F57C4.h"
-#include "contest_painting.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "event_data.h"
@@ -67,10 +66,9 @@ struct ContestLink80F57C4
     u8 *unkC[4];
 };
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-
-extern struct ContestLink80F57C4 *gUnknown_0203A034;
+EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL;
 
+extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const struct BgTemplate gUnknown_0858D888[4];
 extern const struct WindowTemplate gUnknown_0858D898[];
 extern const struct CompressedSpriteSheet gUnknown_0858D878[];
@@ -138,7 +136,7 @@ void sub_80F57C4(void)
     InitBgsFromTemplates(0, gUnknown_0858D888, ARRAY_COUNT(gUnknown_0858D888));
     for (i = 0; i < 4; i++)
         SetBgTilemapBuffer(i, gUnknown_0203A034->unkC[i]);
-    
+
     InitWindows(gUnknown_0858D898);
     DeactivateAllTextPrinters();
     SetGpuReg(REG_OFFSET_MOSAIC, 0);
@@ -720,7 +718,7 @@ static void sub_80F66B4(u8 taskId)
             {
                 nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species);
                 GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN);
-            }   
+            }
         }
 
         gTasks[taskId].data[10] = 0;
@@ -761,7 +759,7 @@ static void sub_80F67C4(u8 taskId)
 {
     if (!(gIsLinkContest & 0x1))
         BravoTrainerPokemonProfile_BeforeInterview2(gContestFinalStandings[gContestPlayerMonIndex]);
-    
+
     BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
     gTasks[taskId].func = sub_80F6820;
 }
@@ -1282,7 +1280,7 @@ static void sub_80F6F68(struct Sprite *sprite)
         struct Sprite *sprite2 = &gSprites[sprite->data[i]];
         sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64;
     }
-    
+
     if (sprite->pos1.x == sprite->data[4])
         sprite->callback = sub_80F6FDC;
 }
@@ -1348,7 +1346,7 @@ static void sub_80F7144(void)
     sprite->invisible = 1;
     for (i = 0; i < 3; i++)
         gSprites[sprite->data[i]].invisible = 1;
-    
+
     gBattle_WIN0H = 0;
     gBattle_WIN0V = 0;
     SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H);
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 0ed169a77..71a110aa8 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -20,10 +20,11 @@
 #include "window.h"
 #include "constants/rgb.h"
 
-extern u16 (*gUnknown_03006190)[][32];
-extern struct ContestWinner *gUnknown_030061C0;
-extern u16 *gContestPaintingMonPalette;
-extern struct Unk030061A0 gUnknown_030061A0;
+// IWRAM common
+u16 (*gUnknown_03006190)[][32];
+struct Unk030061A0 gUnknown_030061A0;
+struct ContestWinner *gUnknown_030061C0;
+u16 *gContestPaintingMonPalette;
 
 // IWRAM bss
 IWRAM_DATA u8 gContestPaintingState;
@@ -103,7 +104,7 @@ const u8 *const gContestRankTextPointers[] =
     gContestLink,
 };
 
-const struct BgTemplate gUnknown_085B07E8[] = 
+const struct BgTemplate gUnknown_085B07E8[] =
 {
     {
         .bg = 1,
@@ -116,7 +117,7 @@ const struct BgTemplate gUnknown_085B07E8[] =
     },
 };
 
-const struct WindowTemplate gUnknown_085B07EC = 
+const struct WindowTemplate gUnknown_085B07EC =
 {
     .bg = 1,
     .tilemapLeft = 2,
diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c
index 187a0f196..142ad7bc9 100644
--- a/src/contest_painting_effects.c
+++ b/src/contest_painting_effects.c
@@ -3,14 +3,17 @@
 #include "contest_painting.h"
 #include "constants/rgb.h"
 
-extern u8 gUnknown_03006164;
-extern u16 (*gUnknown_03006168)[][32];
-extern u8 gUnknown_0300616C;
-extern u8 gUnknown_03006170;
-extern u8 gUnknown_03006174;
-extern u8 gUnknown_03006178;
-extern u8 gUnknown_0300617C;
-extern u8 gUnknown_03006180;
+// IWRAM common
+u8 gUnknown_03006164;
+u16 (*gUnknown_03006168)[][32];
+u8 gUnknown_0300616C;
+u8 gUnknown_03006170;
+u8 gUnknown_03006174;
+u8 gUnknown_03006178;
+u8 gUnknown_0300617C;
+u8 gUnknown_03006180;
+u16 gUnknown_03006184;
+u16 gUnknown_03006188;
 
 // this file's functions
 void sub_8125230(void);
diff --git a/src/daycare.c b/src/daycare.c
index 6bdbd987e..b75fab292 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1244,15 +1244,15 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y)
 
 static void Task_HandleDaycareLevelMenuInput(u8 taskId)
 {
-    u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId);
+    u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuListTaskId);
 
     if (gMain.newKeys & A_BUTTON)
     {
-        switch (var)
+        switch (input)
         {
         case 0:
         case 1:
-            gSpecialVar_Result = var;
+            gSpecialVar_Result = input;
             break;
         case 5:
             gSpecialVar_Result = 2;
diff --git a/src/decoration.c b/src/decoration.c
index 36d9ba5f9..2ac49b98c 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -526,14 +526,14 @@ void sub_8126B80(u8 taskId)
                 PlaySE(SE_SELECT);
                 sSecretBasePCMenuActions[sSecretBasePCMenuCursorPos].func.void_u8(taskId);
                 break;
-            case -2:
+            case MENU_NOTHING_CHOSEN:
                 sSecretBasePCMenuCursorPos = Menu_GetCursorPos();
                 if ((s8)menuPos != sSecretBasePCMenuCursorPos)
                 {
                     sub_8126C08();
                 }
                 break;
-            case -1:
+            case MENU_B_PRESSED:
                 PlaySE(SE_SELECT);
                 SecretBasePC_Cancel(taskId);
                 break;
@@ -713,12 +713,12 @@ void sub_8127088(u8 taskId)
         input = Menu_ProcessInput();
         switch (input)
         {
-            case -1:
+            case MENU_B_PRESSED:
             case 8:
                 PlaySE(SE_SELECT);
                 sub_812719C(taskId);
                 break;
-            case -2:
+            case MENU_NOTHING_CHOSEN:
                 break;
             default:
                 PlaySE(SE_SELECT);
@@ -933,13 +933,13 @@ void sub_812764C(u8 taskId)
     data = gTasks[taskId].data;
     if (!gPaletteFade.active)
     {
-        input = ListMenuHandleInputGetItemId(data[13]);
+        input = ListMenu_ProcessInput(data[13]);
         ListMenuGetScrollAndRow(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
         switch (input)
         {
-            case -1:
+            case LIST_NOTHING_CHOSEN:
                 break;
-            case -2:
+            case LIST_B_PRESSED:
                 PlaySE(SE_SELECT);
                 SecretBasePC_SelectedDecorActions[data[11]][1](taskId);
                 break;
diff --git a/src/dragon.c b/src/dragon.c
index 4a2ac1c51..9b39a8a30 100644
--- a/src/dragon.c
+++ b/src/dragon.c
@@ -5,8 +5,6 @@
 #include "trig.h"
 #include "constants/rgb.h"
 
-extern u16 gUnknown_0203A100[];
-
 void sub_8113064(struct Sprite *);
 void sub_81131B4(struct Sprite *);
 void sub_8113224(struct Sprite *);
@@ -17,6 +15,8 @@ static void sub_81134B8(u8);
 static void sub_8113574(struct Task *);
 static void sub_811369C(struct Sprite *);
 
+EWRAM_DATA static u16 gUnknown_0203A100[7] = {0};
+
 const union AnimCmd gUnknown_08596E60[] =
 {
     ANIMCMD_FRAME(0, 4),
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index c97e2d10f..4bf7701be 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -9,6 +9,7 @@
 #include "evolution_graphics.h"
 #include "gpu_regs.h"
 #include "link.h"
+#include "link_rfu.h"
 #include "m4a.h"
 #include "main.h"
 #include "menu.h"
@@ -16,10 +17,12 @@
 #include "palette.h"
 #include "pokedex.h"
 #include "pokemon.h"
+#include "pokemon_summary_screen.h"
 #include "scanline_effect.h"
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings.h"
 #include "task.h"
 #include "text.h"
 #include "text_window.h"
@@ -39,22 +42,18 @@ struct EvoInfo
     u16 savedPalette[48];
 };
 
+// EWRAM vars
 static EWRAM_DATA struct EvoInfo *sEvoStructPtr = NULL;
 static EWRAM_DATA u16 *sEvoMovingBgPtr = NULL;
 
+// IWRAM common
+void (*gCB2_AfterEvolution)(void);
+
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
 #define sEvoGraphicsTaskID      gBattleCommunication[2]
 
-extern const struct WindowTemplate gUnknown_0833900C;
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 
-// strings
-extern const u8 gText_CommunicationStandby5[];
-
-extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move);
-extern u8 sub_81C1B94(void);
-extern void sub_800E084(void);
-
 // this file's functions
 static void Task_EvolutionScene(u8 taskID);
 static void Task_TradeEvolutionScene(u8 taskID);
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 7423216a4..b1291f0ce 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -90,7 +90,7 @@ static bool8 sub_808B618(void);
 static bool8 PlayerIsAnimActive(void);
 static bool8 PlayerCheckIfAnimFinishedOrInactive(void);
 
-static void PlayerRun(u8); 
+static void PlayerRun(u8);
 static void PlayerNotOnBikeCollide(u8);
 static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8);
 
@@ -343,7 +343,7 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO
         u8 r5 = direction;
         register u8 r6 asm("r6") = direction;
     #endif
-    //a very bad HACK 
+    //a very bad HACK
 
     if (EventObjectIsMovementOverridden(playerEventObj)
      && !EventObjectClearHeldMovementIfFinished(playerEventObj))
@@ -821,24 +821,14 @@ void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
 static void DoPlayerAvatarTransition(void)
 {
     u8 i;
-    u32 flags = gPlayerAvatar.unk1;
+    u8 flags = gPlayerAvatar.unk1;
 
     if (flags != 0)
     {
         for (i = 0; i < 8; i++, flags >>= 1)
         {
-#ifdef NONMATCHING
             if (flags & 1)
-            {
                 gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
-            }
-#else
-            if (flags & 1)
-            {
-                register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_084974B8;
-                funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
-            }
-#endif
         }
         gPlayerAvatar.unk1 = 0;
     }
@@ -1151,7 +1141,7 @@ void PlayerGetDestCoords(s16 *x, s16 *y)
 u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y)
 {
     struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId];
-    
+
     if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2])
     {
         *x = object->currentCoords.x;
@@ -1765,7 +1755,7 @@ static bool8 Fishing2(struct Task *task)
 static bool8 Fishing3(struct Task *task)
 {
     AlignFishingAnimationFrames();
-    
+
     // Wait one second
     task->tFrameCounter++;
     if (task->tFrameCounter >= 60)
diff --git a/src/field_specials.c b/src/field_specials.c
index 0dc1bf18b..f2ebf2b8e 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -2603,9 +2603,9 @@ static void sub_813A46C(s32 itemIndex, bool8 onInit, struct ListMenu *list)
 static void sub_813A4EC(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    s32 itemId = ListMenuHandleInputGetItemId(task->data[14]);
+    s32 input = ListMenu_ProcessInput(task->data[14]);
 
-    switch (itemId)
+    switch (input)
     {
     case LIST_NOTHING_CHOSEN:
         break;
@@ -2615,13 +2615,13 @@ static void sub_813A4EC(u8 taskId)
         sub_813A570(taskId);
         break;
     default:
-        gSpecialVar_Result = itemId;
+        gSpecialVar_Result = input;
         PlaySE(SE_SELECT);
         if (!task->data[6])
         {
             sub_813A570(taskId);
         }
-        else if (itemId == task->data[1] - 1)
+        else if (input == task->data[1] - 1)
         {
             sub_813A570(taskId);
         }
diff --git a/src/field_weather.c b/src/field_weather.c
index f0615dabf..0db635c60 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -17,7 +17,7 @@
 #include "trig.h"
 #include "gpu_regs.h"
 
-#define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00))
+#define DROUGHT_COLOR_INDEX(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00))
 
 enum
 {
@@ -65,15 +65,21 @@ static void None_Init(void);
 static void None_Main(void);
 static u8 None_Finish(void);
 
-// EWRAM
 EWRAM_DATA struct Weather gWeather = {0};
 EWRAM_DATA static u8 sFieldEffectPaletteGammaTypes[32] = {0};
 
-// IWRAM bss
 IWRAM_DATA static const u8 *sPaletteGammaTypes;
 
-// CONST
-extern const u16 gUnknown_0854014C[][4096];
+// The drought weather effect uses a precalculated color lookup table. Presumably this
+// is because the underlying color shift calculation is slow.
+const u16 sDroughtWeatherColors[][0x1000] = {
+    INCBIN_U16("graphics/weather/drought/colors_0.bin"),
+    INCBIN_U16("graphics/weather/drought/colors_1.bin"),
+    INCBIN_U16("graphics/weather/drought/colors_2.bin"),
+    INCBIN_U16("graphics/weather/drought/colors_3.bin"),
+    INCBIN_U16("graphics/weather/drought/colors_4.bin"),
+    INCBIN_U16("graphics/weather/drought/colors_5.bin"),
+};
 
 // This is a pointer to gWeather. All code in this file accesses gWeather directly,
 // while code in other field weather files accesses gWeather through this pointer.
@@ -513,7 +519,7 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
             {
                 for (i = 0; i < 16; i++)
                 {
-                    gPlttBufferFaded[palOffset] = gUnknown_0854014C[gammaIndex][MACRO1(gPlttBufferUnfaded[palOffset])];
+                    gPlttBufferFaded[palOffset] = sDroughtWeatherColors[gammaIndex][DROUGHT_COLOR_INDEX(gPlttBufferUnfaded[palOffset])];
                     palOffset++;
                 }
             }
@@ -619,7 +625,7 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl
                 b1 = color1.b;
 
                 offset = ((b1 & 0x1E) << 7) | ((g1 & 0x1E) << 3) | ((r1 & 0x1E) >> 1);
-                color2 = *(struct RGBColor *)&gUnknown_0854014C[gammaIndex][offset];
+                color2 = *(struct RGBColor *)&sDroughtWeatherColors[gammaIndex][offset];
                 r2 = color2.r;
                 g2 = color2.g;
                 b2 = color2.b;
diff --git a/src/graphics.c b/src/graphics.c
index 287a1f5d6..90b705d2f 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1023,8 +1023,8 @@ const u32 gBattleAnimSpriteSheet_262[] = INCBIN_U32("graphics/battle_anims/sprit
 const u32 gBattleAnimSpritePalette_262[] = INCBIN_U32("graphics/battle_anims/sprites/262.gbapal.lz");
 
 const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/nextturn.4bpp.lz");
-const u8 gUnknown_08D8E9B4[] = INCBIN_U8("graphics/contest/nextturn_numbers.4bpp");
-const u8 gUnknown_08D8EA34[] = INCBIN_U8("graphics/contest/nextturn_random.4bpp");
+const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/nextturn_numbers.4bpp");
+const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/nextturn_random.4bpp");
 
 const u32 gBattleAnimSpriteSheet_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.4bpp.lz");
 const u32 gBattleAnimSpritePalette_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.gbapal.lz");
diff --git a/src/ice.c b/src/ice.c
index 77b3700ef..d354fce7e 100644
--- a/src/ice.c
+++ b/src/ice.c
@@ -530,7 +530,7 @@ static void sub_810B6C4(struct Sprite *sprite)
 {
     s16 targetX, targetY, attackerX, attackerY;
     s16 i;
-    
+
     sprite->oam.tileNum += 7;
     targetX = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     targetY = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
@@ -811,7 +811,7 @@ void AnimIceBeamParticle(struct Sprite *sprite)
     sprite->callback = StartAnimLinearTranslation;
 }
 
-// Animates the ice crystals at the end of Ice Punch, Ice Beam, Tri Attack, 
+// Animates the ice crystals at the end of Ice Punch, Ice Beam, Tri Attack,
 // Weather Ball (Hail), Blizzard, and Powder Snow.
 // arg 0: target x offset
 // arg 1: target y offset
@@ -917,7 +917,7 @@ void AnimSwirlingSnowball_Step2(struct Sprite *sprite)
     sprite->pos2.x = 0;
     sprite->data[0] = 128;
 
-    tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : -20;
+    tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20;
 
     sprite->data[3] = Sin(sprite->data[0], tempVar);
     sprite->data[4] = Cos(sprite->data[0], 0xF);
@@ -1069,7 +1069,7 @@ void AnimWaveFromCenterOfTarget(struct Sprite *sprite)
             sprite->pos1.y += gBattleAnimArgs[1];
         }
 
-        sprite->data[0]++; 
+        sprite->data[0]++;
     }
     else
     {
@@ -1099,9 +1099,9 @@ void InitSwirlingFogAnim(struct Sprite *sprite)
         else
         {
             SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
-            if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) 
+            if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
                 sprite->pos1.x -= gBattleAnimArgs[0];
-            else 
+            else
                 sprite->pos1.x += gBattleAnimArgs[0];
 
             sprite->pos1.y += gBattleAnimArgs[1];
@@ -1109,18 +1109,18 @@ void InitSwirlingFogAnim(struct Sprite *sprite)
 
         battler = gBattleAnimAttacker;
     }
-    else 
+    else
     {
         if (gBattleAnimArgs[5] == 0)
         {
             InitSpritePosToAnimTarget(sprite, FALSE);
         }
-        else 
+        else
         {
             SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
             if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
                 sprite->pos1.x -= gBattleAnimArgs[0];
-            else 
+            else
                 sprite->pos1.x += gBattleAnimArgs[0];
 
             sprite->pos1.y += gBattleAnimArgs[1];
@@ -1130,7 +1130,7 @@ void InitSwirlingFogAnim(struct Sprite *sprite)
     }
 
     sprite->data[7] = battler;
-    if (gBattleAnimArgs[5] == 0 || !IsDoubleBattle()) 
+    if (gBattleAnimArgs[5] == 0 || !IsDoubleBattle())
         tempVar = 0x20;
     else
         tempVar = 0x40;
@@ -1161,7 +1161,7 @@ void AnimSwirlingFogAnim(struct Sprite *sprite)
         sprite->pos2.y += Cos(sprite->data[5], -6);
 
         if ((u16)(sprite->data[5] - 64) <= 0x7F)
-            sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]); 
+            sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]);
         else
             sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]) + 1;
 
@@ -1195,7 +1195,7 @@ void AnimTask_Haze1(u8 taskId)
     LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset);
     sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0);
     LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32);
-    
+
     gTasks[taskId].func = AnimTask_Haze2;
 }
 
@@ -1208,62 +1208,63 @@ void AnimTask_Haze2(u8 taskId)
 
     switch (gTasks[taskId].data[12])
     {
-        case 0:
-            if (++gTasks[taskId].data[10] == 4)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[9]++;
-                gTasks[taskId].data[11] = gUnknown_08595C5C[gTasks[taskId].data[9]];
-
-                SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
-                if (gTasks[taskId].data[11] == 9)
-                {
-                    gTasks[taskId].data[12]++;
-                    gTasks[taskId].data[11] = 0;
-                }
-            }
-            break;
-        case 1:
-            if (++gTasks[taskId].data[11] == 0x51)
+    case 0:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[9]++;
+            gTasks[taskId].data[11] = gUnknown_08595C5C[gTasks[taskId].data[9]];
+
+            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
+            if (gTasks[taskId].data[11] == 9)
             {
-                gTasks[taskId].data[11] = 9;
                 gTasks[taskId].data[12]++;
+                gTasks[taskId].data[11] = 0;
             }
-            break;
-        case 2:
-            if (++gTasks[taskId].data[10] == 4)
+        }
+        break;
+    case 1:
+        if (++gTasks[taskId].data[11] == 0x51)
+        {
+            gTasks[taskId].data[11] = 9;
+            gTasks[taskId].data[12]++;
+        }
+        break;
+    case 2:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[11]--;
+
+            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
+            if (gTasks[taskId].data[11] == 0)
             {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[11]--;
-
-                SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
-                if (gTasks[taskId].data[11] == 0)
-                {
-                    gTasks[taskId].data[12]++;
-                    gTasks[taskId].data[11] = 0;
-                }
+                gTasks[taskId].data[12]++;
+                gTasks[taskId].data[11] = 0;
             }
-            break;
-        case 3:
-            sub_80A6B30(&subStruct);
-            sub_80A6C68(1);
-            sub_80A6C68(2);
-            
-            gTasks[taskId].data[12]++;
-            
-            // fall through
-        case 4:
-            if (!IsContest())
-                SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
-
-            gBattle_BG1_X = 0;
-            gBattle_BG1_Y = 0;
-            SetGpuReg(REG_OFFSET_BLDCNT, 0);
-            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
-            SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
-            DestroyAnimVisualTask(taskId);
+        }
+        break;
+    case 3:
+        sub_80A6B30(&subStruct);
+        sub_80A6C68(1);
+        sub_80A6C68(2);
+
+        gTasks[taskId].data[12]++;
+
+        // fall through
+    case 4:
+        if (!IsContest())
+            SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
+
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        SetGpuReg(REG_OFFSET_BLDCNT, 0);
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
+        SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
+        DestroyAnimVisualTask(taskId);
+        break;
     }
-} 
+}
 
 // Throws the ball in Mist Ball.
 // arg 0: initial x pixel offset
@@ -1301,7 +1302,7 @@ void AnimTask_LoadMistTiles(u8 taskId)
     LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset);
     sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0);
     LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32);
-    
+
     gTasks[taskId].data[15] = -1;
     gTasks[taskId].func = AnimTask_OverlayFogTiles;
 }
@@ -1315,54 +1316,55 @@ void AnimTask_OverlayFogTiles(u8 taskId)
 
     switch (gTasks[taskId].data[12])
     {
-        case 0:
-            gTasks[taskId].data[9] += 1;
-            gTasks[taskId].data[11] = gUnknown_08595C88[gTasks[taskId].data[9]];
-            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 17 - gTasks[taskId].data[11]));
-            if (gTasks[taskId].data[11] == 5)
+    case 0:
+        gTasks[taskId].data[9] += 1;
+        gTasks[taskId].data[11] = gUnknown_08595C88[gTasks[taskId].data[9]];
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 17 - gTasks[taskId].data[11]));
+        if (gTasks[taskId].data[11] == 5)
+        {
+            gTasks[taskId].data[12]++;
+            gTasks[taskId].data[11] = 0;
+        }
+        break;
+    case 1:
+        if (++gTasks[taskId].data[11] == 0x51)
+        {
+            gTasks[taskId].data[11] = 5;
+            gTasks[taskId].data[12]++;
+        }
+        break;
+    case 2:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[11] -= 1;
+            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
+            if (gTasks[taskId].data[11] == 0)
             {
                 gTasks[taskId].data[12]++;
                 gTasks[taskId].data[11] = 0;
             }
-            break;
-        case 1:
-            if (++gTasks[taskId].data[11] == 0x51)
-            {
-                gTasks[taskId].data[11] = 5;
-                gTasks[taskId].data[12]++;
-            }
-            break;
-        case 2:
-            if (++gTasks[taskId].data[10] == 4)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[11] -= 1;
-                SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
-                if (gTasks[taskId].data[11] == 0)
-                {
-                    gTasks[taskId].data[12]++;
-                    gTasks[taskId].data[11] = 0;
-                }
-            }
-            break;
-        case 3:
-            sub_80A6B30(&subStruct);
-            sub_80A6C68(1);
-            sub_80A6C68(2);
-            
-            gTasks[taskId].data[12]++;
-            
-            // fall through
-        case 4:
-            if (!IsContest())
-                SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
-
-            gBattle_BG1_X = 0;
-            gBattle_BG1_Y = 0;
-            SetGpuReg(REG_OFFSET_BLDCNT, 0);
-            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
-            SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
-            DestroyAnimVisualTask(taskId);
+        }
+        break;
+    case 3:
+        sub_80A6B30(&subStruct);
+        sub_80A6C68(1);
+        sub_80A6C68(2);
+
+        gTasks[taskId].data[12]++;
+
+        // fall through
+    case 4:
+        if (!IsContest())
+            SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
+
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        SetGpuReg(REG_OFFSET_BLDCNT, 0);
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
+        SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
+        DestroyAnimVisualTask(taskId);
+        break;
     }
 }
 
@@ -1390,7 +1392,7 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite)
         if ((sprite->data[7] & 0x8000) && !(gBattlerPositions[gBattleAnimAttacker] & 1))
             sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1;
 
-        sprite->data[6] = 1; 
+        sprite->data[6] = 1;
     }
 
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
@@ -1410,7 +1412,7 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite)
         sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[4];
         sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
-    } 
+    }
 
     if (IsContest())
     {
@@ -1425,8 +1427,6 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite)
 void MovePoisonGasCloud(struct Sprite *sprite)
 {
     int value;
-    register s16 value2 asm("r5");
-    int unused;
 
     switch (sprite->data[7] & 0xFF)
     {
@@ -1441,8 +1441,7 @@ void MovePoisonGasCloud(struct Sprite *sprite)
 
         if (sprite->data[0] <= 0)
         {
-            value2 = 80;
-            sprite->data[0] = value2;
+            sprite->data[0] = 80;
             sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
             sprite->data[1] = sprite->pos1.x;
             sprite->data[2] = sprite->pos1.x;
@@ -1450,10 +1449,12 @@ void MovePoisonGasCloud(struct Sprite *sprite)
             sprite->data[3] = sprite->pos1.y;
             sprite->data[4] = sprite->pos1.y + 29;
             sprite->data[7]++;
-            if (!IsContest() && gBattlerPositions[gBattleAnimTarget] & 1)
+            if (IsContest())
+                sprite->data[5] = 80;
+            else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER)
                 sprite->data[5] = 204;
             else
-                sprite->data[5] = value2;
+                sprite->data[5] = 80;
 
             sprite->pos2.y = 0;
             value = gSineTable[sprite->data[5]];
@@ -1490,13 +1491,13 @@ void MovePoisonGasCloud(struct Sprite *sprite)
 
         if (sprite->data[0] <= 0)
         {
-            asm("mov r5, #0"); // unused local variable?
-            unused = 0;
             sprite->data[0] = 0x300;
             sprite->data[1] = sprite->pos1.x += sprite->pos2.x;
             sprite->data[3] = sprite->pos1.y += sprite->pos2.y;
             sprite->data[4] = sprite->pos1.y + 4;
-            if (!IsContest() && gBattlerPositions[gBattleAnimTarget] & 1)
+            if (IsContest())
+                sprite->data[2] = -0x10;
+            else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER)
                 sprite->data[2] = 0x100;
             else
                 sprite->data[2] = -0x10;
@@ -1535,43 +1536,43 @@ void AnimTask_Hail2(u8 taskId)
     struct Task *task = &gTasks[taskId];
     switch (task->data[0])
     {
-        case 0:
-            if (++task->data[4] > 2)
-            {
-                task->data[4] = 0;
-                task->data[5] = 0;
-                task->data[2] = 0;
-                task->data[0]++;
-            }
-            break;
-        case 1:
-            if (task->data[5] == 0)
+    case 0:
+        if (++task->data[4] > 2)
+        {
+            task->data[4] = 0;
+            task->data[5] = 0;
+            task->data[2] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 1:
+        if (task->data[5] == 0)
+        {
+            if (GenerateHailParticle(task->data[3], task->data[2], taskId, 1))
+                task->data[1]++;
+
+            if (++task->data[2] == 3)
             {
-                if (GenerateHailParticle(task->data[3], task->data[2], taskId, 1))
-                    task->data[1]++;
-                
-                if (++task->data[2] == 3)
-                {
-                    if (++task->data[3] == 10)
-                        task->data[0]++;
-                    else
-                        task->data[0]--;
-                }
+                if (++task->data[3] == 10)
+                    task->data[0]++;
                 else
-                {
-                    task->data[5] = 1;
-                }
-
+                    task->data[0]--;
             }
             else
             {
-                task->data[5]--;
+                task->data[5] = 1;
             }
-            break;
-        case 2:
-            if (task->data[1] == 0)
-                DestroyAnimVisualTask(taskId);
-            break;
+
+        }
+        else
+        {
+            task->data[5]--;
+        }
+        break;
+    case 2:
+        if (task->data[1] == 0)
+            DestroyAnimVisualTask(taskId);
+        break;
     }
 }
 
@@ -1587,7 +1588,7 @@ bool8 GenerateHailParticle(u8 a, u8 b, u8 taskId, u8 c)
     u8 spriteId;
     // struct Sprite *sprite;
     s16 spriteX;
-    
+
     if (unk != 2)
     {
         battler = GetBattlerAtPosition(hailData->unk2);
@@ -1820,7 +1821,7 @@ void AnimHailBegin(struct Sprite *sprite)
 
     if (sprite->data[0] == 1 && sprite->data[5] == 0)
     {
-        spriteId = CreateSprite(&gUnknown_08595B68, 
+        spriteId = CreateSprite(&gUnknown_08595B68,
                                 sprite->data[3], sprite->data[4], sprite->subpriority);
 
         sprite->data[0] = spriteId;
@@ -1935,6 +1936,6 @@ void AnimTask_GetRolloutCounter(u8 taskId)
 {
     u8 arg = gBattleAnimArgs[0];
 
-    gBattleAnimArgs[arg] = gAnimDisableStructPtr->rolloutTimerStartValue - gAnimDisableStructPtr->rolloutTimer - 1;    
+    gBattleAnimArgs[arg] = gAnimDisableStructPtr->rolloutTimerStartValue - gAnimDisableStructPtr->rolloutTimer - 1;
     DestroyAnimVisualTask(taskId);
 }
diff --git a/src/item_menu.c b/src/item_menu.c
index a220f02ef..24a50aa9a 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -1102,7 +1102,7 @@ void Task_BagMenu(u8 taskId)
         }
         else
         {
-            int listPosition = ListMenuHandleInputGetItemId(data[0]);
+            int listPosition = ListMenu_ProcessInput(data[0]);
             ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos);
             switch (listPosition)
             {
@@ -1304,7 +1304,7 @@ void bag_menu_swap_items(u8 taskId)
 void sub_81AC3C0(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    int r7;
+    int input;
 
     if (sub_81221EC() != TRUE)
     {
@@ -1316,15 +1316,15 @@ void sub_81AC3C0(u8 taskId)
         }
         else
         {
-            r7 = ListMenuHandleInputGetItemId(data[0]);
+            input = ListMenu_ProcessInput(data[0]);
             ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
             sub_80D4FC8(0);
             sub_80D4FEC(gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
-            switch (r7)
+            switch (input)
             {
-                case -1:
+                case LIST_NOTHING_CHOSEN:
                     break;
-                case -2:
+                case LIST_B_PRESSED:
                     PlaySE(SE_SELECT);
                     if (gMain.newKeys & A_BUTTON)
                         sub_81AC498(taskId);
@@ -1546,9 +1546,9 @@ void Task_HandleInBattleItemMenuInput(u8 taskId)
         s8 r4 = Menu_ProcessInputNoWrap();
         switch (r4)
         {
-            case -2:
+            case MENU_NOTHING_CHOSEN:
                 break;
-            case -1:
+            case MENU_B_PRESSED:
                 PlaySE(SE_SELECT);
                 gUnknown_08613FB4[4].func.void_u8(taskId);
                 break;
diff --git a/src/item_use.c b/src/item_use.c
index 6a7f6cec0..0ea5f6acf 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -38,8 +38,6 @@
 #include "constants/songs.h"
 #include "constants/vars.h"
 
-extern void(*gUnknown_0203A0F4)(u8 taskId);
-extern void (*gUnknown_03006328)(u8, TaskFunc);
 extern void unknown_ItemMenu_Confirm(u8 taskId);
 extern void sub_81C5B14(u8 taskId);
 extern void ScriptUnfreezeEventObjects(void);
@@ -100,6 +98,9 @@ void sub_80FDBEC(void);
 bool8 sub_80FDE2C(void);
 void ItemUseOutOfBattle_CannotUse(u8 taskId);
 
+// EWRAM variables
+EWRAM_DATA static void(*gUnknown_0203A0F4)(u8 taskId) = NULL;
+
 // .rodata
 
 static const MainCallback gUnknown_085920D8[] =
diff --git a/src/learn_move.c b/src/learn_move.c
index 4db83861e..7a6916013 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -638,7 +638,7 @@ static void HideSpritesAndPrintTeachText(bool8 a)
 
 static void HandleInput(bool8 showContest)
 {
-    s32 itemId = ListMenuHandleInputGetItemId(sLearnMoveStruct->listMenuTask);
+    s32 itemId = ListMenu_ProcessInput(sLearnMoveStruct->listMenuTask);
     ListMenuGetScrollAndRow(sLearnMoveStruct->listMenuTask, &sLearnMoveStruct2.listOffset, &sLearnMoveStruct2.listRow);
 
     switch (itemId)
diff --git a/src/list_menu.c b/src/list_menu.c
index 2476fae26..7a9547661 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -334,7 +334,7 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu
         sMysteryGiftLinkMenu.state = 1;
         break;
     case 1:
-        sMysteryGiftLinkMenu.currItemId = ListMenuHandleInputGetItemId(sMysteryGiftLinkMenu.listTaskId);
+        sMysteryGiftLinkMenu.currItemId = ListMenu_ProcessInput(sMysteryGiftLinkMenu.listTaskId);
         if (gMain.newKeys & A_BUTTON)
         {
             sMysteryGiftLinkMenu.state = 2;
@@ -406,7 +406,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu
     return taskId;
 }
 
-s32 ListMenuHandleInputGetItemId(u8 listTaskId)
+s32 ListMenu_ProcessInput(u8 listTaskId)
 {
     struct ListMenu *list = (void*) gTasks[listTaskId].data;
 
diff --git a/src/m4a.c b/src/m4a.c
new file mode 100644
index 000000000..7b4441ca4
--- /dev/null
+++ b/src/m4a.c
@@ -0,0 +1,1779 @@
+#include "gba/m4a_internal.h"
+
+extern const u8 gCgb3Vol[];
+
+#define BSS_CODE __attribute__((section(".bss.code")))
+
+BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0};
+
+struct SoundInfo gSoundInfo;
+struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES];
+struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES];
+void *gMPlayJumpTable[36];
+struct CgbChannel gCgbChans[4];
+struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2];
+struct PokemonCrySong gPokemonCrySong;
+struct MusicPlayerInfo gMPlayInfo_BGM;
+struct MusicPlayerInfo gMPlayInfo_SE1;
+struct MusicPlayerInfo gMPlayInfo_SE2;
+struct MusicPlayerInfo gMPlayInfo_SE3;
+u8 gMPlayMemAccArea[0x10];
+
+u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust)
+{
+    u32 val1;
+    u32 val2;
+    u32 fineAdjustShifted = fineAdjust << 24;
+
+    if (key > 178)
+    {
+        key = 178;
+        fineAdjustShifted = 255 << 24;
+    }
+
+    val1 = gScaleTable[key];
+    val1 = gFreqTable[val1 & 0xF] >> (val1 >> 4);
+
+    val2 = gScaleTable[key + 1];
+    val2 = gFreqTable[val2 & 0xF] >> (val2 >> 4);
+
+    return umul3232H32(wav->freq, val1 + umul3232H32(val2 - val1, fineAdjustShifted));
+}
+
+void UnusedDummyFunc(void)
+{
+}
+
+void MPlayContinue(struct MusicPlayerInfo *mplayInfo)
+{
+    if (mplayInfo->ident == ID_NUMBER)
+    {
+        mplayInfo->ident++;
+        mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE;
+        mplayInfo->ident = ID_NUMBER;
+    }
+}
+
+void MPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
+{
+    if (mplayInfo->ident == ID_NUMBER)
+    {
+        mplayInfo->ident++;
+        mplayInfo->fadeOC = speed;
+        mplayInfo->fadeOI = speed;
+        mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
+        mplayInfo->ident = ID_NUMBER;
+    }
+}
+
+void m4aSoundInit(void)
+{
+    s32 i;
+
+    CpuCopy32((void *)((s32)SoundMainRAM & ~1), SoundMainRAM_Buffer, sizeof(SoundMainRAM_Buffer));
+
+    SoundInit(&gSoundInfo);
+    MPlayExtender(gCgbChans);
+    m4aSoundMode(SOUND_MODE_DA_BIT_8
+               | SOUND_MODE_FREQ_13379
+               | (12 << SOUND_MODE_MASVOL_SHIFT)
+               | (5 << SOUND_MODE_MAXCHN_SHIFT));
+
+    for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
+    {
+        struct MusicPlayerInfo *mplayInfo = gMPlayTable[i].info;
+        MPlayOpen(mplayInfo, gMPlayTable[i].track, gMPlayTable[i].unk_8);
+        mplayInfo->unk_B = gMPlayTable[i].unk_A;
+        mplayInfo->memAccArea = gMPlayMemAccArea;
+    }
+
+    memcpy(&gPokemonCrySong, &gPokemonCrySongTemplate, sizeof(struct PokemonCrySong));
+
+    for (i = 0; i < MAX_POKEMON_CRIES; i++)
+    {
+        struct MusicPlayerInfo *mplayInfo = &gPokemonCryMusicPlayers[i];
+        struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2];
+        MPlayOpen(mplayInfo, track, 2);
+        track->chan = 0;
+    }
+}
+
+void m4aSoundMain(void)
+{
+    SoundMain();
+}
+
+void m4aSongNumStart(u16 n)
+{
+    const struct MusicPlayer *mplayTable = gMPlayTable;
+    const struct Song *songTable = gSongTable;
+    const struct Song *song = &songTable[n];
+    const struct MusicPlayer *mplay = &mplayTable[song->ms];
+
+    MPlayStart(mplay->info, song->header);
+}
+
+void m4aSongNumStartOrChange(u16 n)
+{
+    const struct MusicPlayer *mplayTable = gMPlayTable;
+    const struct Song *songTable = gSongTable;
+    const struct Song *song = &songTable[n];
+    const struct MusicPlayer *mplay = &mplayTable[song->ms];
+
+    if (mplay->info->songHeader != song->header)
+    {
+        MPlayStart(mplay->info, song->header);
+    }
+    else
+    {
+        if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0
+         || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE))
+        {
+            MPlayStart(mplay->info, song->header);
+        }
+    }
+}
+
+void m4aSongNumStartOrContinue(u16 n)
+{
+    const struct MusicPlayer *mplayTable = gMPlayTable;
+    const struct Song *songTable = gSongTable;
+    const struct Song *song = &songTable[n];
+    const struct MusicPlayer *mplay = &mplayTable[song->ms];
+
+    if (mplay->info->songHeader != song->header)
+        MPlayStart(mplay->info, song->header);
+    else if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0)
+        MPlayStart(mplay->info, song->header);
+    else if (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)
+        MPlayContinue(mplay->info);
+}
+
+void m4aSongNumStop(u16 n)
+{
+    const struct MusicPlayer *mplayTable = gMPlayTable;
+    const struct Song *songTable = gSongTable;
+    const struct Song *song = &songTable[n];
+    const struct MusicPlayer *mplay = &mplayTable[song->ms];
+
+    if (mplay->info->songHeader == song->header)
+        m4aMPlayStop(mplay->info);
+}
+
+void m4aSongNumContinue(u16 n)
+{
+    const struct MusicPlayer *mplayTable = gMPlayTable;
+    const struct Song *songTable = gSongTable;
+    const struct Song *song = &songTable[n];
+    const struct MusicPlayer *mplay = &mplayTable[song->ms];
+
+    if (mplay->info->songHeader == song->header)
+        MPlayContinue(mplay->info);
+}
+
+void m4aMPlayAllStop(void)
+{
+    s32 i;
+
+    for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
+        m4aMPlayStop(gMPlayTable[i].info);
+
+    for (i = 0; i < MAX_POKEMON_CRIES; i++)
+        m4aMPlayStop(&gPokemonCryMusicPlayers[i]);
+}
+
+void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo)
+{
+    MPlayContinue(mplayInfo);
+}
+
+void m4aMPlayAllContinue(void)
+{
+    s32 i;
+
+    for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
+        MPlayContinue(gMPlayTable[i].info);
+
+    for (i = 0; i < MAX_POKEMON_CRIES; i++)
+        MPlayContinue(&gPokemonCryMusicPlayers[i]);
+}
+
+void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
+{
+    MPlayFadeOut(mplayInfo, speed);
+}
+
+void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed)
+{
+    if (mplayInfo->ident == ID_NUMBER)
+    {
+        mplayInfo->ident++;
+        mplayInfo->fadeOC = speed;
+        mplayInfo->fadeOI = speed;
+        mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT) | TEMPORARY_FADE;
+        mplayInfo->ident = ID_NUMBER;
+    }
+}
+
+void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed)
+{
+    if (mplayInfo->ident == ID_NUMBER)
+    {
+        mplayInfo->ident++;
+        mplayInfo->fadeOC = speed;
+        mplayInfo->fadeOI = speed;
+        mplayInfo->fadeOV = (0 << FADE_VOL_SHIFT) | FADE_IN;
+        mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE;
+        mplayInfo->ident = ID_NUMBER;
+    }
+}
+
+void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo)
+{
+    s32 trackCount = mplayInfo->trackCount;
+    struct MusicPlayerTrack *track = mplayInfo->tracks;
+
+    while (trackCount > 0)
+    {
+        if (track->flags & MPT_FLG_EXIST)
+        {
+            if (track->flags & MPT_FLG_START)
+            {
+                Clear64byte(track);
+                track->flags = MPT_FLG_EXIST;
+                track->bendRange = 2;
+                track->volX = 64;
+                track->lfoSpeed = 22;
+                track->tone.type = 1;
+            }
+        }
+
+        trackCount--;
+        track++;
+    }
+}
+
+void MPlayExtender(struct CgbChannel *cgbChans)
+{
+    struct SoundInfo *soundInfo;
+    u32 ident;
+
+    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE
+                   | SOUND_4_ON
+                   | SOUND_3_ON
+                   | SOUND_2_ON
+                   | SOUND_1_ON;
+    REG_SOUNDCNT_L = 0; // set master volume to zero
+    REG_NR12 = 0x8;
+    REG_NR22 = 0x8;
+    REG_NR42 = 0x8;
+    REG_NR14 = 0x80;
+    REG_NR24 = 0x80;
+    REG_NR44 = 0x80;
+    REG_NR30 = 0;
+    REG_NR50 = 0x77;
+
+    soundInfo = SOUND_INFO_PTR;
+
+    ident = soundInfo->ident;
+
+    if (ident != ID_NUMBER)
+        return;
+
+    soundInfo->ident++;
+
+    gMPlayJumpTable[8] = ply_memacc;
+    gMPlayJumpTable[17] = ply_lfos;
+    gMPlayJumpTable[19] = ply_mod;
+    gMPlayJumpTable[28] = ply_xcmd;
+    gMPlayJumpTable[29] = ply_endtie;
+    gMPlayJumpTable[30] = SampleFreqSet;
+    gMPlayJumpTable[31] = TrackStop;
+    gMPlayJumpTable[32] = FadeOutBody;
+    gMPlayJumpTable[33] = TrkVolPitSet;
+
+    soundInfo->cgbChans = (struct CgbChannel *)cgbChans;
+    soundInfo->CgbSound = CgbSound;
+    soundInfo->CgbOscOff = CgbOscOff;
+    soundInfo->MidiKeyToCgbFreq = MidiKeyToCgbFreq;
+    soundInfo->maxLines = MAX_LINES;
+
+    CpuFill32(0, cgbChans, sizeof(struct CgbChannel) * 4);
+
+    cgbChans[0].ty = 1;
+    cgbChans[0].panMask = 0x11;
+    cgbChans[1].ty = 2;
+    cgbChans[1].panMask = 0x22;
+    cgbChans[2].ty = 3;
+    cgbChans[2].panMask = 0x44;
+    cgbChans[3].ty = 4;
+    cgbChans[3].panMask = 0x88;
+
+    soundInfo->ident = ident;
+}
+
+void MusicPlayerJumpTableCopy(void)
+{
+    asm("swi 0x2A");
+}
+
+void ClearChain(void *x)
+{
+    void (*func)(void *) = *(&gMPlayJumpTable[34]);
+    func(x);
+}
+
+void Clear64byte(void *x)
+{
+    void (*func)(void *) = *(&gMPlayJumpTable[35]);
+    func(x);
+}
+
+void SoundInit(struct SoundInfo *soundInfo)
+{
+    soundInfo->ident = 0;
+
+    if (REG_DMA1CNT & (DMA_REPEAT << 16))
+        REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
+
+    if (REG_DMA2CNT & (DMA_REPEAT << 16))
+        REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
+
+    REG_DMA1CNT_H = DMA_32BIT;
+    REG_DMA2CNT_H = DMA_32BIT;
+    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE
+                   | SOUND_4_ON
+                   | SOUND_3_ON
+                   | SOUND_2_ON
+                   | SOUND_1_ON;
+    REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT
+                   | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT
+                   | SOUND_ALL_MIX_FULL;
+    REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40;
+
+    REG_DMA1SAD = (s32)soundInfo->pcmBuffer;
+    REG_DMA1DAD = (s32)&REG_FIFO_A;
+    REG_DMA2SAD = (s32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE;
+    REG_DMA2DAD = (s32)&REG_FIFO_B;
+
+    SOUND_INFO_PTR = soundInfo;
+    CpuFill32(0, soundInfo, sizeof(struct SoundInfo));
+
+    soundInfo->maxChans = 8;
+    soundInfo->masterVolume = 15;
+    soundInfo->plynote = (u32)ply_note;
+    soundInfo->CgbSound = DummyFunc;
+    soundInfo->CgbOscOff = (void (*)(u8))DummyFunc;
+    soundInfo->MidiKeyToCgbFreq = (u32 (*)(u8, u8, u8))DummyFunc;
+    soundInfo->ExtVolPit = (u32)DummyFunc;
+
+    MPlayJumpTableCopy(gMPlayJumpTable);
+
+    soundInfo->MPlayJumpTable = (u32)gMPlayJumpTable;
+
+    SampleFreqSet(SOUND_MODE_FREQ_13379);
+
+    soundInfo->ident = ID_NUMBER;
+}
+
+void SampleFreqSet(u32 freq)
+{
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+
+    freq = (freq & 0xF0000) >> 16;
+    soundInfo->freq = freq;
+    soundInfo->pcmSamplesPerVBlank = gPcmSamplesPerVBlankTable[freq - 1];
+    soundInfo->pcmDmaPeriod = PCM_DMA_BUF_SIZE / soundInfo->pcmSamplesPerVBlank;
+
+    // LCD refresh rate 59.7275Hz
+    soundInfo->pcmFreq = (597275 * soundInfo->pcmSamplesPerVBlank + 5000) / 10000;
+
+    // CPU frequency 16.78Mhz
+    soundInfo->divFreq = (16777216 / soundInfo->pcmFreq + 1) >> 1;
+
+    // Turn off timer 0.
+    REG_TM0CNT_H = 0;
+
+    // cycles per LCD fresh 280896
+    REG_TM0CNT_L = -(280896 / soundInfo->pcmSamplesPerVBlank);
+
+    m4aSoundVSyncOn();
+
+    while (*(vu8 *)REG_ADDR_VCOUNT == 159)
+        ;
+
+    while (*(vu8 *)REG_ADDR_VCOUNT != 159)
+        ;
+
+    REG_TM0CNT_H = TIMER_ENABLE | TIMER_1CLK;
+}
+
+void m4aSoundMode(u32 mode)
+{
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+    u32 temp;
+
+    if (soundInfo->ident != ID_NUMBER)
+        return;
+
+    soundInfo->ident++;
+
+    temp = mode & (SOUND_MODE_REVERB_SET | SOUND_MODE_REVERB_VAL);
+
+    if (temp)
+        soundInfo->reverb = temp & SOUND_MODE_REVERB_VAL;
+
+    temp = mode & SOUND_MODE_MAXCHN;
+
+    if (temp)
+    {
+        struct SoundChannel *chan;
+
+        soundInfo->maxChans = temp >> SOUND_MODE_MAXCHN_SHIFT;
+
+        temp = MAX_DIRECTSOUND_CHANNELS;
+        chan = &soundInfo->chans[0];
+
+        while (temp != 0)
+        {
+            chan->status = 0;
+            temp--;
+            chan++;
+        }
+    }
+
+    temp = mode & SOUND_MODE_MASVOL;
+
+    if (temp)
+        soundInfo->masterVolume = temp >> SOUND_MODE_MASVOL_SHIFT;
+
+    temp = mode & SOUND_MODE_DA_BIT;
+
+    if (temp)
+    {
+        temp = (temp & 0x300000) >> 14;
+        REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | temp;
+    }
+
+    temp = mode & SOUND_MODE_FREQ;
+
+    if (temp)
+    {
+        m4aSoundVSyncOff();
+        SampleFreqSet(temp);
+    }
+
+    soundInfo->ident = ID_NUMBER;
+}
+
+void SoundClear(void)
+{
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+    s32 i;
+    void *chan;
+
+    if (soundInfo->ident != ID_NUMBER)
+        return;
+
+    soundInfo->ident++;
+
+    i = MAX_DIRECTSOUND_CHANNELS;
+    chan = &soundInfo->chans[0];
+
+    while (i > 0)
+    {
+        ((struct SoundChannel *)chan)->status = 0;
+        i--;
+        chan = (void *)((s32)chan + sizeof(struct SoundChannel));
+    }
+
+    chan = soundInfo->cgbChans;
+
+    if (chan)
+    {
+        i = 1;
+
+        while (i <= 4)
+        {
+            soundInfo->CgbOscOff(i);
+            ((struct CgbChannel *)chan)->sf = 0;
+            i++;
+            chan = (void *)((s32)chan + sizeof(struct CgbChannel));
+        }
+    }
+
+    soundInfo->ident = ID_NUMBER;
+}
+
+void m4aSoundVSyncOff(void)
+{
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+
+    if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1)
+    {
+        soundInfo->ident += 10;
+
+        if (REG_DMA1CNT & (DMA_REPEAT << 16))
+            REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
+
+        if (REG_DMA2CNT & (DMA_REPEAT << 16))
+            REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
+
+        REG_DMA1CNT_H = DMA_32BIT;
+        REG_DMA2CNT_H = DMA_32BIT;
+
+        CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer));
+    }
+}
+
+void m4aSoundVSyncOn(void)
+{
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+    u32 ident = soundInfo->ident;
+
+    if (ident == ID_NUMBER)
+        return;
+
+    REG_DMA1CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT;
+    REG_DMA2CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT;
+
+    soundInfo->pcmDmaCounter = 0;
+    soundInfo->ident = ident - 10;
+}
+
+void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount)
+{
+    struct SoundInfo *soundInfo;
+
+    if (trackCount == 0)
+        return;
+
+    if (trackCount > MAX_MUSICPLAYER_TRACKS)
+        trackCount = MAX_MUSICPLAYER_TRACKS;
+
+    soundInfo = SOUND_INFO_PTR;
+
+    if (soundInfo->ident != ID_NUMBER)
+        return;
+
+    soundInfo->ident++;
+
+    Clear64byte(mplayInfo);
+
+    mplayInfo->tracks = tracks;
+    mplayInfo->trackCount = trackCount;
+    mplayInfo->status = MUSICPLAYER_STATUS_PAUSE;
+
+    while (trackCount != 0)
+    {
+        tracks->flags = 0;
+        trackCount--;
+        tracks++;
+    }
+
+    if (soundInfo->func != 0)
+    {
+        mplayInfo->func = soundInfo->func;
+        mplayInfo->intp = soundInfo->intp;
+        soundInfo->func = 0;
+    }
+
+    soundInfo->intp = (u32)mplayInfo;
+    soundInfo->func = (u32)MPlayMain;
+    soundInfo->ident = ID_NUMBER;
+    mplayInfo->ident = ID_NUMBER;
+}
+
+void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader)
+{
+    s32 i;
+    u8 unk_B;
+    struct MusicPlayerTrack *track;
+
+    if (mplayInfo->ident != ID_NUMBER)
+        return;
+
+    unk_B = mplayInfo->unk_B;
+
+    if (!unk_B
+        || ((!mplayInfo->songHeader || !(mplayInfo->tracks[0].flags & MPT_FLG_START))
+            && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0
+                || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE)))
+        || (mplayInfo->priority <= songHeader->priority))
+    {
+        mplayInfo->ident++;
+        mplayInfo->status = 0;
+        mplayInfo->songHeader = songHeader;
+        mplayInfo->tone = songHeader->tone;
+        mplayInfo->priority = songHeader->priority;
+        mplayInfo->clock = 0;
+        mplayInfo->tempoD = 150;
+        mplayInfo->tempoI = 150;
+        mplayInfo->tempoU = 0x100;
+        mplayInfo->tempoC = 0;
+        mplayInfo->fadeOI = 0;
+
+        i = 0;
+        track = mplayInfo->tracks;
+
+        while (i < songHeader->trackCount && i < mplayInfo->trackCount)
+        {
+            TrackStop(mplayInfo, track);
+            track->flags = MPT_FLG_EXIST | MPT_FLG_START;
+            track->chan = 0;
+            track->cmdPtr = songHeader->part[i];
+            i++;
+            track++;
+        }
+
+        while (i < mplayInfo->trackCount)
+        {
+            TrackStop(mplayInfo, track);
+            track->flags = 0;
+            i++;
+            track++;
+        }
+
+        if (songHeader->reverb & 0x80)
+            m4aSoundMode(songHeader->reverb);
+
+        mplayInfo->ident = ID_NUMBER;
+    }
+}
+
+void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo)
+{
+    s32 i;
+    struct MusicPlayerTrack *track;
+
+    if (mplayInfo->ident != ID_NUMBER)
+        return;
+
+    mplayInfo->ident++;
+    mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE;
+
+    i = mplayInfo->trackCount;
+    track = mplayInfo->tracks;
+
+    while (i > 0)
+    {
+        TrackStop(mplayInfo, track);
+        i--;
+        track++;
+    }
+
+    mplayInfo->ident = ID_NUMBER;
+}
+
+void FadeOutBody(struct MusicPlayerInfo *mplayInfo)
+{
+    s32 i;
+    struct MusicPlayerTrack *track;
+    u16 fadeOV;
+#ifdef NONMATCHING
+    u16 mask;
+#else
+    register u16 mask asm("r2");
+#endif // NONMATCHING
+
+    if (mplayInfo->fadeOI == 0)
+        return;
+
+    mplayInfo->fadeOC--;
+    mask = 0xFFFF;
+
+    if (mplayInfo->fadeOC != 0)
+        return;
+
+    mplayInfo->fadeOC = mplayInfo->fadeOI;
+
+    if (mplayInfo->fadeOV & FADE_IN)
+    {
+        mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT);
+
+        if ((u16)(mplayInfo->fadeOV & mask) >= (64 << FADE_VOL_SHIFT))
+        {
+            mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
+            mplayInfo->fadeOI = 0;
+        }
+    }
+    else
+    {
+        mplayInfo->fadeOV -= (4 << FADE_VOL_SHIFT);
+
+        if ((s16)(mplayInfo->fadeOV & mask) <= 0)
+        {
+            i = mplayInfo->trackCount;
+            track = mplayInfo->tracks;
+
+            while (i > 0)
+            {
+                u32 val;
+
+                TrackStop(mplayInfo, track);
+
+                val = TEMPORARY_FADE;
+                fadeOV = mplayInfo->fadeOV;
+                val &= fadeOV;
+
+                if (!val)
+                    track->flags = 0;
+
+                i--;
+                track++;
+            }
+
+            if (mplayInfo->fadeOV & TEMPORARY_FADE)
+                mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE;
+            else
+                mplayInfo->status = MUSICPLAYER_STATUS_PAUSE;
+
+            mplayInfo->fadeOI = 0;
+            return;
+        }
+    }
+
+    i = mplayInfo->trackCount;
+    track = mplayInfo->tracks;
+
+    while (i > 0)
+    {
+        if (track->flags & MPT_FLG_EXIST)
+        {
+            fadeOV = mplayInfo->fadeOV;
+
+            track->volX = (fadeOV >> FADE_VOL_SHIFT);
+            track->flags |= MPT_FLG_VOLCHG;
+        }
+
+        i--;
+        track++;
+    }
+}
+
+void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    if (track->flags & MPT_FLG_VOLSET)
+    {
+        s32 x;
+        s32 y;
+
+        x = (u32)(track->vol * track->volX) >> 5;
+
+        if (track->modT == 1)
+            x = (u32)(x * (track->modM + 128)) >> 7;
+
+        y = 2 * track->pan + track->panX;
+
+        if (track->modT == 2)
+            y += track->modM;
+
+        if (y < -128)
+            y = -128;
+        else if (y > 127)
+            y = 127;
+
+        track->volMR = (u32)((y + 128) * x) >> 8;
+        track->volML = (u32)((127 - y) * x) >> 8;
+    }
+
+    if (track->flags & MPT_FLG_PITSET)
+    {
+        s32 bend = track->bend * track->bendRange;
+        s32 x = (track->tune + bend)
+              * 4
+              + (track->keyShift << 8)
+              + (track->keyShiftX << 8)
+              + track->pitX;
+
+        if (track->modT == 0)
+            x += 16 * track->modM;
+
+        track->keyM = x >> 8;
+        track->pitM = x;
+    }
+
+    track->flags &= ~(MPT_FLG_PITSET | MPT_FLG_VOLSET);
+}
+
+u32 MidiKeyToCgbFreq(u8 chanNum, u8 key, u8 fineAdjust)
+{
+    if (chanNum == 4)
+    {
+        if (key <= 20)
+        {
+            key = 0;
+        }
+        else
+        {
+            key -= 21;
+            if (key > 59)
+                key = 59;
+        }
+
+        return gNoiseTable[key];
+    }
+    else
+    {
+        s32 val1;
+        s32 val2;
+
+        if (key <= 35)
+        {
+            fineAdjust = 0;
+            key = 0;
+        }
+        else
+        {
+            key -= 36;
+            if (key > 130)
+            {
+                key = 130;
+                fineAdjust = 255;
+            }
+        }
+
+        val1 = gCgbScaleTable[key];
+        val1 = gCgbFreqTable[val1 & 0xF] >> (val1 >> 4);
+
+        val2 = gCgbScaleTable[key + 1];
+        val2 = gCgbFreqTable[val2 & 0xF] >> (val2 >> 4);
+
+        return val1 + ((fineAdjust * (val2 - val1)) >> 8) + 2048;
+    }
+}
+
+void CgbOscOff(u8 chanNum)
+{
+    switch (chanNum)
+    {
+    case 1:
+        REG_NR12 = 8;
+        REG_NR14 = 0x80;
+        break;
+    case 2:
+        REG_NR22 = 8;
+        REG_NR24 = 0x80;
+        break;
+    case 3:
+        REG_NR30 = 0;
+        break;
+    default:
+        REG_NR42 = 8;
+        REG_NR44 = 0x80;
+    }
+}
+
+static inline int CgbPan(struct CgbChannel *chan)
+{
+    u32 rightVolume = chan->rightVolume;
+    u32 leftVolume = chan->leftVolume;
+
+    if ((rightVolume = (u8)rightVolume) >= (leftVolume = (u8)leftVolume))
+    {
+        if (rightVolume / 2 >= leftVolume)
+        {
+            chan->pan = 0x0F;
+            return 1;
+        }
+    }
+    else
+    {
+        if (leftVolume / 2 >= rightVolume)
+        {
+            chan->pan = 0xF0;
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+void CgbModVol(struct CgbChannel *chan)
+{
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+
+    if ((soundInfo->mode & 1) || !CgbPan(chan))
+    {
+        chan->pan = 0xFF;
+        chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4;
+    }
+    else
+    {
+        // Force chan->rightVolume and chan->leftVolume to be read from memory again,
+        // even though there is no reason to do so.
+        // The command line option "-fno-gcse" achieves the same result as this.
+        asm("" : : : "memory");
+
+        chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4;
+        if (chan->eg > 15)
+            chan->eg = 15;
+    }
+
+    chan->sg = (chan->eg * chan->su + 15) >> 4;
+    chan->pan &= chan->panMask;
+}
+
+void CgbSound(void)
+{
+    s32 ch;
+    struct CgbChannel *channels;
+    s32 evAdd;
+    s32 prevC15;
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+    vu8 *nrx0ptr;
+    vu8 *nrx1ptr;
+    vu8 *nrx2ptr;
+    vu8 *nrx3ptr;
+    vu8 *nrx4ptr;
+
+    // Most comparision operations that cast to s8 perform 'and' by 0xFF.
+    int mask = 0xff;
+
+    if (soundInfo->c15)
+        soundInfo->c15--;
+    else
+        soundInfo->c15 = 14;
+
+    for (ch = 1, channels = soundInfo->cgbChans; ch <= 4; ch++, channels++)
+    {
+        if (!(channels->sf & 0xc7))
+            continue;
+
+        switch (ch)
+        {
+        case 1:
+            nrx0ptr = (vu8 *)(REG_ADDR_NR10);
+            nrx1ptr = (vu8 *)(REG_ADDR_NR11);
+            nrx2ptr = (vu8 *)(REG_ADDR_NR12);
+            nrx3ptr = (vu8 *)(REG_ADDR_NR13);
+            nrx4ptr = (vu8 *)(REG_ADDR_NR14);
+            break;
+        case 2:
+            nrx0ptr = (vu8 *)(REG_ADDR_NR10+1);
+            nrx1ptr = (vu8 *)(REG_ADDR_NR21);
+            nrx2ptr = (vu8 *)(REG_ADDR_NR22);
+            nrx3ptr = (vu8 *)(REG_ADDR_NR23);
+            nrx4ptr = (vu8 *)(REG_ADDR_NR24);
+            break;
+        case 3:
+            nrx0ptr = (vu8 *)(REG_ADDR_NR30);
+            nrx1ptr = (vu8 *)(REG_ADDR_NR31);
+            nrx2ptr = (vu8 *)(REG_ADDR_NR32);
+            nrx3ptr = (vu8 *)(REG_ADDR_NR33);
+            nrx4ptr = (vu8 *)(REG_ADDR_NR34);
+            break;
+        default:
+            nrx0ptr = (vu8 *)(REG_ADDR_NR30+1);
+            nrx1ptr = (vu8 *)(REG_ADDR_NR41);
+            nrx2ptr = (vu8 *)(REG_ADDR_NR42);
+            nrx3ptr = (vu8 *)(REG_ADDR_NR43);
+            nrx4ptr = (vu8 *)(REG_ADDR_NR44);
+            break;
+        }
+
+        prevC15 = soundInfo->c15;
+        evAdd = *nrx2ptr;
+
+        if (channels->sf & 0x80)
+        {
+            if (!(channels->sf & 0x40))
+            {
+                channels->sf = 3;
+                channels->mo = 3;
+                CgbModVol(channels);
+                switch (ch)
+                {
+                case 1:
+                    *nrx0ptr = channels->sw;
+                    // fallthrough
+                case 2:
+                    *nrx1ptr = ((u32)channels->wp << 6) + channels->le;
+                    goto loc_82E0E30;
+                case 3:
+                    if ((u32)channels->wp != channels->cp)
+                    {
+                        *nrx0ptr = 0x40;
+                        REG_WAVE_RAM0 = channels->wp[0];
+                        REG_WAVE_RAM1 = channels->wp[1];
+                        REG_WAVE_RAM2 = channels->wp[2];
+                        REG_WAVE_RAM3 = channels->wp[3];
+                        channels->cp = (u32)channels->wp;
+                    }
+                    *nrx0ptr = 0;
+                    *nrx1ptr = channels->le;
+                    if (channels->le)
+                        channels->n4 = -64;
+                    else
+                        channels->n4 = -128;
+                    break;
+                default:
+                    *nrx1ptr = channels->le;
+                    *nrx3ptr = (u32)channels->wp << 3;
+                loc_82E0E30:
+                    evAdd = channels->at + 8;
+                    if (channels->le)
+                        channels->n4 = 64;
+                    else
+                        channels->n4 = 0;
+                    break;
+                }
+                channels->ec = channels->at;
+                if ((s8)(channels->at & mask))
+                {
+                    channels->ev = 0;
+                    goto EC_MINUS;
+                }
+                else
+                {
+                    goto loc_82E0F96;
+                }
+            }
+            else
+            {
+                goto loc_82E0E82;
+            }
+        }
+        else if (channels->sf & 0x04)
+        {
+            channels->echoLength--;
+            if ((s8)(channels->echoLength & mask) <= 0)
+            {
+            loc_82E0E82:
+                CgbOscOff(ch);
+                channels->sf = 0;
+                goto LAST_LABEL;
+            }
+            goto loc_82E0FD6;
+        }
+        else if ((channels->sf & 0x40) && (channels->sf & 0x03))
+        {
+            channels->sf &= 0xfc;
+            channels->ec = channels->re;
+            if ((s8)(channels->re & mask))
+            {
+                channels->mo |= 1;
+                if (ch != 3)
+                {
+                    evAdd = channels->re;
+                }
+                goto EC_MINUS;
+            }
+            else
+            {
+                goto loc_82E0F02;
+            }
+        }
+        else
+        {
+        loc_82E0ED0:
+            if (channels->ec == 0)
+            {
+                if (ch == 3)
+                {
+                    channels->mo |= 1;
+                }
+                CgbModVol(channels);
+                if ((channels->sf & 0x3) == 0)
+                {
+                    channels->ev--;
+                    if ((s8)(channels->ev & mask) <= 0)
+                    {
+                    loc_82E0F02:
+                        channels->ev = ((channels->eg * channels->echoVolume) + 0xFF) >> 8;
+                        if (channels->ev)
+                        {
+                            channels->sf |= 0x4;
+                            channels->mo |= 1;
+                            if (ch != 3)
+                            {
+                                evAdd = 8;
+                            }
+                            goto loc_82E0FD6;
+                        }
+                        else
+                        {
+                            goto loc_82E0E82;
+                        }
+                    }
+                    else
+                    {
+                        channels->ec = channels->re;
+                    }
+                }
+                else if ((channels->sf & 0x3) == 1)
+                {
+                loc_82E0F3A:
+                    channels->ev = channels->sg;
+                    channels->ec = 7;
+                }
+                else if ((channels->sf & 0x3) == 2)
+                {
+                    int ev, sg;
+
+                    channels->ev--;
+                    ev = (s8)(channels->ev & mask);
+                    sg = (s8)(channels->sg);
+                    if (ev <= sg)
+                    {
+                    loc_82E0F5A:
+                        if (channels->su == 0)
+                        {
+                            channels->sf &= 0xfc;
+                            goto loc_82E0F02;
+                        }
+                        else
+                        {
+                            channels->sf--;
+                            channels->mo |= 1;
+                            if (ch != 3)
+                            {
+                                evAdd = 8;
+                            }
+                            goto loc_82E0F3A;
+                        }
+                    }
+                    else
+                    {
+                        channels->ec = channels->de;
+                    }
+                }
+                else
+                {
+                    channels->ev++;
+                    if ((u8)(channels->ev & mask) >= channels->eg)
+                    {
+                    loc_82E0F96:
+                        channels->sf--;
+                        channels->ec = channels->de;
+                        if ((u8)(channels->ec & mask))
+                        {
+                            channels->mo |= 1;
+                            channels->ev = channels->eg;
+                            if (ch != 3)
+                            {
+                                evAdd = channels->de;
+                            }
+                        }
+                        else
+                        {
+                            goto loc_82E0F5A;
+                        }
+                    }
+                    else
+                    {
+                        channels->ec = channels->at;
+                    }
+                }
+            }
+        }
+
+    EC_MINUS:
+        channels->ec--;
+        if (prevC15 == 0)
+        {
+            prevC15--;
+            goto loc_82E0ED0;
+        }
+
+    loc_82E0FD6:
+        if (channels->mo & 0x2)
+        {
+            if (ch < 4 && (channels->ty & 0x08))
+            {
+                int biasH = REG_SOUNDBIAS_H;
+
+                if (biasH < 64)
+                {
+                    channels->fr = (channels->fr + 2) & 0x7fc;
+                }
+                else if (biasH < 128)
+                {
+                    channels->fr = (channels->fr + 1) & 0x7fe;
+                }
+            }
+            if (ch != 4)
+            {
+                *nrx3ptr = channels->fr;
+            }
+            else
+            {
+                *nrx3ptr = (*nrx3ptr & 0x08) | channels->fr;
+            }
+            channels->n4 = (channels->n4 & 0xC0) + (*((u8*)(&channels->fr) + 1));
+            *nrx4ptr = (s8)(channels->n4 & mask);
+        }
+
+        if (channels->mo & 1)
+        {
+            REG_NR51 = (REG_NR51 & ~channels->panMask) | channels->pan;
+            if (ch == 3)
+            {
+                *nrx2ptr = gCgb3Vol[channels->ev];
+                if (channels->n4 & 0x80)
+                {
+                    *nrx0ptr = 0x80;
+                    *nrx4ptr = channels->n4;
+                    channels->n4 &= 0x7f;
+                }
+            }
+            else
+            {
+                evAdd &= 0xf;
+                *nrx2ptr = (channels->ev << 4) + evAdd;
+                *nrx4ptr = channels->n4 | 0x80;
+                if (ch == 1 && !(*nrx0ptr & 0x08))
+                {
+                    *nrx4ptr = channels->n4 | 0x80;
+                }
+            }
+        }
+
+    LAST_LABEL:
+        channels->mo = 0;
+    }
+}
+
+void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo)
+{
+    if (mplayInfo->ident == ID_NUMBER)
+    {
+        mplayInfo->ident++;
+        mplayInfo->tempoU = tempo;
+        mplayInfo->tempoI = (mplayInfo->tempoD * mplayInfo->tempoU) >> 8;
+        mplayInfo->ident = ID_NUMBER;
+    }
+}
+
+void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume)
+{
+    s32 i;
+    u32 bit;
+    struct MusicPlayerTrack *track;
+
+    if (mplayInfo->ident != ID_NUMBER)
+        return;
+
+    mplayInfo->ident++;
+
+    i = mplayInfo->trackCount;
+    track = mplayInfo->tracks;
+    bit = 1;
+
+    while (i > 0)
+    {
+        if (trackBits & bit)
+        {
+            if (track->flags & MPT_FLG_EXIST)
+            {
+                track->volX = volume / 4;
+                track->flags |= MPT_FLG_VOLCHG;
+            }
+        }
+
+        i--;
+        track++;
+        bit <<= 1;
+    }
+
+    mplayInfo->ident = ID_NUMBER;
+}
+
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
+{
+    s32 i;
+    u32 bit;
+    struct MusicPlayerTrack *track;
+
+    if (mplayInfo->ident != ID_NUMBER)
+        return;
+
+    mplayInfo->ident++;
+
+    i = mplayInfo->trackCount;
+    track = mplayInfo->tracks;
+    bit = 1;
+
+    while (i > 0)
+    {
+        if (trackBits & bit)
+        {
+            if (track->flags & MPT_FLG_EXIST)
+            {
+                track->keyShiftX = pitch >> 8;
+                track->pitX = pitch;
+                track->flags |= MPT_FLG_PITCHG;
+            }
+        }
+
+        i--;
+        track++;
+        bit <<= 1;
+    }
+
+    mplayInfo->ident = ID_NUMBER;
+}
+
+void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan)
+{
+    s32 i;
+    u32 bit;
+    struct MusicPlayerTrack *track;
+
+    if (mplayInfo->ident != ID_NUMBER)
+        return;
+
+    mplayInfo->ident++;
+
+    i = mplayInfo->trackCount;
+    track = mplayInfo->tracks;
+    bit = 1;
+
+    while (i > 0)
+    {
+        if (trackBits & bit)
+        {
+            if (track->flags & MPT_FLG_EXIST)
+            {
+                track->panX = pan;
+                track->flags |= MPT_FLG_VOLCHG;
+            }
+        }
+
+        i--;
+        track++;
+        bit <<= 1;
+    }
+
+    mplayInfo->ident = ID_NUMBER;
+}
+
+void ClearModM(struct MusicPlayerTrack *track)
+{
+    track->lfoSpeedC = 0;
+    track->modM = 0;
+
+    if (track->modT == 0)
+        track->flags |= MPT_FLG_PITCHG;
+    else
+        track->flags |= MPT_FLG_VOLCHG;
+}
+
+void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth)
+{
+    s32 i;
+    u32 bit;
+    struct MusicPlayerTrack *track;
+
+    if (mplayInfo->ident != ID_NUMBER)
+        return;
+
+    mplayInfo->ident++;
+
+    i = mplayInfo->trackCount;
+    track = mplayInfo->tracks;
+    bit = 1;
+
+    while (i > 0)
+    {
+        if (trackBits & bit)
+        {
+            if (track->flags & MPT_FLG_EXIST)
+            {
+                track->mod = modDepth;
+
+                if (!track->mod)
+                    ClearModM(track);
+            }
+        }
+
+        i--;
+        track++;
+        bit <<= 1;
+    }
+
+    mplayInfo->ident = ID_NUMBER;
+}
+
+void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed)
+{
+    s32 i;
+    u32 bit;
+    struct MusicPlayerTrack *track;
+
+    if (mplayInfo->ident != ID_NUMBER)
+        return;
+
+    mplayInfo->ident++;
+
+    i = mplayInfo->trackCount;
+    track = mplayInfo->tracks;
+    bit = 1;
+
+    while (i > 0)
+    {
+        if (trackBits & bit)
+        {
+            if (track->flags & MPT_FLG_EXIST)
+            {
+                track->lfoSpeed = lfoSpeed;
+
+                if (!track->lfoSpeed)
+                    ClearModM(track);
+            }
+        }
+
+        i--;
+        track++;
+        bit <<= 1;
+    }
+
+    mplayInfo->ident = ID_NUMBER;
+}
+
+#define MEMACC_COND_JUMP(cond) \
+if (cond)                      \
+    goto cond_true;            \
+else                           \
+    goto cond_false;           \
+
+void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    u32 op;
+    u8 *addr;
+    u8 data;
+
+    op = *track->cmdPtr;
+    track->cmdPtr++;
+
+    addr = mplayInfo->memAccArea + *track->cmdPtr;
+    track->cmdPtr++;
+
+    data = *track->cmdPtr;
+    track->cmdPtr++;
+
+    switch (op)
+    {
+    case 0:
+        *addr = data;
+        return;
+    case 1:
+        *addr += data;
+        return;
+    case 2:
+        *addr -= data;
+        return;
+    case 3:
+        *addr = mplayInfo->memAccArea[data];
+        return;
+    case 4:
+        *addr += mplayInfo->memAccArea[data];
+        return;
+    case 5:
+        *addr -= mplayInfo->memAccArea[data];
+        return;
+    case 6:
+        MEMACC_COND_JUMP(*addr == data)
+        return;
+    case 7:
+        MEMACC_COND_JUMP(*addr != data)
+        return;
+    case 8:
+        MEMACC_COND_JUMP(*addr > data)
+        return;
+    case 9:
+        MEMACC_COND_JUMP(*addr >= data)
+        return;
+    case 10:
+        MEMACC_COND_JUMP(*addr <= data)
+        return;
+    case 11:
+        MEMACC_COND_JUMP(*addr < data)
+        return;
+    case 12:
+        MEMACC_COND_JUMP(*addr == mplayInfo->memAccArea[data])
+        return;
+    case 13:
+        MEMACC_COND_JUMP(*addr != mplayInfo->memAccArea[data])
+        return;
+    case 14:
+        MEMACC_COND_JUMP(*addr > mplayInfo->memAccArea[data])
+        return;
+    case 15:
+        MEMACC_COND_JUMP(*addr >= mplayInfo->memAccArea[data])
+        return;
+    case 16:
+        MEMACC_COND_JUMP(*addr <= mplayInfo->memAccArea[data])
+        return;
+    case 17:
+        MEMACC_COND_JUMP(*addr < mplayInfo->memAccArea[data])
+        return;
+    default:
+        return;
+    }
+
+cond_true:
+    {
+        void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[1]);
+        func(mplayInfo, track);
+        return;
+    }
+
+cond_false:
+    track->cmdPtr += 4;
+}
+
+void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    u32 n = *track->cmdPtr;
+    track->cmdPtr++;
+
+    gXcmdTable[n](mplayInfo, track);
+}
+
+void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[0]);
+    func(mplayInfo, track);
+}
+
+#define READ_XCMD_BYTE(var, n)       \
+{                                    \
+    u32 byte = track->cmdPtr[(n)]; \
+    byte <<= n * 8;                  \
+    (var) &= ~(0xFF << (n * 8));     \
+    (var) |= byte;                   \
+}
+
+void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    u32 wav;
+
+    READ_XCMD_BYTE(wav, 0) // UB: uninitialized variable
+    READ_XCMD_BYTE(wav, 1)
+    READ_XCMD_BYTE(wav, 2)
+    READ_XCMD_BYTE(wav, 3)
+
+    track->tone.wav = (struct WaveData *)wav;
+    track->cmdPtr += 4;
+}
+
+void ply_xtype(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->tone.type = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xatta(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->tone.attack = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xdeca(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->tone.decay = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xsust(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->tone.sustain = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xrele(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->tone.release = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xiecv(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->echoVolume = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xiecl(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->echoLength = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xleng(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->tone.length = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xswee(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    track->tone.pan_sweep = *track->cmdPtr;
+    track->cmdPtr++;
+}
+
+void ply_xcmd_0C(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    u32 unk;
+
+    READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable
+    READ_XCMD_BYTE(unk, 1)
+
+    if (track->unk_3A < (u16)unk)
+    {
+        track->unk_3A++;
+        track->cmdPtr -= 2;
+        track->wait = 1;
+    }
+    else
+    {
+        track->unk_3A = 0;
+        track->cmdPtr += 2;
+    }
+}
+
+void ply_xcmd_0D(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
+{
+    u32 unk;
+
+    READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable
+    READ_XCMD_BYTE(unk, 1)
+    READ_XCMD_BYTE(unk, 2)
+    READ_XCMD_BYTE(unk, 3)
+
+    track->unk_3C = unk;
+    track->cmdPtr += 4;
+}
+
+void DummyFunc(void)
+{
+}
+
+struct MusicPlayerInfo *SetPokemonCryTone(struct ToneData *tone)
+{
+    u32 maxClock = 0;
+    s32 maxClockIndex = 0;
+    s32 i;
+    struct MusicPlayerInfo *mplayInfo;
+
+    for (i = 0; i < MAX_POKEMON_CRIES; i++)
+    {
+        struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2];
+
+        if (!track->flags && (!track->chan || track->chan->track != track))
+            goto start_song;
+
+        if (maxClock < gPokemonCryMusicPlayers[i].clock)
+        {
+            maxClock = gPokemonCryMusicPlayers[i].clock;
+            maxClockIndex = i;
+        }
+    }
+
+    i = maxClockIndex;
+
+start_song:
+    mplayInfo = &gPokemonCryMusicPlayers[i];
+    mplayInfo->ident++;
+
+#define CRY ((s32)&gPokemonCrySongs + i * sizeof(struct PokemonCrySong))
+#define CRY_OFS(field) offsetof(struct PokemonCrySong, field)
+
+    memcpy((void *)CRY, &gPokemonCrySong, sizeof(struct PokemonCrySong));
+
+    *(u32 *)(CRY + CRY_OFS(tone)) = (u32)tone;
+    *(u32 *)(CRY + CRY_OFS(part)) = CRY + CRY_OFS(part0);
+    *(u32 *)(CRY + CRY_OFS(part) + 4) = CRY + CRY_OFS(part1);
+    *(u32 *)(CRY + CRY_OFS(gotoTarget)) = CRY + CRY_OFS(cont);
+
+#undef CRY_OFS
+#undef CRY
+
+    mplayInfo->ident = ID_NUMBER;
+
+    MPlayStart(mplayInfo, (struct SongHeader *)(&gPokemonCrySongs[i]));
+
+    return mplayInfo;
+}
+
+void SetPokemonCryVolume(u8 val)
+{
+    gPokemonCrySong.volumeValue = val & 0x7F;
+}
+
+void SetPokemonCryPanpot(s8 val)
+{
+    gPokemonCrySong.panValue = (val + C_V) & 0x7F;
+}
+
+void SetPokemonCryPitch(s16 val)
+{
+    s16 b = val + 0x80;
+    u8 a = gPokemonCrySong.tuneValue2 - gPokemonCrySong.tuneValue;
+    gPokemonCrySong.tieKeyValue = (b >> 8) & 0x7F;
+    gPokemonCrySong.tuneValue = (b >> 1) & 0x7F;
+    gPokemonCrySong.tuneValue2 = (a + ((b >> 1) & 0x7F)) & 0x7F;
+}
+
+void SetPokemonCryLength(u16 val)
+{
+    gPokemonCrySong.unkCmd0CParam = val;
+}
+
+void SetPokemonCryRelease(u8 val)
+{
+    gPokemonCrySong.releaseValue = val;
+}
+
+void SetPokemonCryProgress(u32 val)
+{
+    gPokemonCrySong.unkCmd0DParam = val;
+}
+
+int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo)
+{
+    struct MusicPlayerTrack *track = mplayInfo->tracks;
+
+    if (track->chan && track->chan->track == track)
+        return 1;
+    else
+        return 0;
+}
+
+void SetPokemonCryChorus(s8 val)
+{
+    if (val)
+    {
+        gPokemonCrySong.trackCount = 2;
+        gPokemonCrySong.tuneValue2 = (val + gPokemonCrySong.tuneValue) & 0x7F;
+    }
+    else
+    {
+        gPokemonCrySong.trackCount = 1;
+    }
+}
+
+void SetPokemonCryStereo(u32 val)
+{
+    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
+
+    if (val)
+    {
+        REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT
+                       | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT
+                       | SOUND_ALL_MIX_FULL;
+        soundInfo->mode &= ~1;
+    }
+    else
+    {
+        REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT | SOUND_B_RIGHT_OUTPUT
+                       | SOUND_A_TIMER_0 | SOUND_A_LEFT_OUTPUT | SOUND_A_RIGHT_OUTPUT
+                       | SOUND_B_MIX_HALF | SOUND_A_MIX_HALF | SOUND_CGB_MIX_FULL;
+        soundInfo->mode |= 1;
+    }
+}
+
+void SetPokemonCryPriority(u8 val)
+{
+    gPokemonCrySong.priority = val;
+}
diff --git a/src/m4a_2.c b/src/m4a_2.c
deleted file mode 100644
index 0625f05d1..000000000
--- a/src/m4a_2.c
+++ /dev/null
@@ -1,912 +0,0 @@
-#include "gba/m4a_internal.h"
-
-#define BSS_CODE __attribute__((section(".bss.code")))
-
-BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0};
-
-struct SoundInfo gSoundInfo;
-struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES];
-struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES];
-void *gMPlayJumpTable[36];
-struct CgbChannel gCgbChans[4];
-struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2];
-struct PokemonCrySong gPokemonCrySong;
-struct MusicPlayerInfo gMPlayInfo_BGM;
-struct MusicPlayerInfo gMPlayInfo_SE1;
-struct MusicPlayerInfo gMPlayInfo_SE2;
-struct MusicPlayerInfo gMPlayInfo_SE3;
-u8 gMPlayMemAccArea[0x10];
-
-u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust)
-{
-    u32 val1;
-    u32 val2;
-    u32 fineAdjustShifted = fineAdjust << 24;
-
-    if (key > 178)
-    {
-        key = 178;
-        fineAdjustShifted = 255 << 24;
-    }
-
-    val1 = gScaleTable[key];
-    val1 = gFreqTable[val1 & 0xF] >> (val1 >> 4);
-
-    val2 = gScaleTable[key + 1];
-    val2 = gFreqTable[val2 & 0xF] >> (val2 >> 4);
-
-    return umul3232H32(wav->freq, val1 + umul3232H32(val2 - val1, fineAdjustShifted));
-}
-
-void UnusedDummyFunc()
-{
-}
-
-void MPlayContinue(struct MusicPlayerInfo *mplayInfo)
-{
-    if (mplayInfo->ident == ID_NUMBER)
-    {
-        mplayInfo->ident++;
-        mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE;
-        mplayInfo->ident = ID_NUMBER;
-    }
-}
-
-void MPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
-{
-    if (mplayInfo->ident == ID_NUMBER)
-    {
-        mplayInfo->ident++;
-        mplayInfo->fadeOC = speed;
-        mplayInfo->fadeOI = speed;
-        mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
-        mplayInfo->ident = ID_NUMBER;
-    }
-}
-
-void m4aSoundInit(void)
-{
-    s32 i;
-
-    CpuCopy32((void *)((s32)SoundMainRAM & ~1), SoundMainRAM_Buffer, sizeof(SoundMainRAM_Buffer));
-
-    SoundInit(&gSoundInfo);
-    MPlayExtender(gCgbChans);
-    m4aSoundMode(SOUND_MODE_DA_BIT_8
-               | SOUND_MODE_FREQ_13379
-               | (12 << SOUND_MODE_MASVOL_SHIFT)
-               | (5 << SOUND_MODE_MAXCHN_SHIFT));
-
-    for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
-    {
-        struct MusicPlayerInfo *mplayInfo = gMPlayTable[i].info;
-        MPlayOpen(mplayInfo, gMPlayTable[i].track, gMPlayTable[i].unk_8);
-        mplayInfo->unk_B = gMPlayTable[i].unk_A;
-        mplayInfo->memAccArea = gMPlayMemAccArea;
-    }
-
-    memcpy(&gPokemonCrySong, &gPokemonCrySongTemplate, sizeof(struct PokemonCrySong));
-
-    for (i = 0; i < MAX_POKEMON_CRIES; i++)
-    {
-        struct MusicPlayerInfo *mplayInfo = &gPokemonCryMusicPlayers[i];
-        struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2];
-        MPlayOpen(mplayInfo, track, 2);
-        track->chan = 0;
-    }
-}
-
-void m4aSoundMain(void)
-{
-    SoundMain();
-}
-
-void m4aSongNumStart(u16 n)
-{
-    const struct MusicPlayer *mplayTable = gMPlayTable;
-    const struct Song *songTable = gSongTable;
-    const struct Song *song = &songTable[n];
-    const struct MusicPlayer *mplay = &mplayTable[song->ms];
-
-    MPlayStart(mplay->info, song->header);
-}
-
-void m4aSongNumStartOrChange(u16 n)
-{
-    const struct MusicPlayer *mplayTable = gMPlayTable;
-    const struct Song *songTable = gSongTable;
-    const struct Song *song = &songTable[n];
-    const struct MusicPlayer *mplay = &mplayTable[song->ms];
-
-    if (mplay->info->songHeader != song->header)
-    {
-        MPlayStart(mplay->info, song->header);
-    }
-    else
-    {
-        if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0
-         || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE))
-        {
-            MPlayStart(mplay->info, song->header);
-        }
-    }
-}
-
-void m4aSongNumStartOrContinue(u16 n)
-{
-    const struct MusicPlayer *mplayTable = gMPlayTable;
-    const struct Song *songTable = gSongTable;
-    const struct Song *song = &songTable[n];
-    const struct MusicPlayer *mplay = &mplayTable[song->ms];
-
-    if (mplay->info->songHeader != song->header)
-        MPlayStart(mplay->info, song->header);
-    else if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0)
-        MPlayStart(mplay->info, song->header);
-    else if (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)
-        MPlayContinue(mplay->info);
-}
-
-void m4aSongNumStop(u16 n)
-{
-    const struct MusicPlayer *mplayTable = gMPlayTable;
-    const struct Song *songTable = gSongTable;
-    const struct Song *song = &songTable[n];
-    const struct MusicPlayer *mplay = &mplayTable[song->ms];
-
-    if (mplay->info->songHeader == song->header)
-        m4aMPlayStop(mplay->info);
-}
-
-void m4aSongNumContinue(u16 n)
-{
-    const struct MusicPlayer *mplayTable = gMPlayTable;
-    const struct Song *songTable = gSongTable;
-    const struct Song *song = &songTable[n];
-    const struct MusicPlayer *mplay = &mplayTable[song->ms];
-
-    if (mplay->info->songHeader == song->header)
-        MPlayContinue(mplay->info);
-}
-
-void m4aMPlayAllStop(void)
-{
-    s32 i;
-
-    for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
-        m4aMPlayStop(gMPlayTable[i].info);
-
-    for (i = 0; i < MAX_POKEMON_CRIES; i++)
-        m4aMPlayStop(&gPokemonCryMusicPlayers[i]);
-}
-
-void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo)
-{
-    MPlayContinue(mplayInfo);
-}
-
-void m4aMPlayAllContinue(void)
-{
-    s32 i;
-
-    for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
-        MPlayContinue(gMPlayTable[i].info);
-
-    for (i = 0; i < MAX_POKEMON_CRIES; i++)
-        MPlayContinue(&gPokemonCryMusicPlayers[i]);
-}
-
-void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
-{
-    MPlayFadeOut(mplayInfo, speed);
-}
-
-void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed)
-{
-    if (mplayInfo->ident == ID_NUMBER)
-    {
-        mplayInfo->ident++;
-        mplayInfo->fadeOC = speed;
-        mplayInfo->fadeOI = speed;
-        mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT) | TEMPORARY_FADE;
-        mplayInfo->ident = ID_NUMBER;
-    }
-}
-
-void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed)
-{
-    if (mplayInfo->ident == ID_NUMBER)
-    {
-        mplayInfo->ident++;
-        mplayInfo->fadeOC = speed;
-        mplayInfo->fadeOI = speed;
-        mplayInfo->fadeOV = (0 << FADE_VOL_SHIFT) | FADE_IN;
-        mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE;
-        mplayInfo->ident = ID_NUMBER;
-    }
-}
-
-void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo)
-{
-    s32 trackCount = mplayInfo->trackCount;
-    struct MusicPlayerTrack *track = mplayInfo->tracks;
-
-    while (trackCount > 0)
-    {
-        if (track->flags & MPT_FLG_EXIST)
-        {
-            if (track->flags & MPT_FLG_START)
-            {
-                Clear64byte(track);
-                track->flags = MPT_FLG_EXIST;
-                track->bendRange = 2;
-                track->volX = 64;
-                track->lfoSpeed = 22;
-                track->tone.type = 1;
-            }
-        }
-
-        trackCount--;
-        track++;
-    }
-}
-
-void MPlayExtender(struct CgbChannel *cgbChans)
-{
-    struct SoundInfo *soundInfo;
-    u32 ident;
-
-    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE
-                   | SOUND_4_ON
-                   | SOUND_3_ON
-                   | SOUND_2_ON
-                   | SOUND_1_ON;
-    REG_SOUNDCNT_L = 0; // set master volume to zero
-    REG_NR12 = 0x8;
-    REG_NR22 = 0x8;
-    REG_NR42 = 0x8;
-    REG_NR14 = 0x80;
-    REG_NR24 = 0x80;
-    REG_NR44 = 0x80;
-    REG_NR30 = 0;
-    REG_NR50 = 0x77;
-
-    soundInfo = SOUND_INFO_PTR;
-
-    ident = soundInfo->ident;
-
-    if (ident != ID_NUMBER)
-        return;
-
-    soundInfo->ident++;
-
-    gMPlayJumpTable[8] = ply_memacc;
-    gMPlayJumpTable[17] = ply_lfos;
-    gMPlayJumpTable[19] = ply_mod;
-    gMPlayJumpTable[28] = ply_xcmd;
-    gMPlayJumpTable[29] = ply_endtie;
-    gMPlayJumpTable[30] = SampleFreqSet;
-    gMPlayJumpTable[31] = TrackStop;
-    gMPlayJumpTable[32] = FadeOutBody;
-    gMPlayJumpTable[33] = TrkVolPitSet;
-
-    soundInfo->cgbChans = (struct CgbChannel *)cgbChans;
-    soundInfo->CgbSound = CgbSound;
-    soundInfo->CgbOscOff = CgbOscOff;
-    soundInfo->MidiKeyToCgbFreq = MidiKeyToCgbFreq;
-    soundInfo->maxLines = MAX_LINES;
-
-    CpuFill32(0, cgbChans, sizeof(struct CgbChannel) * 4);
-
-    cgbChans[0].ty = 1;
-    cgbChans[0].panMask = 0x11;
-    cgbChans[1].ty = 2;
-    cgbChans[1].panMask = 0x22;
-    cgbChans[2].ty = 3;
-    cgbChans[2].panMask = 0x44;
-    cgbChans[3].ty = 4;
-    cgbChans[3].panMask = 0x88;
-
-    soundInfo->ident = ident;
-}
-
-void MusicPlayerJumpTableCopy(void)
-{
-    asm("swi 0x2A");
-}
-
-void ClearChain(void *x)
-{
-    void (*func)(void *) = *(&gMPlayJumpTable[34]);
-    func(x);
-}
-
-void Clear64byte(void *x)
-{
-    void (*func)(void *) = *(&gMPlayJumpTable[35]);
-    func(x);
-}
-
-void SoundInit(struct SoundInfo *soundInfo)
-{
-    soundInfo->ident = 0;
-
-    if (REG_DMA1CNT & (DMA_REPEAT << 16))
-        REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
-
-    if (REG_DMA2CNT & (DMA_REPEAT << 16))
-        REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
-
-    REG_DMA1CNT_H = DMA_32BIT;
-    REG_DMA2CNT_H = DMA_32BIT;
-    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE
-                   | SOUND_4_ON
-                   | SOUND_3_ON
-                   | SOUND_2_ON
-                   | SOUND_1_ON;
-    REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT
-                   | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT
-                   | SOUND_ALL_MIX_FULL;
-    REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40;
-
-    REG_DMA1SAD = (s32)soundInfo->pcmBuffer;
-    REG_DMA1DAD = (s32)&REG_FIFO_A;
-    REG_DMA2SAD = (s32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE;
-    REG_DMA2DAD = (s32)&REG_FIFO_B;
-
-    SOUND_INFO_PTR = soundInfo;
-    CpuFill32(0, soundInfo, sizeof(struct SoundInfo));
-
-    soundInfo->maxChans = 8;
-    soundInfo->masterVolume = 15;
-    soundInfo->plynote = (u32)ply_note;
-    soundInfo->CgbSound = DummyFunc;
-    soundInfo->CgbOscOff = (void (*)(u8))DummyFunc;
-    soundInfo->MidiKeyToCgbFreq = (u32 (*)(u8, u8, u8))DummyFunc;
-    soundInfo->ExtVolPit = (u32)DummyFunc;
-
-    MPlayJumpTableCopy(gMPlayJumpTable);
-
-    soundInfo->MPlayJumpTable = (u32)gMPlayJumpTable;
-
-    SampleFreqSet(SOUND_MODE_FREQ_13379);
-
-    soundInfo->ident = ID_NUMBER;
-}
-
-void SampleFreqSet(u32 freq)
-{
-    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
-
-    freq = (freq & 0xF0000) >> 16;
-    soundInfo->freq = freq;
-    soundInfo->pcmSamplesPerVBlank = gPcmSamplesPerVBlankTable[freq - 1];
-    soundInfo->pcmDmaPeriod = PCM_DMA_BUF_SIZE / soundInfo->pcmSamplesPerVBlank;
-
-    // LCD refresh rate 59.7275Hz
-    soundInfo->pcmFreq = (597275 * soundInfo->pcmSamplesPerVBlank + 5000) / 10000;
-
-    // CPU frequency 16.78Mhz
-    soundInfo->divFreq = (16777216 / soundInfo->pcmFreq + 1) >> 1;
-
-    // Turn off timer 0.
-    REG_TM0CNT_H = 0;
-
-    // cycles per LCD fresh 280896
-    REG_TM0CNT_L = -(280896 / soundInfo->pcmSamplesPerVBlank);
-
-    m4aSoundVSyncOn();
-
-    while (*(vu8 *)REG_ADDR_VCOUNT == 159)
-        ;
-
-    while (*(vu8 *)REG_ADDR_VCOUNT != 159)
-        ;
-
-    REG_TM0CNT_H = TIMER_ENABLE | TIMER_1CLK;
-}
-
-void m4aSoundMode(u32 mode)
-{
-    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
-    u32 temp;
-
-    if (soundInfo->ident != ID_NUMBER)
-        return;
-
-    soundInfo->ident++;
-
-    temp = mode & (SOUND_MODE_REVERB_SET | SOUND_MODE_REVERB_VAL);
-
-    if (temp)
-        soundInfo->reverb = temp & SOUND_MODE_REVERB_VAL;
-
-    temp = mode & SOUND_MODE_MAXCHN;
-
-    if (temp)
-    {
-        struct SoundChannel *chan;
-
-        soundInfo->maxChans = temp >> SOUND_MODE_MAXCHN_SHIFT;
-
-        temp = MAX_DIRECTSOUND_CHANNELS;
-        chan = &soundInfo->chans[0];
-
-        while (temp != 0)
-        {
-            chan->status = 0;
-            temp--;
-            chan++;
-        }
-    }
-
-    temp = mode & SOUND_MODE_MASVOL;
-
-    if (temp)
-        soundInfo->masterVolume = temp >> SOUND_MODE_MASVOL_SHIFT;
-
-    temp = mode & SOUND_MODE_DA_BIT;
-
-    if (temp)
-    {
-        temp = (temp & 0x300000) >> 14;
-        REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | temp;
-    }
-
-    temp = mode & SOUND_MODE_FREQ;
-
-    if (temp)
-    {
-        m4aSoundVSyncOff();
-        SampleFreqSet(temp);
-    }
-
-    soundInfo->ident = ID_NUMBER;
-}
-
-void SoundClear(void)
-{
-    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
-    s32 i;
-    void *chan;
-
-    if (soundInfo->ident != ID_NUMBER)
-        return;
-
-    soundInfo->ident++;
-
-    i = MAX_DIRECTSOUND_CHANNELS;
-    chan = &soundInfo->chans[0];
-
-    while (i > 0)
-    {
-        ((struct SoundChannel *)chan)->status = 0;
-        i--;
-        chan = (void *)((s32)chan + sizeof(struct SoundChannel));
-    }
-
-    chan = soundInfo->cgbChans;
-
-    if (chan)
-    {
-        i = 1;
-
-        while (i <= 4)
-        {
-            soundInfo->CgbOscOff(i);
-            ((struct CgbChannel *)chan)->sf = 0;
-            i++;
-            chan = (void *)((s32)chan + sizeof(struct CgbChannel));
-        }
-    }
-
-    soundInfo->ident = ID_NUMBER;
-}
-
-void m4aSoundVSyncOff(void)
-{
-    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
-
-    if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1)
-    {
-        soundInfo->ident += 10;
-
-        if (REG_DMA1CNT & (DMA_REPEAT << 16))
-            REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
-
-        if (REG_DMA2CNT & (DMA_REPEAT << 16))
-            REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
-
-        REG_DMA1CNT_H = DMA_32BIT;
-        REG_DMA2CNT_H = DMA_32BIT;
-
-        CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer));
-    }
-}
-
-void m4aSoundVSyncOn(void)
-{
-    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
-    u32 ident = soundInfo->ident;
-
-    if (ident == ID_NUMBER)
-        return;
-
-    REG_DMA1CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT;
-    REG_DMA2CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT;
-
-    soundInfo->pcmDmaCounter = 0;
-    soundInfo->ident = ident - 10;
-}
-
-void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount)
-{
-    struct SoundInfo *soundInfo;
-
-    if (trackCount == 0)
-        return;
-
-    if (trackCount > MAX_MUSICPLAYER_TRACKS)
-        trackCount = MAX_MUSICPLAYER_TRACKS;
-
-    soundInfo = SOUND_INFO_PTR;
-
-    if (soundInfo->ident != ID_NUMBER)
-        return;
-
-    soundInfo->ident++;
-
-    Clear64byte(mplayInfo);
-
-    mplayInfo->tracks = tracks;
-    mplayInfo->trackCount = trackCount;
-    mplayInfo->status = MUSICPLAYER_STATUS_PAUSE;
-
-    while (trackCount != 0)
-    {
-        tracks->flags = 0;
-        trackCount--;
-        tracks++;
-    }
-
-    if (soundInfo->func != 0)
-    {
-        mplayInfo->func = soundInfo->func;
-        mplayInfo->intp = soundInfo->intp;
-        soundInfo->func = 0;
-    }
-
-    soundInfo->intp = (u32)mplayInfo;
-    soundInfo->func = (u32)MPlayMain;
-    soundInfo->ident = ID_NUMBER;
-    mplayInfo->ident = ID_NUMBER;
-}
-
-void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader)
-{
-    s32 i;
-    u8 unk_B;
-    struct MusicPlayerTrack *track;
-
-    if (mplayInfo->ident != ID_NUMBER)
-        return;
-
-    unk_B = mplayInfo->unk_B;
-
-    if (!unk_B
-        || ((!mplayInfo->songHeader || !(mplayInfo->tracks[0].flags & MPT_FLG_START))
-            && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0
-                || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE)))
-        || (mplayInfo->priority <= songHeader->priority))
-    {
-        mplayInfo->ident++;
-        mplayInfo->status = 0;
-        mplayInfo->songHeader = songHeader;
-        mplayInfo->tone = songHeader->tone;
-        mplayInfo->priority = songHeader->priority;
-        mplayInfo->clock = 0;
-        mplayInfo->tempoD = 150;
-        mplayInfo->tempoI = 150;
-        mplayInfo->tempoU = 0x100;
-        mplayInfo->tempoC = 0;
-        mplayInfo->fadeOI = 0;
-
-        i = 0;
-        track = mplayInfo->tracks;
-
-        while (i < songHeader->trackCount && i < mplayInfo->trackCount)
-        {
-            TrackStop(mplayInfo, track);
-            track->flags = MPT_FLG_EXIST | MPT_FLG_START;
-            track->chan = 0;
-            track->cmdPtr = songHeader->part[i];
-            i++;
-            track++;
-        }
-
-        while (i < mplayInfo->trackCount)
-        {
-            TrackStop(mplayInfo, track);
-            track->flags = 0;
-            i++;
-            track++;
-        }
-
-        if (songHeader->reverb & 0x80)
-            m4aSoundMode(songHeader->reverb);
-
-        mplayInfo->ident = ID_NUMBER;
-    }
-}
-
-void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo)
-{
-    s32 i;
-    struct MusicPlayerTrack *track;
-
-    if (mplayInfo->ident != ID_NUMBER)
-        return;
-
-    mplayInfo->ident++;
-    mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE;
-
-    i = mplayInfo->trackCount;
-    track = mplayInfo->tracks;
-
-    while (i > 0)
-    {
-        TrackStop(mplayInfo, track);
-        i--;
-        track++;
-    }
-
-    mplayInfo->ident = ID_NUMBER;
-}
-
-void FadeOutBody(struct MusicPlayerInfo *mplayInfo)
-{
-    s32 i;
-    struct MusicPlayerTrack *track;
-    u16 fadeOI = mplayInfo->fadeOI;
-    register u32 temp asm("r3");
-    register u16 mask asm("r2");
-
-    if (fadeOI == 0)
-        return;
-
-    mplayInfo->fadeOC--;
-
-    temp = 0xFFFF;
-    mask = temp;
-
-    if (mplayInfo->fadeOC != 0)
-        return;
-
-    mplayInfo->fadeOC = fadeOI;
-
-    if (mplayInfo->fadeOV & FADE_IN)
-    {
-        mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT);
-
-        if ((u16)(mplayInfo->fadeOV & mask) >= (64 << FADE_VOL_SHIFT))
-        {
-            mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
-            mplayInfo->fadeOI = 0;
-        }
-    }
-    else
-    {
-        mplayInfo->fadeOV -= (4 << FADE_VOL_SHIFT);
-
-        if ((s16)(mplayInfo->fadeOV & mask) <= 0)
-        {
-            i = mplayInfo->trackCount;
-            track = mplayInfo->tracks;
-
-            while (i > 0)
-            {
-                register u32 fadeOV asm("r7");
-                u32 val;
-
-                TrackStop(mplayInfo, track);
-
-                val = TEMPORARY_FADE;
-                fadeOV = mplayInfo->fadeOV;
-                val &= fadeOV;
-
-                if (!val)
-                    track->flags = 0;
-
-                i--;
-                track++;
-            }
-
-            if (mplayInfo->fadeOV & TEMPORARY_FADE)
-                mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE;
-            else
-                mplayInfo->status = MUSICPLAYER_STATUS_PAUSE;
-
-            mplayInfo->fadeOI = 0;
-            return;
-        }
-    }
-
-    i = mplayInfo->trackCount;
-    track = mplayInfo->tracks;
-
-    while (i > 0)
-    {
-        if (track->flags & MPT_FLG_EXIST)
-        {
-            track->volX = (mplayInfo->fadeOV >> FADE_VOL_SHIFT);
-            track->flags |= MPT_FLG_VOLCHG;
-        }
-
-        i--;
-        track++;
-    }
-}
-
-void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    if (track->flags & MPT_FLG_VOLSET)
-    {
-        s32 x;
-        s32 y;
-
-        x = (u32)(track->vol * track->volX) >> 5;
-
-        if (track->modT == 1)
-            x = (u32)(x * (track->modM + 128)) >> 7;
-
-        y = 2 * track->pan + track->panX;
-
-        if (track->modT == 2)
-            y += track->modM;
-
-        if (y < -128)
-            y = -128;
-        else if (y > 127)
-            y = 127;
-
-        track->volMR = (u32)((y + 128) * x) >> 8;
-        track->volML = (u32)((127 - y) * x) >> 8;
-    }
-
-    if (track->flags & MPT_FLG_PITSET)
-    {
-        s32 bend = track->bend * track->bendRange;
-        register s32 x asm("r1") = track->tune;
-        x += bend;
-        x *= 4;
-        x += (track->keyShift << 8);
-        x += (track->keyShiftX << 8);
-        x += track->pitX;
-
-        if (track->modT == 0)
-            x += 16 * track->modM;
-
-        track->keyM = x >> 8;
-        track->pitM = x;
-    }
-
-    track->flags &= ~(MPT_FLG_PITSET | MPT_FLG_VOLSET);
-}
-
-u32 MidiKeyToCgbFreq(u8 chanNum, u8 key, u8 fineAdjust)
-{
-    if (chanNum == 4)
-    {
-        if (key <= 20)
-        {
-            key = 0;
-        }
-        else
-        {
-            key -= 21;
-            if (key > 59)
-                key = 59;
-        }
-
-        return gNoiseTable[key];
-    }
-    else
-    {
-        s32 val1;
-        s32 val2;
-
-        if (key <= 35)
-        {
-            fineAdjust = 0;
-            key = 0;
-        }
-        else
-        {
-            key -= 36;
-            if (key > 130)
-            {
-                key = 130;
-                fineAdjust = 255;
-            }
-        }
-
-        val1 = gCgbScaleTable[key];
-        val1 = gCgbFreqTable[val1 & 0xF] >> (val1 >> 4);
-
-        val2 = gCgbScaleTable[key + 1];
-        val2 = gCgbFreqTable[val2 & 0xF] >> (val2 >> 4);
-
-        return val1 + ((fineAdjust * (val2 - val1)) >> 8) + 2048;
-    }
-}
-
-void CgbOscOff(u8 chanNum)
-{
-    switch (chanNum)
-    {
-    case 1:
-        REG_NR12 = 8;
-        REG_NR14 = 0x80;
-        break;
-    case 2:
-        REG_NR22 = 8;
-        REG_NR24 = 0x80;
-        break;
-    case 3:
-        REG_NR30 = 0;
-        break;
-    default:
-        REG_NR42 = 8;
-        REG_NR44 = 0x80;
-    }
-}
-
-static inline int CgbPan(struct CgbChannel *chan)
-{
-    u32 rightVolume = chan->rightVolume;
-    u32 leftVolume = chan->leftVolume;
-
-    if ((rightVolume = (u8)rightVolume) >= (leftVolume = (u8)leftVolume))
-    {
-        if (rightVolume / 2 >= leftVolume)
-        {
-            chan->pan = 0x0F;
-            return 1;
-        }
-    }
-    else
-    {
-        if (leftVolume / 2 >= rightVolume)
-        {
-            chan->pan = 0xF0;
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-void CgbModVol(struct CgbChannel *chan)
-{
-    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
-
-    if ((soundInfo->mode & 1) || !CgbPan(chan))
-    {
-        chan->pan = 0xFF;
-        chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4;
-    }
-    else
-    {
-        // Force chan->rightVolume and chan->leftVolume to be read from memory again,
-        // even though there is no reason to do so.
-        // The command line option "-fno-gcse" achieves the same result as this.
-        asm("" : : : "memory");
-
-        chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4;
-        if (chan->eg > 15)
-            chan->eg = 15;
-    }
-
-    chan->sg = (chan->eg * chan->su + 15) >> 4;
-    chan->pan &= chan->panMask;
-}
diff --git a/src/m4a_4.c b/src/m4a_4.c
deleted file mode 100644
index e645fbef5..000000000
--- a/src/m4a_4.c
+++ /dev/null
@@ -1,545 +0,0 @@
-#include "gba/m4a_internal.h"
-
-void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo)
-{
-    if (mplayInfo->ident == ID_NUMBER)
-    {
-        mplayInfo->ident++;
-        mplayInfo->tempoU = tempo;
-        mplayInfo->tempoI = (mplayInfo->tempoD * mplayInfo->tempoU) >> 8;
-        mplayInfo->ident = ID_NUMBER;
-    }
-}
-
-void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume)
-{
-    s32 i;
-    u32 bit;
-    struct MusicPlayerTrack *track;
-
-    if (mplayInfo->ident != ID_NUMBER)
-        return;
-
-    mplayInfo->ident++;
-
-    i = mplayInfo->trackCount;
-    track = mplayInfo->tracks;
-    bit = 1;
-
-    while (i > 0)
-    {
-        if (trackBits & bit)
-        {
-            if (track->flags & MPT_FLG_EXIST)
-            {
-                track->volX = volume / 4;
-                track->flags |= MPT_FLG_VOLCHG;
-            }
-        }
-
-        i--;
-        track++;
-        bit <<= 1;
-    }
-
-    mplayInfo->ident = ID_NUMBER;
-}
-
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
-{
-    s32 i;
-    u32 bit;
-    struct MusicPlayerTrack *track;
-
-    if (mplayInfo->ident != ID_NUMBER)
-        return;
-
-    mplayInfo->ident++;
-
-    i = mplayInfo->trackCount;
-    track = mplayInfo->tracks;
-    bit = 1;
-
-    while (i > 0)
-    {
-        if (trackBits & bit)
-        {
-            if (track->flags & MPT_FLG_EXIST)
-            {
-                track->keyShiftX = pitch >> 8;
-                track->pitX = pitch;
-                track->flags |= MPT_FLG_PITCHG;
-            }
-        }
-
-        i--;
-        track++;
-        bit <<= 1;
-    }
-
-    mplayInfo->ident = ID_NUMBER;
-}
-
-void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan)
-{
-    s32 i;
-    u32 bit;
-    struct MusicPlayerTrack *track;
-
-    if (mplayInfo->ident != ID_NUMBER)
-        return;
-
-    mplayInfo->ident++;
-
-    i = mplayInfo->trackCount;
-    track = mplayInfo->tracks;
-    bit = 1;
-
-    while (i > 0)
-    {
-        if (trackBits & bit)
-        {
-            if (track->flags & MPT_FLG_EXIST)
-            {
-                track->panX = pan;
-                track->flags |= MPT_FLG_VOLCHG;
-            }
-        }
-
-        i--;
-        track++;
-        bit <<= 1;
-    }
-
-    mplayInfo->ident = ID_NUMBER;
-}
-
-void ClearModM(struct MusicPlayerTrack *track)
-{
-    track->lfoSpeedC = 0;
-    track->modM = 0;
-
-    if (track->modT == 0)
-        track->flags |= MPT_FLG_PITCHG;
-    else
-        track->flags |= MPT_FLG_VOLCHG;
-}
-
-void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth)
-{
-    s32 i;
-    u32 bit;
-    struct MusicPlayerTrack *track;
-
-    if (mplayInfo->ident != ID_NUMBER)
-        return;
-
-    mplayInfo->ident++;
-
-    i = mplayInfo->trackCount;
-    track = mplayInfo->tracks;
-    bit = 1;
-
-    while (i > 0)
-    {
-        if (trackBits & bit)
-        {
-            if (track->flags & MPT_FLG_EXIST)
-            {
-                track->mod = modDepth;
-
-                if (!track->mod)
-                    ClearModM(track);
-            }
-        }
-
-        i--;
-        track++;
-        bit <<= 1;
-    }
-
-    mplayInfo->ident = ID_NUMBER;
-}
-
-void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed)
-{
-    s32 i;
-    u32 bit;
-    struct MusicPlayerTrack *track;
-
-    if (mplayInfo->ident != ID_NUMBER)
-        return;
-
-    mplayInfo->ident++;
-
-    i = mplayInfo->trackCount;
-    track = mplayInfo->tracks;
-    bit = 1;
-
-    while (i > 0)
-    {
-        if (trackBits & bit)
-        {
-            if (track->flags & MPT_FLG_EXIST)
-            {
-                track->lfoSpeed = lfoSpeed;
-
-                if (!track->lfoSpeed)
-                    ClearModM(track);
-            }
-        }
-
-        i--;
-        track++;
-        bit <<= 1;
-    }
-
-    mplayInfo->ident = ID_NUMBER;
-}
-
-#define MEMACC_COND_JUMP(cond) \
-if (cond)                      \
-    goto cond_true;            \
-else                           \
-    goto cond_false;           \
-
-void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    u32 op;
-    u8 *addr;
-    u8 data;
-
-    op = *track->cmdPtr;
-    track->cmdPtr++;
-
-    addr = mplayInfo->memAccArea + *track->cmdPtr;
-    track->cmdPtr++;
-
-    data = *track->cmdPtr;
-    track->cmdPtr++;
-
-    switch (op)
-    {
-    case 0:
-        *addr = data;
-        return;
-    case 1:
-        *addr += data;
-        return;
-    case 2:
-        *addr -= data;
-        return;
-    case 3:
-        *addr = mplayInfo->memAccArea[data];
-        return;
-    case 4:
-        *addr += mplayInfo->memAccArea[data];
-        return;
-    case 5:
-        *addr -= mplayInfo->memAccArea[data];
-        return;
-    case 6:
-        MEMACC_COND_JUMP(*addr == data)
-        return;
-    case 7:
-        MEMACC_COND_JUMP(*addr != data)
-        return;
-    case 8:
-        MEMACC_COND_JUMP(*addr > data)
-        return;
-    case 9:
-        MEMACC_COND_JUMP(*addr >= data)
-        return;
-    case 10:
-        MEMACC_COND_JUMP(*addr <= data)
-        return;
-    case 11:
-        MEMACC_COND_JUMP(*addr < data)
-        return;
-    case 12:
-        MEMACC_COND_JUMP(*addr == mplayInfo->memAccArea[data])
-        return;
-    case 13:
-        MEMACC_COND_JUMP(*addr != mplayInfo->memAccArea[data])
-        return;
-    case 14:
-        MEMACC_COND_JUMP(*addr > mplayInfo->memAccArea[data])
-        return;
-    case 15:
-        MEMACC_COND_JUMP(*addr >= mplayInfo->memAccArea[data])
-        return;
-    case 16:
-        MEMACC_COND_JUMP(*addr <= mplayInfo->memAccArea[data])
-        return;
-    case 17:
-        MEMACC_COND_JUMP(*addr < mplayInfo->memAccArea[data])
-        return;
-    default:
-        return;
-    }
-
-cond_true:
-    {
-        void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[1]);
-        func(mplayInfo, track);
-        return;
-    }
-
-cond_false:
-    track->cmdPtr += 4;
-}
-
-void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    u32 n = *track->cmdPtr;
-    track->cmdPtr++;
-
-    gXcmdTable[n](mplayInfo, track);
-}
-
-void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[0]);
-    func(mplayInfo, track);
-}
-
-#define READ_XCMD_BYTE(var, n)       \
-{                                    \
-    u32 byte = track->cmdPtr[(n)]; \
-    byte <<= n * 8;                  \
-    (var) &= ~(0xFF << (n * 8));     \
-    (var) |= byte;                   \
-}
-
-void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    u32 wav;
-
-    READ_XCMD_BYTE(wav, 0) // UB: uninitialized variable
-    READ_XCMD_BYTE(wav, 1)
-    READ_XCMD_BYTE(wav, 2)
-    READ_XCMD_BYTE(wav, 3)
-
-    track->tone.wav = (struct WaveData *)wav;
-    track->cmdPtr += 4;
-}
-
-void ply_xtype(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->tone.type = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xatta(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->tone.attack = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xdeca(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->tone.decay = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xsust(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->tone.sustain = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xrele(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->tone.release = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xiecv(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->echoVolume = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xiecl(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->echoLength = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xleng(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->tone.length = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xswee(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    track->tone.pan_sweep = *track->cmdPtr;
-    track->cmdPtr++;
-}
-
-void ply_xcmd_0C(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    u32 unk;
-
-    READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable
-    READ_XCMD_BYTE(unk, 1)
-
-    if (track->unk_3A < (u16)unk)
-    {
-        track->unk_3A++;
-        track->cmdPtr -= 2;
-        track->wait = 1;
-    }
-    else
-    {
-        track->unk_3A = 0;
-        track->cmdPtr += 2;
-    }
-}
-
-void ply_xcmd_0D(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
-{
-    u32 unk;
-
-    READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable
-    READ_XCMD_BYTE(unk, 1)
-    READ_XCMD_BYTE(unk, 2)
-    READ_XCMD_BYTE(unk, 3)
-
-    track->unk_3C = unk;
-    track->cmdPtr += 4;
-}
-
-void DummyFunc(void)
-{
-}
-
-struct MusicPlayerInfo *SetPokemonCryTone(struct ToneData *tone)
-{
-    u32 maxClock = 0;
-    s32 maxClockIndex = 0;
-    s32 i;
-    struct MusicPlayerInfo *mplayInfo;
-
-    for (i = 0; i < MAX_POKEMON_CRIES; i++)
-    {
-        struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2];
-
-        if (!track->flags && (!track->chan || track->chan->track != track))
-            goto start_song;
-
-        if (maxClock < gPokemonCryMusicPlayers[i].clock)
-        {
-            maxClock = gPokemonCryMusicPlayers[i].clock;
-            maxClockIndex = i;
-        }
-    }
-
-    i = maxClockIndex;
-
-start_song:
-    mplayInfo = &gPokemonCryMusicPlayers[i];
-    mplayInfo->ident++;
-
-#define CRY ((s32)&gPokemonCrySongs + i * sizeof(struct PokemonCrySong))
-#define CRY_OFS(field) offsetof(struct PokemonCrySong, field)
-
-    memcpy((void *)CRY, &gPokemonCrySong, sizeof(struct PokemonCrySong));
-
-    *(u32 *)(CRY + CRY_OFS(tone)) = (u32)tone;
-    *(u32 *)(CRY + CRY_OFS(part)) = CRY + CRY_OFS(part0);
-    *(u32 *)(CRY + CRY_OFS(part) + 4) = CRY + CRY_OFS(part1);
-    *(u32 *)(CRY + CRY_OFS(gotoTarget)) = CRY + CRY_OFS(cont);
-
-#undef CRY_OFS
-#undef CRY
-
-    mplayInfo->ident = ID_NUMBER;
-
-    MPlayStart(mplayInfo, (struct SongHeader *)(&gPokemonCrySongs[i]));
-
-    return mplayInfo;
-}
-
-void SetPokemonCryVolume(u8 val)
-{
-    gPokemonCrySong.volumeValue = val & 0x7F;
-}
-
-void SetPokemonCryPanpot(s8 val)
-{
-    gPokemonCrySong.panValue = (val + C_V) & 0x7F;
-}
-
-void SetPokemonCryPitch(s16 val)
-{
-    s16 b = val + 0x80;
-    u8 a = gPokemonCrySong.tuneValue2 - gPokemonCrySong.tuneValue;
-    gPokemonCrySong.tieKeyValue = (b >> 8) & 0x7F;
-    gPokemonCrySong.tuneValue = (b >> 1) & 0x7F;
-    gPokemonCrySong.tuneValue2 = (a + ((b >> 1) & 0x7F)) & 0x7F;
-}
-
-void SetPokemonCryLength(u16 val)
-{
-    gPokemonCrySong.unkCmd0CParam = val;
-}
-
-void SetPokemonCryRelease(u8 val)
-{
-    gPokemonCrySong.releaseValue = val;
-}
-
-void SetPokemonCryProgress(u32 val)
-{
-    gPokemonCrySong.unkCmd0DParam = val;
-}
-
-int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo)
-{
-    struct MusicPlayerTrack *track = mplayInfo->tracks;
-
-    if (track->chan && track->chan->track == track)
-        return 1;
-    else
-        return 0;
-}
-
-void SetPokemonCryChorus(s8 val)
-{
-    if (val)
-    {
-        gPokemonCrySong.trackCount = 2;
-        gPokemonCrySong.tuneValue2 = (val + gPokemonCrySong.tuneValue) & 0x7F;
-    }
-    else
-    {
-        gPokemonCrySong.trackCount = 1;
-    }
-}
-
-void SetPokemonCryStereo(u32 val)
-{
-    struct SoundInfo *soundInfo = SOUND_INFO_PTR;
-
-    if (val)
-    {
-        REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT
-                       | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT
-                       | SOUND_ALL_MIX_FULL;
-        soundInfo->mode &= ~1;
-    }
-    else
-    {
-        REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT | SOUND_B_RIGHT_OUTPUT
-                       | SOUND_A_TIMER_0 | SOUND_A_LEFT_OUTPUT | SOUND_A_RIGHT_OUTPUT
-                       | SOUND_B_MIX_HALF | SOUND_A_MIX_HALF | SOUND_CGB_MIX_FULL;
-        soundInfo->mode |= 1;
-    }
-}
-
-void SetPokemonCryPriority(u8 val)
-{
-    gPokemonCrySong.priority = val;
-}
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index c13747006..0d88815c0 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -1,6 +1,4 @@
 #include "global.h"
-#include "constants/region_map_sections.h"
-#include "constants/weather.h"
 #include "bg.h"
 #include "event_data.h"
 #include "gpu_regs.h"
@@ -14,6 +12,9 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
+#include "constants/layouts.h"
+#include "constants/region_map_sections.h"
+#include "constants/weather.h"
 
 // enums
 enum MapPopUp_Themes
@@ -305,7 +306,7 @@ static void ShowMapNamePopUpWindow(void)
 
     if (InBattlePyramid())
     {
-        if (gMapHeader.mapLayoutId == 0x17A)
+        if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP)
         {
             withoutPrefixPtr = &(mapDisplayHeader[3]);
             mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7];
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 930f1f35b..fd8e74c0a 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -572,9 +572,6 @@ static void Task_BardSong(u8 taskId)
             struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
             u8 *str = gStringVar4 + task->tCharIndex;
             u16 wordLen = 0;
-            // Can't get it to match without hacking
-            u32 temp;
-            register s16 zero asm("r1");
 
             while (*str != CHAR_SPACE
                    && *str != CHAR_NEWLINE
@@ -588,17 +585,22 @@ static void Task_BardSong(u8 taskId)
                 sUnknownBardRelated = MACRO2(bard->songLyrics[task->tCurrWord]);
             else
                 sUnknownBardRelated = MACRO2(bard->temporaryLyrics[task->tCurrWord]);
-            temp = gBardSong.length / wordLen;
-            zero = 0;
-            gBardSong.length = temp;
+
+            gBardSong.length /= wordLen;
             if (gBardSong.length <= 0)
                 gBardSong.length = 1;
             task->tCurrWord++;
+
             if (task->data[2] == 0)
+            {
                 task->tState = 3;
+                task->data[1] = 0;
+            }
             else
+            {
                 task->tState = 5;
-            task->data[1] = zero;
+                task->data[1] = 0;
+            }
         }
             break;
         case 5:
@@ -1180,9 +1182,9 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu
             break;
         case 1:
             selection = Menu_ProcessInput();
-            if (selection == -2)
+            if (selection == MENU_NOTHING_CHOSEN)
                 break;
-            if (selection == -1 || selection == GetFreeStorySlot())
+            if (selection == MENU_B_PRESSED || selection == GetFreeStorySlot())
             {
                 gSpecialVar_Result = 0;
             }
diff --git a/src/overworld.c b/src/overworld.c
index a67b4b68f..8d4c24ff6 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -55,6 +55,7 @@
 #include "wild_encounter.h"
 #include "frontier_util.h"
 #include "constants/abilities.h"
+#include "constants/layouts.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/region_map_sections.h"
@@ -886,7 +887,7 @@ static void mli0_load_map(u32 a1)
     LoadCurrentMapData();
     if (!(sUnknown_020322D8 & 1))
     {
-        if (gMapHeader.mapLayoutId == 0x169)
+        if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
             sub_81AA1D8();
         else if (InTrainerHill())
             sub_81D5DF8();
@@ -914,7 +915,7 @@ static void mli0_load_map(u32 a1)
     mapheader_run_script_with_tag_x3();
     UpdateLocationHistoryForRoamer();
     RoamerMoveToOtherLocationSet();
-    if (gMapHeader.mapLayoutId == 0x169)
+    if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
         InitBattlePyramidMap(0);
     else if (InTrainerHill())
         InitTrainerHillMap();
@@ -1753,7 +1754,7 @@ void CB2_ContinueSavedGame(void)
     LoadSaveblockMapHeader();
     ClearDiveAndHoleWarps();
     trainerHillMapId = GetCurrentTrainerHillMapId();
-    if (gMapHeader.mapLayoutId == 0x169)
+    if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
         sub_81AA2F8();
     else if (trainerHillMapId != 0 && trainerHillMapId != 6)
         sub_81D5F48();
@@ -1763,7 +1764,7 @@ void CB2_ContinueSavedGame(void)
     UnfreezeEventObjects();
     DoTimeBasedEvents();
     sub_8084788();
-    if (gMapHeader.mapLayoutId == 0x169)
+    if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
         InitBattlePyramidMap(1);
     else if (trainerHillMapId != 0)
         InitTrainerHillMap();
diff --git a/src/palette.c b/src/palette.c
index deb07b066..be5143876 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -154,7 +154,7 @@ void ReadPlttIntoBuffers(void)
 bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, u16 blendColor)
 {
     u8 temp;
-    register u32 _blendColor asm("r8") = blendColor;
+    u16 color = blendColor;
 
     if (gPaletteFade.active)
     {
@@ -175,7 +175,7 @@ bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targe
         gPaletteFade_delay = delay;
         gPaletteFade.y = startY;
         gPaletteFade.targetY = targetY;
-        gPaletteFade.blendColor = _blendColor;
+        gPaletteFade.blendColor = color;
         gPaletteFade.active = 1;
         gPaletteFade.mode = NORMAL_FADE;
 
@@ -881,7 +881,7 @@ void TintPalette_SepiaTone(u16 *palette, u16 count)
 {
     s32 r, g, b, i;
     u32 gray;
-    
+
     for (i = 0; i < count; i++)
     {
         r = (*palette >>  0) & 0x1F;
diff --git a/src/party_menu.c b/src/party_menu.c
index a8c98faec..15b5d24d8 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -119,6 +119,7 @@ struct Struct203CEDC
     u8 unkC;
 };
 
+// EWRAM vars
 static EWRAM_DATA struct Struct203CEC4 *gUnknown_0203CEC4 = NULL;
 EWRAM_DATA struct Struct203CEC8 gUnknown_0203CEC8 = {0};
 static EWRAM_DATA struct Struct203CEDC *gUnknown_0203CEDC = NULL;
@@ -134,7 +135,8 @@ static EWRAM_DATA u16 gUnknown_0203CEFC = 0;
 static EWRAM_DATA u16 gUnknown_0203CEFE = 0; // unused
 EWRAM_DATA u8 gUnknown_0203CF00[3] = {0};
 
-extern void (*gUnknown_03006328)(u8, TaskFunc);
+// IWRAM common
+void (*gUnknown_03006328)(u8, TaskFunc);
 
 static void reset_brm(void);
 static void PartyMenuInitCallback(void);
@@ -2087,7 +2089,8 @@ static bool8 RenderPartyMenuBoxes(void)
     RenderPartyMenuBox(gUnknown_0203CEC4->data[0]);
     if (++gUnknown_0203CEC4->data[0] == 6)
         return TRUE;
-    return FALSE;
+    else
+        return FALSE;
 }
 
 static u8* GetPartyMiscGraphicsTile(u16 tileId)
@@ -2130,7 +2133,8 @@ static bool8 party_menu_add_per_mon_objects(void)
     party_menu_add_per_mon_objects_internal(gUnknown_0203CEC4->data[0]);
     if (++gUnknown_0203CEC4->data[0] == 6)
         return TRUE;
-    return FALSE;
+    else
+        return FALSE;
 }
 
 static void sub_81B0F28(void)
@@ -2202,6 +2206,7 @@ void sub_81B0FCC(u8 slot, u8 b)
 static u8 GetPartyBoxPalBitfield(u8 slot, u8 b)
 {
     u8 returnVar = 0;
+
     if (b == 1)
         returnVar |= 1;
     if (GetMonData(&gPlayerParty[slot], MON_DATA_HP) == 0)
@@ -2321,7 +2326,8 @@ static s8* sub_81B13EC(void)
 {
     if (gUnknown_0203CEC8.unkB == 8 || gUnknown_0203CEC8.unkB == 10)
         return &gUnknown_0203CEC8.unkA;
-    return &gUnknown_0203CEC8.unk9;
+    else
+        return &gUnknown_0203CEC8.unk9;
 }
 
 static void sub_81B140C(u8 taskId, s8 *ptr)
@@ -2836,7 +2842,7 @@ static void sub_81B1DB8(struct Pokemon *mon, u16 item)
     SetMonData(mon, MON_DATA_HELD_ITEM, itemBytes);
 }
 
-static u8 sub_81B1E00(struct Pokemon* mon)
+static u8 TryTakeMonItem(struct Pokemon* mon)
 {
     u16 item = GetMonData(mon, MON_DATA_HELD_ITEM);
 
@@ -4265,7 +4271,7 @@ static void CursorCb_TakeItem(u8 taskId)
     PlaySE(SE_SELECT);
     sub_81B302C(&gUnknown_0203CEC4->unkC[0]);
     sub_81B302C(&gUnknown_0203CEC4->unkC[1]);
-    switch (sub_81B1E00(mon))
+    switch (TryTakeMonItem(mon))
     {
     case 0:
         GetMonNickname(mon, gStringVar1);
@@ -5203,7 +5209,7 @@ void sub_81B617C(void)
     bool8 inBattle;
     u8 i;
     u8 msgIdMaybe;
-    register TaskFunc task asm("r0");
+    TaskFunc task;
 
     if (gMain.inBattle)
     {
@@ -5215,6 +5221,7 @@ void sub_81B617C(void)
         inBattle = FALSE;
         doubleBattleStatus = 0;
     }
+
     if (GetItemEffectType(gSpecialVar_ItemId) == 10)
     {
         gUnknown_0203CEC8.unk9 = 0;
@@ -5231,9 +5238,14 @@ void sub_81B617C(void)
     }
     else
     {
-        msgIdMaybe = (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_TM_HM) ? 4 : 5;
+        if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_TM_HM)
+            msgIdMaybe = 4;
+        else
+            msgIdMaybe = 5;
+
         task = sub_81B1370;
     }
+
     InitPartyMenu(inBattle, doubleBattleStatus, 3, 1, msgIdMaybe, task, callback);
 }
 
@@ -5263,9 +5275,11 @@ static bool8 IsHPRecoveryItem(u16 item)
         effect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
     else
         effect = gItemEffectTable[item - ITEM_POTION];
+
     if ((effect[4] & 4) != 0)
         return TRUE;
-    return FALSE;
+    else
+        return FALSE;
 }
 
 static void GetMedicineItemEffectMessage(u16 item)
@@ -5575,6 +5589,7 @@ void dp05_ether(u8 taskId, TaskFunc task)
         effect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
     else
         effect = gItemEffectTable[item - ITEM_POTION];
+
     if ((effect[4] & 0x10) == 0)
     {
         gUnknown_0203CEC8.unkE = 0;
@@ -6196,151 +6211,69 @@ void sub_81B7C74(u8 taskId, TaskFunc task)
 u8 GetItemEffectType(u16 item)
 {
     const u8 *itemEffect;
-#ifndef NONMATCHING
-    register u8 itemEffect0 asm("r1");
-    register u8 itemEffect3 asm("r3");
-    register u32 itemEffect0_r0 asm("r0"); // u32 to prevent shifting when transferring itemEffect0 to this
-    u8 mask;
-#else
-#define itemEffect0 itemEffect[0]
-#define itemEffect3 itemEffect[3]
-#define mask 0x3F
-#endif
+    u32 statusCure;
 
     if (!IS_POKEMON_ITEM(item))
-    {
         return 22;
-    }
+
+    // Read the item's effect properties.
+    if (item == ITEM_ENIGMA_BERRY)
+        itemEffect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
     else
+        itemEffect = gItemEffectTable[item - ITEM_POTION];
+
+    if ((itemEffect[0] & 0x3F) || itemEffect[1] || itemEffect[2] || (itemEffect[3] & 0x80))
+        return 0;
+    else if (itemEffect[0] & 0x40)
+        return 10;
+    else if (itemEffect[3] & 0x40)
+        return 1;
+
+    statusCure = itemEffect[3] & 0x3F;
+    if (statusCure || (itemEffect[0] >> 7))
     {
-        // Read the item's effect properties.
-        if (item == ITEM_ENIGMA_BERRY)
-        {
-            itemEffect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
-        }
+        if (statusCure == 0x20)
+            return 4;
+        else if (statusCure == 0x10)
+            return 3;
+        else if (statusCure == 0x8)
+            return 5;
+        else if (statusCure == 0x4)
+            return 6;
+        else if (statusCure == 0x2)
+            return 7;
+        else if (statusCure == 0x1)
+            return 8;
+        else if (itemEffect[0] >> 7 && !statusCure)
+            return 9;
         else
-        {
-            itemEffect = gItemEffectTable[item - ITEM_POTION];
-        }
-
-#ifndef NONMATCHING
-        itemEffect0 = itemEffect[0];
-        mask = 0x3F;
-#endif
+            return 11;
+    }
 
-        if ((itemEffect0 & mask) || itemEffect[1] || itemEffect[2])
-        {
-            return 0;
-        }
-#ifndef NONMATCHING
-        itemEffect3 = itemEffect[3];
-#endif
-        if (itemEffect3 & 0x80)
-        {
-            return 0;
-        }
-        else if (itemEffect0 & 0x40)
-        {
-            return 10;
-        }
-        else if (itemEffect3 & 0x40)
-        {
-            return 1;
-        }
-        else if ((itemEffect3 & mask) || (itemEffect0 >> 7))
-        {
-            if ((itemEffect3 & mask) == 0x20)
-            {
-                return 4;
-            }
-            else if ((itemEffect3 & mask) == 0x10)
-            {
-                return 3;
-            }
-            else if ((itemEffect3 & mask) == 0x8)
-            {
-                return 5;
-            }
-            else if ((itemEffect3 & mask) == 0x4)
-            {
-                return 6;
-            }
-            else if ((itemEffect3 & mask) == 0x2)
-            {
-                return 7;
-            }
-            else if ((itemEffect3 & mask) == 0x1)
-            {
-                return 8;
-            }
-            // alternate fakematching
-            // itemEffect0_r0 = itemEffect0 >> 7;
-            // asm(""); // increase live length for greg
-            // if ((itemEffect0_r0 != 0) && (itemEffect3 & mask) == 0)
-#ifndef NONMATCHING
-            else if (((itemEffect0_r0 = itemEffect0 >> 7) != 0) && (itemEffect3 & mask) == 0)
-#else
-            else if (((itemEffect[0] >> 7) != 0) && (itemEffect[3] & 0x3F) == 0)
-#endif
-            {
-                return 9;
-            }
-            else
-            {
-                return 11;
-            }
-        }
-        else if (itemEffect[4] & 0x44)
-        {
-            return 2;
-        }
-        else if (itemEffect[4] & 0x2)
-        {
-            return 12;
-        }
-        else if (itemEffect[4] & 0x1)
-        {
-            return 13;
-        }
-        else if (itemEffect[5] & 0x8)
-        {
-            return 14;
-        }
-        else if (itemEffect[5] & 0x4)
-        {
-            return 15;
-        }
-        else if (itemEffect[5] & 0x2)
-        {
-            return 16;
-        }
-        else if (itemEffect[5] & 0x1)
-        {
-            return 17;
-        }
-        else if (itemEffect[4] & 0x80)
-        {
-            return 18;
-        }
-        else if (itemEffect[4] & 0x20)
-        {
-            return 19;
-        }
-        else if (itemEffect[5] & 0x10)
-        {
-            return 20;
-        }
-        else if (itemEffect[4] & 0x18)
-        {
-            return 21;
-        }
+    if (itemEffect[4] & 0x44)
+        return 2;
+    else if (itemEffect[4] & 0x2)
+        return 12;
+    else if (itemEffect[4] & 0x1)
+        return 13;
+    else if (itemEffect[5] & 0x8)
+        return 14;
+    else if (itemEffect[5] & 0x4)
+        return 15;
+    else if (itemEffect[5] & 0x2)
+        return 16;
+    else if (itemEffect[5] & 0x1)
+        return 17;
+    else if (itemEffect[4] & 0x80)
+        return 18;
+    else if (itemEffect[4] & 0x20)
+        return 19;
+    else if (itemEffect[5] & 0x10)
+        return 20;
+    else if (itemEffect[4] & 0x18)
+        return 21;
+    else
         return 22;
-    }
-#ifdef NONMATCHING
-#undef itemEffect0
-#undef itemEffect3
-#undef mask
-#endif
 }
 
 static void sub_81B7E4C(u8 taskId)
diff --git a/src/player_pc.c b/src/player_pc.c
index 474cecaf5..0d08a5e7b 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -355,11 +355,11 @@ static void PlayerPCProcessMenuInput(u8 taskId)
     else
         inputOptionId = Menu_ProcessInputNoWrap();
 
-    switch(inputOptionId)
+    switch (inputOptionId)
     {
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             break;
-        case -1:
+        case MENU_B_PRESSED:
             PlaySE(SE_SELECT);
             sub_8198070(data[4], FALSE);
             ClearWindowTilemap(data[4]);
@@ -464,13 +464,13 @@ static void ItemStorageMenuProcessInput(u8 taskId)
     r5 = Menu_GetCursorPos();
     inputOptionId = Menu_ProcessInput();
     r2 = Menu_GetCursorPos();
-    switch(inputOptionId)
+    switch (inputOptionId)
     {
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             if (r5 != r2)
                 ItemStorageMenuPrint(gPCText_OptionDescList[r2]);
             break;
-        case -1:
+        case MENU_B_PRESSED:
             PlaySE(SE_SELECT);
             ItemStorage_Exit(taskId);
             break;
@@ -638,14 +638,14 @@ static void Mailbox_ProcessInput(u8 taskId)
 
     if (!gPaletteFade.active)
     {
-        inputOptionId = ListMenuHandleInputGetItemId(data[5]);
+        inputOptionId = ListMenu_ProcessInput(data[5]);
         ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
 
-        switch(inputOptionId)
+        switch (inputOptionId)
         {
-            case -1:
+            case LIST_NOTHING_CHOSEN:
                 break;
-            case -2:
+            case LIST_B_PRESSED:
                 PlaySE(SE_SELECT);
                 RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId);
                 Mailbox_ReturnToPlayerPC(taskId);
@@ -1145,13 +1145,13 @@ static void ItemStorage_ProcessInput(u8 taskId)
     }
     else
     {
-        id = ListMenuHandleInputGetItemId(data[5]);
+        id = ListMenu_ProcessInput(data[5]);
         ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
         switch(id)
         {
-        case -1:
+        case LIST_NOTHING_CHOSEN:
             break;
-        case -2:
+        case LIST_B_PRESSED:
             PlaySE(SE_SELECT);
             ItemStorage_GoBackToPlayerPCMenu(taskId);
             break;
@@ -1218,21 +1218,23 @@ static void sub_816C4FC(u8 taskId)
         ItemStorage_DoItemSwap(taskId, FALSE);
         return;
     }
-    id = ListMenuHandleInputGetItemId(data[5]);
+    id = ListMenu_ProcessInput(data[5]);
     ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
     sub_81223FC(gUnknown_0203BCC4->spriteIds, 7, 0);
     sub_816C690(playerPCItemPageInfo.cursorPos);
     switch(id)
     {
-    case -1:
+    case LIST_NOTHING_CHOSEN:
         break;
-    case -2:
+    case LIST_B_PRESSED:
         if (gMain.newKeys & A_BUTTON)
         {
             ItemStorage_DoItemSwap(taskId, FALSE);
         }
         else
+        {
             ItemStorage_DoItemSwap(taskId, TRUE);
+        }
         break;
     default:
         ItemStorage_DoItemSwap(taskId, FALSE);
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 7c07f9655..3fd4f34df 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -998,7 +998,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
         else
         {
             u16 oldPosition = sSavedPokeblockData.lastItemPos;
-            s32 itemId = ListMenuHandleInputGetItemId(data[0]);
+            s32 itemId = ListMenu_ProcessInput(data[0]);
 
             ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
             if (oldPosition != sSavedPokeblockData.lastItemPos)
@@ -1044,7 +1044,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
     {
         u16 i = sSavedPokeblockData.lastItemPage;
         u16 var = sSavedPokeblockData.lastItemPos;
-        s32 itemId = ListMenuHandleInputGetItemId(data[0]);
+        s32 itemId = ListMenu_ProcessInput(data[0]);
 
         ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
         if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos)
diff --git a/src/pokedex.c b/src/pokedex.c
index f99a8226a..c47ada5b8 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -30,8 +30,6 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 
-extern u8 gDexCryScreenState;
-
 // EWRAM
 static EWRAM_DATA struct PokedexView *sPokedexView = NULL;
 static EWRAM_DATA u16 gUnknown_02039B50 = 0;
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 4a9227b99..c385141d5 100755
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -39,7 +39,10 @@ static void sub_8145824(u8, s16, u8);
 static void sub_814596C(struct Sprite *);
 static void sub_8145B24(s8);
 
-extern u8 gDexCryScreenState;
+// IWRAM common
+u8 gDexCryScreenState;
+
+// EWRAM vars
 static EWRAM_DATA struct PokedexCryScreen *sDexCryScreen = NULL;
 static EWRAM_DATA u8 *sCryWaveformWindowTiledata = NULL;
 static EWRAM_DATA struct PokedexCryVolumeMeter *sCryVolumeMeter = NULL;
diff --git a/src/pokemon.c b/src/pokemon.c
index 1e07ee168..5f1664450 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -37,6 +37,7 @@
 #include "constants/battle_move_effects.h"
 #include "constants/hold_effects.h"
 #include "constants/items.h"
+#include "constants/layouts.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/species.h"
@@ -5242,14 +5243,14 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                                 {
                                     gAbsentBattlerFlags &= ~gBitTable[battlerId];
                                     CopyPlayerPartyMonToBattleData(battlerId, pokemon_order_func(gBattlerPartyIndexes[battlerId]));
-                                    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.unk4 < 255)
-                                        gBattleResults.unk4++;
+                                    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.numRevivesUsed < 255)
+                                        gBattleResults.numRevivesUsed++;
                                 }
                                 else
                                 {
                                     gAbsentBattlerFlags &= ~gBitTable[gActiveBattler ^ 2];
-                                    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.unk4 < 255)
-                                        gBattleResults.unk4++;
+                                    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.numRevivesUsed < 255)
+                                        gBattleResults.numRevivesUsed++;
                                 }
                             }
                         }
@@ -5289,8 +5290,8 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                                     gBattleMons[battlerId].hp = dataUnsigned;
                                     if (!(r10 & 0x10) && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
                                     {
-                                        if (gBattleResults.unk3 < 255)
-                                            gBattleResults.unk3++;
+                                        if (gBattleResults.numHealingItemsUsed < 255)
+                                            gBattleResults.numHealingItemsUsed++;
                                         // I have to re-use this variable to match.
                                         r5 = gActiveBattler;
                                         gActiveBattler = battlerId;
@@ -5329,7 +5330,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                                     SetMonData(mon, MON_DATA_PP1 + r5, &dataUnsigned);
                                     if (gMain.inBattle
                                      && battlerId != 4 && !(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED)
-                                     && !(gDisableStructs[battlerId].unk18_b & gBitTable[r5]))
+                                     && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[r5]))
                                         gBattleMons[battlerId].pp[r5] = dataUnsigned;
                                     retVal = FALSE;
                                 }
@@ -5354,7 +5355,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                                 SetMonData(mon, MON_DATA_PP1 + moveIndex, &dataUnsigned);
                                 if (gMain.inBattle
                                  && battlerId != 4 && !(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED)
-                                 && !(gDisableStructs[battlerId].unk18_b & gBitTable[moveIndex]))
+                                 && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[moveIndex]))
                                     gBattleMons[battlerId].pp[moveIndex] = dataUnsigned;
                                 retVal = FALSE;
                             }
@@ -6848,7 +6849,7 @@ void SetWildMonHeldItem(void)
             var1 = 20;
             var2 = 80;
         }
-        if (gMapHeader.mapLayoutId == 0x1A4)
+        if (gMapHeader.mapLayoutId == LAYOUT_ALTERING_CAVE)
         {
             s32 alteringCaveId = GetWildMonTableIdInAlteringCave(species);
             if (alteringCaveId != 0)
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index bcbb60e21..ecb8f4950 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1238,7 +1238,6 @@ const u16* GetValidMonIconPalettePtr(u16 species)
     return gMonIconPaletteTable[gMonIconPaletteIndices[species]].data;
 }
 
-// TODO: try to find a way to avoid using asm statement
 u8 UpdateMonIconFrame(struct Sprite *sprite)
 {
     u8 result = 0;
@@ -1262,10 +1261,7 @@ u8 UpdateMonIconFrame(struct Sprite *sprite)
                 (u8 *)sprite->images + (sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame),
                 (u8 *)(OBJ_VRAM0 + sprite->oam.tileNum * TILE_SIZE_4BPP),
                 sSpriteImageSizes[sprite->oam.shape][sprite->oam.size]);
-            {
-                register u8 duration asm("r0") = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration;
-                sprite->animDelayCounter = duration;
-            }
+            sprite->animDelayCounter = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration & 0xFF;
             sprite->animCmdIndex++;
             result = sprite->animCmdIndex;
             break;
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 78fec2fc5..c0aec4ddd 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1753,7 +1753,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
         task->data[2] = Menu_ProcessInput();
         switch(task->data[2])
         {
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             task->data[3] = task->data[1];
             if (gMain.newKeys & DPAD_UP && --task->data[3] < 0)
                 task->data[3] = 4;
@@ -1767,7 +1767,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
                 AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3);
             }
             break;
-        case -1:
+        case MENU_B_PRESSED:
         case  4:
             sub_819746C(task->data[15], TRUE);
             ScriptContext2_Disable();
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 14bfba4ad..d878d2c9e 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -43,10 +43,11 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/region_map_sections.h"
+#include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
 
-static EWRAM_DATA struct UnkSummaryStruct
+static EWRAM_DATA struct PssData
 {
     /*0x00*/ union {
         struct Pokemon *mons;
@@ -135,21 +136,21 @@ static bool8 SummaryScreen_DecompressGraphics(void);
 static void CopyMonToSummaryStruct(struct Pokemon* a);
 static bool8 ExtractMonDataToSummaryStruct(struct Pokemon* a);
 static void sub_81C0348(void);
-static void sub_81C0484(u8 taskId);
-static void sub_81C0510(u8 taskId);
-static void sub_81C0604(u8 taskId, s8 a);
+static void CloseSummaryScreen(u8 taskId);
+static void HandleInput(u8 taskId);
+static void ChangePokemon(u8 taskId, s8 a);
 static void sub_81C0704(u8 taskId);
 static s8 sub_81C08F8(s8 a);
 static s8 sub_81C09B4(s8 a);
 static bool8 sub_81C0A50(struct Pokemon* mon);
-static void sub_81C0A8C(u8 taskId, s8 a);
+static void ChangePage(u8 taskId, s8 a);
 static void sub_81C0B8C(u8 taskId);
 static void sub_81C0C68(u8 taskId);
 static void sub_81C0CC4(u8 taskId);
 static void sub_81C0D44(u8 taskId);
 static void sub_81C0E24(void);
 static void sub_81C0E48(u8 taskId);
-static void sub_81C0F44(u8 taskId);
+static void HandleInput_MoveSelect(u8 taskId);
 static bool8 sub_81C1040(void);
 static void sub_81C1070(s16* a, s8 b, u8* c);
 static void sub_81C11F4(u8 a);
@@ -173,21 +174,21 @@ static void sub_81C20F0(u8 taskId);
 static void sub_81C2194(u16 *a, u16 b, u8 c);
 static void sub_81C2228(struct Pokemon* mon);
 static void DrawExperienceProgressBar(struct Pokemon* mon);
-static void sub_81C240C(u16 a);
+static void DrawContestMoveHearts(u16 move);
 static void sub_81C2524(void);
-static void sub_81C2554(void);
+static void ResetWindows(void);
 static void sub_81C25E8(void);
 static void sub_81C2628(void);
 static void sub_81C2794(void);
 static void sub_81C27DC(struct Pokemon *mon, u16 a);
 static void PrintPageNamesAndStatsPageToWindows(void);
-static void sub_81C2AFC(u8 a);
-static void sub_81C2C38(u8 a);
+static void CreatePageWindowTilemaps(u8 a);
+static void ClearPageWindowTilemaps(u8 a);
 static void SummaryScreen_RemoveWindowByIndex(u8 a);
-static void sub_81C2D9C(u8 a);
-static void sub_81C2DE4(u8 a);
-static void sub_81C2E00(void);
-static void sub_81C2E40(u8 taskId);
+static void PrintPageSpecificText(u8 a);
+static void CreateTextPrinterTask(u8 a);
+static void PrintInfoPageText(void);
+static void Task_PrintInfoPage(u8 taskId);
 static void PrintMonOTName(void);
 static void PrintMonOTID(void);
 static void PrintMonAbilityName(void);
@@ -203,39 +204,39 @@ static void PrintEggOTName(void);
 static void PrintEggOTID(void);
 static void PrintEggState(void);
 static void PrintEggMemo(void);
-static void sub_81C3554(u8 taskId);
+static void Task_PrintSkillsPage(u8 taskId);
 static void PrintHeldItemName(void);
-static void sub_81C3530(void);
+static void PrintSkillsPageText(void);
 static void PrintRibbonCount(void);
 static void BufferLeftColumnStats(void);
 static void PrintLeftColumnStats(void);
 static void BufferRightColumnStats(void);
 static void PrintRightColumnStats(void);
 static void PrintExpPointsNextLevel(void);
-static void sub_81C3984(void);
-static void sub_81C39F0(u8 taskId);
+static void PrintBattleMoves(void);
+static void Task_PrintBattleMoves(u8 taskId);
 static void PrintMoveNameAndPP(u8 a);
-static void sub_81C3D08(void);
-static void sub_81C3D54(u8 taskId);
+static void PrintContestMoves(void);
+static void Task_PrintContestMoves(u8 taskId);
 static void PrintContestMoveDescription(u8 a);
 static void PrintMoveDetails(u16 a);
 static void PrintNewMoveDetailsOrCancelText(void);
 static void sub_81C4064(void);
 static void sub_81C40A0(u8 a, u8 b);
 static void PrintHMMovesCantBeForgotten(void);
-static void sub_81C4190(void);
-static void sub_81C4204(u8 a, u8 b);
-static void sub_81C424C(void);
-static void sub_81C4280(void);
-static void sub_81C42C8(void);
-static void sub_81C43A0(void);
-static void sub_81C4420(void);
-static void sub_81C4484(void);
-static void sub_81C44F0(void);
+static void ResetSpriteIds(void);
+static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible);
+static void HidePageSpecificSprites(void);
+static void SetTypeIcons(void);
+static void CreateMoveTypeIcons(void);
+static void SetMonTypeIcons(void);
+static void SetMoveTypeIcons(void);
+static void SetContestMoveTypeIcons(void);
+static void SetNewMoveTypeIcon(void);
 static void sub_81C4568(u8 a, u8 b);
-static u8 sub_81C45F4(struct Pokemon *a, s16 *b);
+static u8 CreatePokemonSprite(struct Pokemon *a, s16 *b);
 static u8 sub_81C47B4(struct Pokemon *unused);
-static void sub_81C4844(struct Sprite *);
+static void SpriteCB_Pokemon(struct Sprite *);
 static void sub_81C48F0(void);
 static void CreateMonMarkingsSprite(struct Pokemon *mon);
 static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon);
@@ -626,22 +627,26 @@ static const u8 sTextColors_861CD2C[][3] =
     {0, 5, 6},
     {0, 7, 8}
 };
+
 static const u8 gUnknown_0861CD53[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp");
 static const u8 gUnknown_0861CDD3[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp");
-static void (*const gUnknown_0861CE54[])(void) =
+
+static void (*const sTextPrinterFunctions[])(void) =
 {
-    sub_81C2E00,
-    sub_81C3530,
-    sub_81C3984,
-    sub_81C3D08
+    PrintInfoPageText,
+    PrintSkillsPageText,
+    PrintBattleMoves,
+    PrintContestMoves
 };
-static void (*const gUnknown_0861CE64[])(u8 taskId) =
+
+static void (*const sTextPrinterTasks[])(u8 taskId) =
 {
-    sub_81C2E40,
-    sub_81C3554,
-    sub_81C39F0,
-    sub_81C3D54
+    Task_PrintInfoPage,
+    Task_PrintSkillsPage,
+    Task_PrintBattleMoves,
+    Task_PrintContestMoves
 };
+
 static const u8 gUnknown_0861CE74[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}");
 static const u8 gUnknown_0861CE7B[] = _("{COLOR WHITE}{SHADOW DARK_GREY}");
 static const u8 gUnknown_0861CE82[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}");
@@ -968,13 +973,13 @@ static const union AnimCmd *const sSpriteAnimTable_StatusCondition[] = {
     sSpriteAnim_StatusPokerus,
     sSpriteAnim_StatusFaint,
 };
-static const struct CompressedSpriteSheet gUnknown_0861D0F8 =
+static const struct CompressedSpriteSheet sStatusIconsSpriteSheet =
 {
     .data = gStatusGfx_Icons,
     .size = 0x380,
     .tag = 30001
 };
-static const struct CompressedSpritePalette gUnknown_0861D100 =
+static const struct CompressedSpritePalette sStatusIconsSpritePalette =
 {
     .data = gStatusPal_Icons,
     .tag = 30001
@@ -1104,7 +1109,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
             gMain.state++;
         break;
     case 7:
-        sub_81C2554();
+        ResetWindows();
         gMain.state++;
         break;
     case 8:
@@ -1129,7 +1134,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 13:
-        sub_81C2D9C(pssData->currPageIndex);
+        PrintPageSpecificText(pssData->currPageIndex);
         gMain.state++;
         break;
     case 14:
@@ -1137,17 +1142,17 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 15:
-        sub_81C2AFC(pssData->currPageIndex);
+        CreatePageWindowTilemaps(pssData->currPageIndex);
         gMain.state++;
         break;
     case 16:
-        sub_81C4190();
-        sub_81C42C8();
+        ResetSpriteIds();
+        CreateMoveTypeIcons();
         pssData->unk40F0 = 0;
         gMain.state++;
         break;
     case 17:
-        pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0);
+        pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->unk40F0);
         if (pssData->spriteIds[0] != 0xFF)
         {
             pssData->unk40F0 = 0;
@@ -1167,12 +1172,12 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 21:
-        sub_81C4280();
+        SetTypeIcons();
         gMain.state++;
         break;
     case 22:
         if (pssData->mode != PSS_MODE_SELECT_MOVE)
-            CreateTask(sub_81C0510, 0);
+            CreateTask(HandleInput, 0);
         else
             CreateTask(sub_81C171C, 0);
         gMain.state++;
@@ -1182,7 +1187,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 24:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
         gPaletteFade.bufferTransferDisabled = 0;
         gMain.state++;
         break;
@@ -1259,11 +1264,11 @@ static bool8 SummaryScreen_DecompressGraphics(void)
         pssData->unk40F0++;
         break;
     case 9:
-        LoadCompressedSpriteSheet(&gUnknown_0861D0F8);
+        LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet);
         pssData->unk40F0++;
         break;
     case 10:
-        LoadCompressedSpritePalette(&gUnknown_0861D100);
+        LoadCompressedSpritePalette(&sStatusIconsSpritePalette);
         pssData->unk40F0++;
         break;
     case 11:
@@ -1374,7 +1379,7 @@ static void sub_81C0348(void)
     }
     else
     {
-        sub_81C240C(pssData->summary.moves[pssData->firstMoveIndex]);
+        DrawContestMoveHearts(pssData->summary.moves[pssData->firstMoveIndex]);
         sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0);
         sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0);
         SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]);
@@ -1402,13 +1407,13 @@ static void sub_81C0434(void)
     Free(pssData);
 }
 
-static void sub_81C044C(u8 taskId)
+static void BeginCloseSummaryScreen(u8 taskId)
 {
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-    gTasks[taskId].func = sub_81C0484;
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+    gTasks[taskId].func = CloseSummaryScreen;
 }
 
-static void sub_81C0484(u8 taskId)
+static void CloseSummaryScreen(u8 taskId)
 {
     if (sub_81221EC() != TRUE && !gPaletteFade.active)
     {
@@ -1426,25 +1431,25 @@ static void sub_81C0484(u8 taskId)
     }
 }
 
-static void sub_81C0510(u8 taskId)
+static void HandleInput(u8 taskId)
 {
     if (sub_81221EC() != TRUE && !gPaletteFade.active)
     {
         if (gMain.newKeys & DPAD_UP)
         {
-            sub_81C0604(taskId, -1);
+            ChangePokemon(taskId, -1);
         }
         else if (gMain.newKeys & DPAD_DOWN)
         {
-            sub_81C0604(taskId, 1);
+            ChangePokemon(taskId, 1);
         }
         else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1)
         {
-            sub_81C0A8C(taskId, -1);
+            ChangePage(taskId, -1);
         }
         else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysState() == 2)
         {
-            sub_81C0A8C(taskId, 1);
+            ChangePage(taskId, 1);
         }
         else if (gMain.newKeys & A_BUTTON)
         {
@@ -1454,7 +1459,7 @@ static void sub_81C0510(u8 taskId)
                 {
                     sub_81C48F0();
                     PlaySE(SE_SELECT);
-                    sub_81C044C(taskId);
+                    BeginCloseSummaryScreen(taskId);
                 }
                 else
                 {
@@ -1467,12 +1472,12 @@ static void sub_81C0510(u8 taskId)
         {
             sub_81C48F0();
             PlaySE(SE_SELECT);
-            sub_81C044C(taskId);
+            BeginCloseSummaryScreen(taskId);
         }
     }
 }
 
-static void sub_81C0604(u8 taskId, s8 a)
+static void ChangePokemon(u8 taskId, s8 a)
 {
     s8 r4_2;
 
@@ -1510,7 +1515,7 @@ static void sub_81C0604(u8 taskId, s8 a)
             PlaySE(SE_SELECT);
             if (pssData->summary.unk7 != 0)
             {
-                sub_81C4204(2, 1);
+                SetSpriteInvisibility(2, 1);
                 ClearWindowTilemap(13);
                 schedule_bg_copy_tilemap_to_vram(0);
                 sub_81C2074(0, 2);
@@ -1559,7 +1564,7 @@ static void sub_81C0704(u8 taskId)
         data[1] = 0;
         break;
     case 8:
-        pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]);
+        pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &data[1]);
         if (pssData->spriteIds[0] == 0xFF)
             return;
         gSprites[pssData->spriteIds[0]].data[2] = 1;
@@ -1567,13 +1572,13 @@ static void sub_81C0704(u8 taskId)
         data[1] = 0;
         break;
     case 9:
-        sub_81C4280();
+        SetTypeIcons();
         break;
     case 10:
         sub_81C25E8();
         break;
     case 11:
-        sub_81C2D9C(pssData->currPageIndex);
+        PrintPageSpecificText(pssData->currPageIndex);
         sub_81C2524();
         break;
     case 12:
@@ -1583,7 +1588,7 @@ static void sub_81C0704(u8 taskId)
         if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0)
         {
             data[0] = 0;
-            gTasks[taskId].func = sub_81C0510;
+            gTasks[taskId].func = HandleInput;
         }
         return;
     }
@@ -1656,7 +1661,7 @@ static bool8 sub_81C0A50(struct Pokemon* mon)
         return FALSE;
 }
 
-static void sub_81C0A8C(u8 taskId, s8 b)
+static void ChangePage(u8 taskId, s8 b)
 {
     struct PokeSummary *summary = &pssData->summary;
     s16 *data = gTasks[taskId].data;
@@ -1669,15 +1674,15 @@ static void sub_81C0A8C(u8 taskId, s8 b)
         return;
 
     PlaySE(SE_SELECT);
-    sub_81C2C38(pssData->currPageIndex);
+    ClearPageWindowTilemaps(pssData->currPageIndex);
     pssData->currPageIndex += b;
     data[0] = 0;
     if (b == 1)
         SetTaskFuncWithFollowupFunc(taskId, sub_81C0B8C, gTasks[taskId].func);
     else
         SetTaskFuncWithFollowupFunc(taskId, sub_81C0CC4, gTasks[taskId].func);
-    sub_81C2DE4(pssData->currPageIndex);
-    sub_81C424C();
+    CreateTextPrinterTask(pssData->currPageIndex);
+    HidePageSpecificSprites();
 }
 
 static void sub_81C0B8C(u8 taskId)
@@ -1717,8 +1722,8 @@ static void sub_81C0C68(u8 taskId)
     data[1] = 0;
     data[0] = 0;
     sub_81C1BA0();
-    sub_81C2AFC(pssData->currPageIndex);
-    sub_81C4280();
+    CreatePageWindowTilemaps(pssData->currPageIndex);
+    SetTypeIcons();
     sub_81C0E24();
     SwitchTaskToFollowupFunc(taskId);
 }
@@ -1766,8 +1771,8 @@ static void sub_81C0D44(u8 taskId)
     data[1] = 0;
     data[0] = 0;
     sub_81C1BA0();
-    sub_81C2AFC(pssData->currPageIndex);
-    sub_81C4280();
+    CreatePageWindowTilemaps(pssData->currPageIndex);
+    SetTypeIcons();
     sub_81C0E24();
     SwitchTaskToFollowupFunc(taskId);
 }
@@ -1797,15 +1802,15 @@ static void sub_81C0E48(u8 taskId)
     sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0);
     PrintMoveDetails(move);
     PrintNewMoveDetailsOrCancelText();
-    sub_81C44F0();
+    SetNewMoveTypeIcon();
     schedule_bg_copy_tilemap_to_vram(0);
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
     sub_81C4AF8(8);
-    gTasks[taskId].func = sub_81C0F44;
+    gTasks[taskId].func = HandleInput_MoveSelect;
 }
 
-static void sub_81C0F44(u8 taskId)
+static void HandleInput_MoveSelect(u8 taskId)
 {
     u8 id = taskId;
     s16 *data = gTasks[taskId].data;
@@ -1883,7 +1888,7 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c)
         if (move != 0)
             break;
     }
-    sub_81C240C(move);
+    DrawContestMoveHearts(move);
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
     PrintMoveDetails(move);
@@ -1930,7 +1935,7 @@ static void sub_81C11F4(u8 taskId)
     schedule_bg_copy_tilemap_to_vram(0);
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81C0510;
+    gTasks[taskId].func = HandleInput;
 }
 
 static void sub_81C129C(u8 taskId)
@@ -2003,10 +2008,10 @@ static void sub_81C13B0(u8 taskId, bool8 b)
 
     move = pssData->summary.moves[pssData->firstMoveIndex];
     PrintMoveDetails(move);
-    sub_81C240C(move);
+    DrawContestMoveHearts(move);
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81C0F44;
+    gTasks[taskId].func = HandleInput_MoveSelect;
 }
 
 static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2)
@@ -2081,7 +2086,7 @@ static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2
 
 static void sub_81C171C(u8 taskId)
 {
-    sub_81C44F0();
+    SetNewMoveTypeIcon();
     sub_81C4AF8(8);
     gTasks[taskId].func = sub_81C174C;
 }
@@ -2106,11 +2111,11 @@ static void sub_81C174C(u8 taskId)
             }
             else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
             {
-                sub_81C0A8C(taskId, -1);
+                ChangePage(taskId, -1);
             }
             else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
             {
-                sub_81C0A8C(taskId, 1);
+                ChangePage(taskId, 1);
             }
             else if (gMain.newKeys & A_BUTTON)
             {
@@ -2120,7 +2125,7 @@ static void sub_81C174C(u8 taskId)
                     PlaySE(SE_SELECT);
                     gUnknown_0203CF21 = pssData->firstMoveIndex;
                     gSpecialVar_0x8005 = gUnknown_0203CF21;
-                    sub_81C044C(taskId);
+                    BeginCloseSummaryScreen(taskId);
                 }
                 else
                 {
@@ -2135,7 +2140,7 @@ static void sub_81C174C(u8 taskId)
                 PlaySE(SE_SELECT);
                 gUnknown_0203CF21 = 4;
                 gSpecialVar_0x8005 = 4;
-                sub_81C044C(taskId);
+                BeginCloseSummaryScreen(taskId);
             }
         }
     }
@@ -2191,7 +2196,7 @@ static void sub_81C1940(u8 taskId)
                     ClearWindowTilemap(13);
                 move = pssData->summary.moves[pssData->firstMoveIndex];
                 gTasks[taskId].func = sub_81C174C;
-                sub_81C0A8C(taskId, -1);
+                ChangePage(taskId, -1);
                 sub_81C1DA4(9, -2);
                 sub_81C1EFC(9, -2, move);
             }
@@ -2205,7 +2210,7 @@ static void sub_81C1940(u8 taskId)
                     ClearWindowTilemap(13);
                 move = pssData->summary.moves[pssData->firstMoveIndex];
                 gTasks[taskId].func = sub_81C174C;
-                sub_81C0A8C(taskId, 1);
+                ChangePage(taskId, 1);
                 sub_81C1DA4(9, -2);
                 sub_81C1EFC(9, -2, move);
             }
@@ -2415,7 +2420,7 @@ static void sub_81C1F80(u8 taskId)
         {
             if (pssData->currPageIndex == 3 && FuncIsActiveTask(sub_81C0B8C) == 0)
                 PutWindowTilemap(15);
-            sub_81C240C(data[2]);
+            DrawContestMoveHearts(data[2]);
         }
         else
         {
@@ -2566,7 +2571,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused)
         schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81C240C(u16 move)
+static void DrawContestMoveHearts(u16 move)
 {
     u16 *tilemap = pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1];
     u8 i;
@@ -2618,7 +2623,7 @@ static void sub_81C2524(void)
         ChangeBgX(3, 0, 0);
 }
 
-static void sub_81C2554(void)
+static void ResetWindows(void)
 {
     u8 i;
     InitWindows(gUnknown_0861CC24);
@@ -2628,7 +2633,7 @@ static void sub_81C2554(void)
     {
         FillWindowPixelBuffer(i, 0);
     }
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
     {
         pssData->windowIds[i] = 0xFF;
     }
@@ -2782,7 +2787,7 @@ static void PrintPageNamesAndStatsPageToWindows(void)
     SummaryScreen_PrintTextOnWindow(15, gText_Jam, 0, 17, 0, 1);
 }
 
-static void sub_81C2AFC(u8 a)
+static void CreatePageWindowTilemaps(u8 page)
 {
     u8 i;
 
@@ -2791,22 +2796,22 @@ static void sub_81C2AFC(u8 a)
     ClearWindowTilemap(2);
     ClearWindowTilemap(3);
 
-    switch (a)
+    switch (page)
     {
-        case 0:
+        case PSS_PAGE_INFO:
             PutWindowTilemap(0);
             PutWindowTilemap(4);
             if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE)
                 PutWindowTilemap(8);
             PutWindowTilemap(9);
             break;
-        case 1:
+        case PSS_PAGE_SKILLS:
             PutWindowTilemap(1);
             PutWindowTilemap(10);
             PutWindowTilemap(11);
             PutWindowTilemap(12);
             break;
-        case 2:
+        case PSS_PAGE_BATTLE_MOVES:
             PutWindowTilemap(2);
             if (pssData->mode == PSS_MODE_SELECT_MOVE)
             {
@@ -2818,7 +2823,7 @@ static void sub_81C2AFC(u8 a)
                 PutWindowTilemap(5);
             }
             break;
-        case 3:
+        case PSS_PAGE_CONTEST_MOVES:
             PutWindowTilemap(3);
             if (pssData->mode == PSS_MODE_SELECT_MOVE)
             {
@@ -2832,7 +2837,7 @@ static void sub_81C2AFC(u8 a)
             break;
     }
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
     {
         PutWindowTilemap(pssData->windowIds[i]);
     }
@@ -2840,23 +2845,23 @@ static void sub_81C2AFC(u8 a)
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-static void sub_81C2C38(u8 a)
+static void ClearPageWindowTilemaps(u8 page)
 {
     u8 i;
-    switch (a)
+    switch (page)
     {
-        case 0:
+        case PSS_PAGE_INFO:
             ClearWindowTilemap(4);
             if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE)
                 ClearWindowTilemap(8);
             ClearWindowTilemap(9);
             break;
-        case 1:
+        case PSS_PAGE_SKILLS:
             ClearWindowTilemap(10);
             ClearWindowTilemap(11);
             ClearWindowTilemap(12);
             break;
-        case 2:
+        case PSS_PAGE_BATTLE_MOVES:
             if (pssData->mode == PSS_MODE_SELECT_MOVE)
             {
                 if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
@@ -2867,7 +2872,7 @@ static void sub_81C2C38(u8 a)
                 ClearWindowTilemap(5);
             }
             break;
-        case 3:
+        case PSS_PAGE_CONTEST_MOVES:
             if (pssData->mode == PSS_MODE_SELECT_MOVE)
             {
                 if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
@@ -2880,7 +2885,7 @@ static void sub_81C2C38(u8 a)
             break;
     }
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
     {
         SummaryScreen_RemoveWindowByIndex(i);
     }
@@ -2910,23 +2915,23 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex)
     }
 }
 
-static void sub_81C2D9C(u8 pageIndex)
+static void PrintPageSpecificText(u8 pageIndex)
 {
     u16 i;
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
     {
         if (pssData->windowIds[i] != 0xFF)
             FillWindowPixelBuffer(pssData->windowIds[i], 0);
     }
-    gUnknown_0861CE54[pageIndex]();
+    sTextPrinterFunctions[pageIndex]();
 }
 
-static void sub_81C2DE4(u8 pageIndex)
+static void CreateTextPrinterTask(u8 pageIndex)
 {
-    CreateTask(gUnknown_0861CE64[pageIndex], 16);
+    CreateTask(sTextPrinterTasks[pageIndex], 16);
 }
 
-static void sub_81C2E00(void)
+static void PrintInfoPageText(void)
 {
     if (pssData->summary.isEgg)
     {
@@ -2946,7 +2951,7 @@ static void sub_81C2E00(void)
     }
 }
 
-static void sub_81C2E40(u8 taskId)
+static void Task_PrintInfoPage(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     switch (data[0])
@@ -3074,7 +3079,7 @@ static void PrintMonTrainerMemo(void)
 
 static void BufferNatureString(void)
 {
-    struct UnkSummaryStruct *sumStruct = pssData;
+    struct PssData *sumStruct = pssData;
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5);
 }
@@ -3200,7 +3205,7 @@ static void PrintEggMemo(void)
     SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 3), text, 0, 1, 0, 0);
 }
 
-static void sub_81C3530(void)
+static void PrintSkillsPageText(void)
 {
     PrintHeldItemName();
     PrintRibbonCount();
@@ -3211,7 +3216,7 @@ static void sub_81C3530(void)
     PrintExpPointsNextLevel();
 }
 
-static void sub_81C3554(u8 taskId)
+static void Task_PrintSkillsPage(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -3357,7 +3362,7 @@ static void PrintExpPointsNextLevel(void)
     SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 17, 0, 0);
 }
 
-static void sub_81C3984(void)
+static void PrintBattleMoves(void)
 {
     PrintMoveNameAndPP(0);
     PrintMoveNameAndPP(1);
@@ -3379,7 +3384,7 @@ static void sub_81C3984(void)
     }
 }
 
-static void sub_81C39F0(u8 taskId)
+static void Task_PrintBattleMoves(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -3430,7 +3435,7 @@ static void PrintMoveNameAndPP(u8 moveIndex)
     u32 ppState;
     const u8 *text;
     u32 offset;
-    struct UnkSummaryStruct *summaryStruct = pssData;
+    struct PssData *summaryStruct = pssData;
     u8 moveNameWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 0);
     u8 ppValueWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 1);
     u16 move = summaryStruct->summary.moves[moveIndex];
@@ -3493,7 +3498,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex)
     }
 }
 
-static void sub_81C3D08(void)
+static void PrintContestMoves(void)
 {
     PrintMoveNameAndPP(0);
     PrintMoveNameAndPP(1);
@@ -3507,7 +3512,7 @@ static void sub_81C3D08(void)
     }
 }
 
-static void sub_81C3D54(u8 taskId)
+static void Task_PrintContestMoves(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     s16 dataa = data[0] - 1;
@@ -3641,11 +3646,11 @@ static void PrintHMMovesCantBeForgotten(void)
     SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0);
 }
 
-static void sub_81C4190(void)
+static void ResetSpriteIds(void)
 {
     u8 i;
 
-    for (i = 0; i < 28; i++)
+    for (i = 0; i < ARRAY_COUNT(pssData->spriteIds); i++)
     {
         pssData->spriteIds[i] = 0xFF;
     }
@@ -3660,41 +3665,42 @@ static void DestroySpriteInArray(u8 spriteArrayId)
     }
 }
 
-static void sub_81C4204(u8 spriteArrayId, bool8 invisible)
+static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible)
 {
     gSprites[pssData->spriteIds[spriteArrayId]].invisible = invisible;
 }
 
-static void sub_81C424C(void)
+static void HidePageSpecificSprites(void)
 {
+// Keeps Pokémon, caught ball and status sprites visible.
     u8 i;
 
-    for (i = 3; i < 28; i++)
+    for (i = 3; i < ARRAY_COUNT(pssData->spriteIds); i++)
     {
         if (pssData->spriteIds[i] != 0xFF)
-            sub_81C4204(i, TRUE);
+            SetSpriteInvisibility(i, TRUE);
     }
 }
 
-static void sub_81C4280(void)
+static void SetTypeIcons(void)
 {
     switch (pssData->currPageIndex)
     {
-    case 0:
-        sub_81C43A0();
+    case PSS_PAGE_INFO:
+        SetMonTypeIcons();
         break;
-    case 2:
-        sub_81C4420();
-        sub_81C44F0();
+    case PSS_PAGE_BATTLE_MOVES:
+        SetMoveTypeIcons();
+        SetNewMoveTypeIcon();
         break;
-    case 3:
-        sub_81C4484();
-        sub_81C44F0();
+    case PSS_PAGE_CONTEST_MOVES:
+        SetContestMoveTypeIcons();
+        SetNewMoveTypeIcon();
         break;
     }
 }
 
-static void sub_81C42C8(void)
+static void CreateMoveTypeIcons(void)
 {
     u8 i;
 
@@ -3703,7 +3709,7 @@ static void sub_81C42C8(void)
         if (pssData->spriteIds[i] == 0xFF)
             pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
 
-        sub_81C4204(i, TRUE);
+        SetSpriteInvisibility(i, TRUE);
     }
 }
 
@@ -3714,16 +3720,16 @@ static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
     sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId];
     sprite->pos1.x = x + 16;
     sprite->pos1.y = y + 8;
-    sub_81C4204(spriteArrayId, FALSE);
+    SetSpriteInvisibility(spriteArrayId, FALSE);
 }
 
-static void sub_81C43A0(void)
+static void SetMonTypeIcons(void)
 {
     struct PokeSummary *summary = &pssData->summary;
     if (summary->isEgg)
     {
         SetMoveTypeSpritePosAndType(TYPE_MYSTERY, 120, 48, 3);
-        sub_81C4204(4, TRUE);
+        SetSpriteInvisibility(4, TRUE);
     }
     else
     {
@@ -3731,16 +3737,16 @@ static void sub_81C43A0(void)
         if (gBaseStats[summary->species].type1 != gBaseStats[summary->species].type2)
         {
             SetMoveTypeSpritePosAndType(gBaseStats[summary->species].type2, 0xA0, 0x30, 4);
-            sub_81C4204(4, FALSE);
+            SetSpriteInvisibility(4, FALSE);
         }
         else
         {
-            sub_81C4204(4, TRUE);
+            SetSpriteInvisibility(4, TRUE);
         }
     }
 }
 
-static void sub_81C4420(void)
+static void SetMoveTypeIcons(void)
 {
     u8 i;
     struct PokeSummary *summary = &pssData->summary;
@@ -3749,11 +3755,11 @@ static void sub_81C4420(void)
         if (summary->moves[i] != MOVE_NONE)
             SetMoveTypeSpritePosAndType(gBattleMoves[summary->moves[i]].type, 0x55, 0x20 + (i * 0x10), i + 3);
         else
-            sub_81C4204(i + 3, TRUE);
+            SetSpriteInvisibility(i + 3, TRUE);
     }
 }
 
-static void sub_81C4484(void)
+static void SetContestMoveTypeIcons(void)
 {
     u8 i;
     struct PokeSummary *summary = &pssData->summary;
@@ -3762,15 +3768,15 @@ static void sub_81C4484(void)
         if (summary->moves[i] != MOVE_NONE)
             SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[summary->moves[i]].contestCategory, 0x55, 0x20 + (i * 0x10), i + 3);
         else
-            sub_81C4204(i + 3, TRUE);
+            SetSpriteInvisibility(i + 3, TRUE);
     }
 }
 
-static void sub_81C44F0(void)
+static void SetNewMoveTypeIcon(void)
 {
     if (pssData->newMove == MOVE_NONE)
     {
-        sub_81C4204(7, TRUE);
+        SetSpriteInvisibility(7, TRUE);
     }
     else
     {
@@ -3800,7 +3806,7 @@ static void sub_81C4568(u8 a0, u8 a1)
     sprite2->animEnded = FALSE;
 }
 
-static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1)
+static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1)
 {
     const struct CompressedSpritePalette *pal;
     struct PokeSummary *summary = &pssData->summary;
@@ -3847,17 +3853,17 @@ static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1)
                 }
             }
             (*a1)++;
-            return -1;
+            return 0xFF;
         case 1:
             pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid);
             LoadCompressedSpritePalette(pal);
             SetMultiuseSpriteTemplateToPokemon(pal->tag, 1);
             (*a1)++;
-            return -1;
+            return 0xFF;
     }
 }
 
-static void sub_81C4778(void)
+static void PlayMonCry(void)
 {
     struct PokeSummary *summary = &pssData->summary;
     if (!summary->isEgg)
@@ -3883,7 +3889,7 @@ static u8 sub_81C47B4(struct Pokemon *unused)
 
     sprite->data[0] = summary->species2;
     sprite->data[2] = 0;
-    gSprites[spriteId].callback = sub_81C4844;
+    gSprites[spriteId].callback = SpriteCB_Pokemon;
     sprite->oam.priority = 0;
 
     if (!IsMonSpriteNotFlipped(summary->species2))
@@ -3898,14 +3904,14 @@ static u8 sub_81C47B4(struct Pokemon *unused)
     return spriteId;
 }
 
-static void sub_81C4844(struct Sprite *sprite)
+static void SpriteCB_Pokemon(struct Sprite *sprite)
 {
     struct PokeSummary *summary = &pssData->summary;
 
     if (!gPaletteFade.active && sprite->data[2] != 1)
     {
         sprite->data[1] = IsMonSpriteNotFlipped(sprite->data[0]);
-        sub_81C4778();
+        PlayMonCry();
         PokemonSummaryDoMonAnimation(sprite, sprite->data[0], summary->isEgg);
     }
 }
@@ -4000,11 +4006,11 @@ static void CreateSetStatusSprite(void)
     if (anim != 0)
     {
         StartSpriteAnim(&gSprites[*spriteId], anim - 1);
-        sub_81C4204(2, FALSE);
+        SetSpriteInvisibility(2, FALSE);
     }
     else
     {
-        sub_81C4204(2, TRUE);
+        SetSpriteInvisibility(2, TRUE);
     }
 }
 
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 0dae76f02..c11dc55e7 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -782,7 +782,7 @@ void sub_818603C(u8 arg0)
                         movePp.moves[j] = gBattleMons[battlerId].moves[array1[j]];
                         movePp.pp[j] = gBattleMons[battlerId].pp[array1[j]];
                         array3[j] = ppBonuses[array1[j]];
-                        array2[j] = (gDisableStructs[battlerId].unk18_b & gBitTable[j]) >> j;
+                        array2[j] = (gDisableStructs[battlerId].mimickedMoves & gBitTable[j]) >> j;
                     }
                     for (j = 0; j < MAX_MON_MOVES; j++)
                     {
@@ -790,11 +790,11 @@ void sub_818603C(u8 arg0)
                         gBattleMons[battlerId].pp[j] = movePp.pp[j];
                     }
                     gBattleMons[battlerId].ppBonuses = 0;
-                    gDisableStructs[battlerId].unk18_b = 0;
+                    gDisableStructs[battlerId].mimickedMoves = 0;
                     for (j = 0; j < MAX_MON_MOVES; j++)
                     {
                         gBattleMons[battlerId].ppBonuses |= (array3[j]) << (j << 1);
-                        gDisableStructs[battlerId].unk18_b |= (array2[j]) << (j);
+                        gDisableStructs[battlerId].mimickedMoves |= (array2[j]) << (j);
                     }
 
                     if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED))
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c
index 41f7eeee7..9bdd86167 100644
--- a/src/rom_8011DC0.c
+++ b/src/rom_8011DC0.c
@@ -189,8 +189,6 @@ extern u16 gUnknown_02022C3C;
 extern u8 gUnknown_02022C20[];
 extern u8 gFieldLinkPlayerCount;
 extern u8 gUnknown_03005DB4;
-extern struct MailStruct gUnknown_020321C0[PARTY_SIZE];
-extern u8 gUnknown_02032298[2];
 
 // IWRAM vars
 IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0;
@@ -1105,7 +1103,7 @@ void sub_80134E8(u8 taskId)
             RedrawListMenu(data->listTaskId);
             break;
         case 0:
-            id = ListMenuHandleInputGetItemId(data->listTaskId);
+            id = ListMenu_ProcessInput(data->listTaskId);
             if (gMain.newKeys & A_BUTTON && id != -1)
             {
                 // this unused variable along with the assignment is needed to match
@@ -2176,7 +2174,7 @@ void sub_8014F48(u8 taskId)
             RedrawListMenu(data->listTaskId);
             break;
         case 0:
-            id = ListMenuHandleInputGetItemId(data->listTaskId);
+            id = ListMenu_ProcessInput(data->listTaskId);
             if (gMain.newKeys & A_BUTTON && id != -1)
             {
                 // this unused variable along with the assignment is needed to match
@@ -2340,7 +2338,7 @@ void sub_80152F4(u8 taskId)
             break;
         case 0:
             if (data->field_13 != 0)
-                id = ListMenuHandleInputGetItemId(data->listTaskId);
+                id = ListMenu_ProcessInput(data->listTaskId);
             if (data->field_14 > 120)
             {
                 if (data->field_0->arr[0].field_1A_0 == 1 && !data->field_0->arr[0].unk.field_0.unk_0a_7)
diff --git a/src/script_menu.c b/src/script_menu.c
index a4f4c6086..7180bfc60 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1170,9 +1170,9 @@ static void Task_HandleMultichoiceInput(u8 taskId)
                 sub_80E2A94(tMultichoiceId);
             }
 
-            if (selection != -2)
+            if (selection != MENU_NOTHING_CHOSEN)
             {
-                if (selection == -1)
+                if (selection == MENU_B_PRESSED)
                 {
                     if (tIgnoreBPress)
                         return;
diff --git a/src/secret_base.c b/src/secret_base.c
index de5fae077..adcab9cbc 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -953,13 +953,13 @@ void sub_80E9E90(u8 taskId)
     s32 input;
 
     data = gTasks[taskId].data;
-    input = ListMenuHandleInputGetItemId(data[5]);
+    input = ListMenu_ProcessInput(data[5]);
     ListMenuGetScrollAndRow(data[5], &data[2], &data[1]);
     switch (input)
     {
-        case -1:
+        case LIST_NOTHING_CHOSEN:
             break;
-        case -2:
+        case LIST_B_PRESSED:
             PlaySE(SE_SELECT);
             DestroyListMenuTask(data[5], NULL, NULL);
             RemoveScrollIndicatorArrowPair(data[8]);
@@ -1002,11 +1002,11 @@ void sub_80E9FB0(u8 taskId)
     input = Menu_ProcessInputNoWrap();
     switch (input)
     {
-        case -1:
+        case MENU_B_PRESSED:
             PlaySE(SE_SELECT);
             sub_80EA18C(taskId);
             break;
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             break;
         default:
             PlaySE(SE_SELECT);
diff --git a/src/shop.c b/src/shop.c
index c44cbca12..8eefd5e97 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -328,9 +328,9 @@ static void Task_ShopMenu(u8 taskId)
     s8 inputCode = Menu_ProcessInputNoWrap();
     switch (inputCode)
     {
-    case LIST_B_PRESSED:
+    case MENU_NOTHING_CHOSEN:
         break;
-    case LIST_NOTHING_CHOSEN:
+    case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
         Task_HandleShopMenuQuit(taskId);
         break;
@@ -911,7 +911,7 @@ static void Task_BuyMenu(u8 taskId)
 
     if (!gPaletteFade.active)
     {
-        s32 itemId = ListMenuHandleInputGetItemId(tListTaskId);
+        s32 itemId = ListMenu_ProcessInput(tListTaskId);
         ListMenuGetScrollAndRow(tListTaskId, &gShopDataPtr->scrollOffset, &gShopDataPtr->selectedRow);
 
         switch (itemId)
diff --git a/src/sound.c b/src/sound.c
index c63183bdc..ebb4fad75 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -34,13 +34,33 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_SE3;
 extern struct ToneData gCryTable[];
 extern struct ToneData gCryTable2[];
-extern const struct Fanfare sFanfares[];
 
 static void Task_Fanfare(u8 taskId);
 static void CreateFanfareTask(void);
 static void Task_DuckBGMForPokemonCry(u8 taskId);
 static void RestoreBGMVolumeAfterPokemonCry(void);
 
+static const struct Fanfare sFanfares[] = {
+    { MUS_FANFA1,        80 },
+    { MUS_FANFA4,       160 },
+    { MUS_FANFA5,       220 },
+    { MUS_ME_WAZA,      220 },
+    { MUS_ME_ASA,       160 },
+    { MUS_ME_BACHI,     340 },
+    { MUS_ME_WASURE,    180 },
+    { MUS_ME_KINOMI,    120 },
+    { MUS_ME_TAMA,      710 },
+    { MUS_ME_B_BIG,     250 },
+    { MUS_ME_B_SMALL,   150 },
+    { MUS_ME_ZANNEN,    160 },
+    { MUS_RG_POKEFUE,   450 },
+    { MUS_RG_FAN5,      170 },
+    { MUS_RG_FAN2,      196 },
+    { MUS_ME_POINTGET,  313 },
+    { MUS_ME_SYMBOLGET, 318 },
+    { MUS_ME_TORE_EYE,  135 },
+};
+
 #define CRY_VOLUME  120 // was 125 in R/S
 
 void InitMapMusic(void)
diff --git a/src/trader.c b/src/trader.c
index e23efb4ce..b5c159fb9 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -113,9 +113,9 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
 
     switch (input)
     {
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             break;
-        case -1:
+        case MENU_B_PRESSED:
         case 4:
             PlaySE(SE_SELECT);
             sub_8133BE4(taskId, 0);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index b7bd5cc1d..49a62284f 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -93,6 +93,7 @@ struct TrainerCardData
 extern u8 sub_80D30A0(u16);
 
 // EWRAM
+EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0};
 EWRAM_DATA static struct TrainerCardData *sData = NULL;
 
 //this file's functions
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index e0a236286..309ffdb1d 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -24,6 +24,7 @@
 #include "constants/event_object_movement_constants.h"
 #include "constants/event_objects.h"
 #include "constants/items.h"
+#include "constants/layouts.h"
 #include "constants/moves.h"
 #include "constants/maps.h"
 #include "constants/species.h"
@@ -324,7 +325,7 @@ void ResetTrainerHillResults(void)
 
 static u8 GetFloorId(void)
 {
-    return gMapHeader.mapLayoutId - 159;
+    return gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F;
 }
 
 u8 GetTrainerHillOpponentClass(u16 trainerId)
@@ -385,7 +386,7 @@ static void SetUpDataStruct(void)
     if (sHillData == NULL)
     {
         sHillData = AllocZeroed(sizeof(*sHillData));
-        sHillData->floorId = gMapHeader.mapLayoutId - 159;
+        sHillData->floorId = gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F;
         CpuCopy32(sDataPerTag[gSaveBlock1Ptr->trainerHill.tag], &sHillData->tag, sizeof(sHillData->tag));
         nullsub_2();
     }
@@ -803,10 +804,10 @@ bool32 InTrainerHill(void)
 {
     bool32 ret;
 
-    if (gMapHeader.mapLayoutId == 0x19F
-            || gMapHeader.mapLayoutId == 0x1A0
-            || gMapHeader.mapLayoutId == 0x1A1
-            || gMapHeader.mapLayoutId == 0x1A2)
+    if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F
+            || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F
+            || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F
+            || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F)
         ret = TRUE;
     else
         ret = FALSE;
@@ -818,17 +819,17 @@ u8 GetCurrentTrainerHillMapId(void)
 {
     u8 ret;
 
-    if (gMapHeader.mapLayoutId == 0x19F)
+    if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F)
         ret = 1;
-    else if (gMapHeader.mapLayoutId == 0x1A0)
+    else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F)
         ret = 2;
-    else if (gMapHeader.mapLayoutId == 0x1A1)
+    else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F)
         ret = 3;
-    else if (gMapHeader.mapLayoutId == 0x1A2)
+    else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F)
         ret = 4;
-    else if (gMapHeader.mapLayoutId == 0x1A3)
+    else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF)
         ret = 5;
-    else if (gMapHeader.mapLayoutId == 0x19E)
+    else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ENTRANCE)
         ret = 6;
     else
         ret = 0;
@@ -840,7 +841,7 @@ static bool32 sub_81D6100(void)
 {
     bool32 ret;
 
-    if (gMapHeader.mapLayoutId == 0x1A3)
+    if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF)
         ret = TRUE;
     else
         ret = FALSE;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 3846eca46..bc5d9cbc3 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "constants/battle_setup.h"
 #include "battle_setup.h"
 #include "event_data.h"
 #include "event_object_movement.h"
@@ -14,6 +13,8 @@
 #include "trainer_hill.h"
 #include "util.h"
 #include "battle_pyramid.h"
+#include "constants/battle_setup.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 
 extern void sub_809BE48(u16 npcId);
@@ -33,17 +34,17 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran
 static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
 
 static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj);
-static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
 
 static void SpriteCB_TrainerIcons(struct Sprite *sprite);
 
@@ -73,25 +74,25 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train
 static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
 {
     sub_80B4178,
-    sub_80B417C,
-    sub_80B41C0,
-    sub_80B4200,
-    sub_80B425C,
-    sub_80B4318,
-    sub_80B435C,
-    sub_80B4390,
-    sub_80B43AC,
-    sub_80B43E0,
-    sub_80B4438,
-    sub_80B44AC
+    TrainerExclamationMark,
+    WaitTrainerExclamationMark,
+    TrainerMoveToPlayer,
+    PlayerFaceApproachingTrainer,
+    WaitPlayerFaceApproachingTrainer,
+    RevealDisguisedTrainer,
+    WaitRevealDisguisedTrainer,
+    RevealHiddenTrainer,
+    PopOutOfAshHiddenTrainer,
+    JumpInPlaceHiddenTrainer,
+    WaitRevealHiddenTrainer,
 };
 
 static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
 {
-    sub_80B43AC,
-    sub_80B43E0,
-    sub_80B4438,
-    sub_80B44AC,
+    RevealHiddenTrainer,
+    PopOutOfAshHiddenTrainer,
+    JumpInPlaceHiddenTrainer,
+    WaitRevealHiddenTrainer,
 };
 
 static const struct OamData sOamData_Icons =
@@ -433,7 +434,7 @@ static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *train
     return FALSE;
 }
 
-static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     u8 direction;
 
@@ -445,7 +446,7 @@ static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *train
     return TRUE;
 }
 
-static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
     {
@@ -454,17 +455,17 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *train
     else
     {
         task->tFuncId++;
-        if (trainerObj->movementType == 57 || trainerObj->movementType == 58)
+        if (trainerObj->movementType == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->movementType == MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
             task->tFuncId = 6;
-        if (trainerObj->movementType == 63)
+        if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN)
             task->tFuncId = 8;
         return TRUE;
     }
 }
 
-static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj))
+    if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
         if (task->tTrainerRange)
         {
@@ -473,14 +474,14 @@ static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *train
         }
         else
         {
-            EventObjectSetHeldMovement(trainerObj, 0x3E);
+            EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
             task->tFuncId++;
         }
     }
     return FALSE;
 }
 
-static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     struct EventObject *playerObj;
 
@@ -501,7 +502,7 @@ static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *train
     return FALSE;
 }
 
-static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
@@ -511,18 +512,18 @@ static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *train
     return FALSE;
 }
 
-static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     if (!EventObjectIsMovementOverridden(trainerObj)
      || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
-        EventObjectSetHeldMovement(trainerObj, 0x59);
+        EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER);
         task->tFuncId++;
     }
     return FALSE;
 }
 
-static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     if (EventObjectClearHeldMovementIfFinished(trainerObj))
         task->tFuncId = 3;
@@ -530,18 +531,18 @@ static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *train
     return FALSE;
 }
 
-static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     if (!EventObjectIsMovementOverridden(trainerObj)
      || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
-        EventObjectSetHeldMovement(trainerObj, 0x3E);
+        EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
         task->tFuncId++;
     }
     return FALSE;
 }
 
-static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     if (EventObjectCheckHeldMovementStatus(trainerObj))
     {
@@ -555,7 +556,7 @@ static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *train
     return FALSE;
 }
 
-static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     struct Sprite *sprite;
 
@@ -574,7 +575,7 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *train
     return FALSE;
 }
 
-static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj)
+static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
         task->tFuncId = 3;
diff --git a/src/tv.c b/src/tv.c
index f46bfa0c4..5904efeb8 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -38,6 +38,7 @@
 #include "secret_base.h"
 #include "tv.h"
 #include "data2.h"
+#include "constants/layouts.h"
 
 // Static type declarations
 
@@ -913,13 +914,13 @@ void ResetGabbyAndTy(void)
     gSaveBlock1Ptr->gabbyAndTyData.quote[0] = -1;
     gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn = FALSE;
     gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon = FALSE;
-    gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem = FALSE;
+    gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem = FALSE;
     gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall = FALSE;
     gSaveBlock1Ptr->gabbyAndTyData.onAir = FALSE;
     gSaveBlock1Ptr->gabbyAndTyData.valA_5 = 0;
     gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn2 = FALSE;
     gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon2 = FALSE;
-    gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem2 = FALSE;
+    gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem2 = FALSE;
     gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall2 = FALSE;
     gSaveBlock1Ptr->gabbyAndTyData.valB_4 = 0;
     gSaveBlock1Ptr->gabbyAndTyData.mapnum = 0;
@@ -946,13 +947,13 @@ void GabbyAndTyBeforeInterview(void)
     {
         gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon = FALSE;
     }
-    if (gBattleResults.unk3 != 0)
+    if (gBattleResults.numHealingItemsUsed != 0)
     {
-        gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem = TRUE;
+        gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem = TRUE;
     }
     else
     {
-        gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem = FALSE;
+        gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem = FALSE;
     }
     if (!gBattleResults.usedMasterBall)
     {
@@ -980,7 +981,7 @@ void GabbyAndTyAfterInterview(void)
 {
     gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn2 = gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn;
     gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon2 = gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon;
-    gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem2 = gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem;
+    gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem2 = gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem;
     gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall2 = gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall;
     gSaveBlock1Ptr->gabbyAndTyData.onAir = TRUE;
     gSaveBlock1Ptr->gabbyAndTyData.mapnum = gMapHeader.regionMapSectionId;
@@ -1027,7 +1028,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void)
     {
         return 2;
     }
-    if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem2)
+    if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem2)
     {
         return 3;
     }
@@ -6141,7 +6142,7 @@ void DoTVShowInSearchOfTrainers(void)
             {
                 sTVShowState = 5;
             }
-            else if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem)
+            else if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem)
             {
                 sTVShowState = 6;
             }
@@ -6264,7 +6265,9 @@ static void DoTVShowTodaysRivalTrainer(void)
                 case MAPSEC_DYNAMIC:
                     switch (show->rivalTrainer.mapLayoutId)
                     {
-                        case 0x115 ... 0x117:
+                        case LAYOUT_SS_TIDAL_CORRIDOR:
+                        case LAYOUT_SS_TIDAL_LOWER_DECK:
+                        case LAYOUT_SS_TIDAL_ROOMS:
                             sTVShowState = 10;
                             break;
                         default:
@@ -6463,7 +6466,9 @@ static void DoTVShowHoennTreasureInvestigators(void)
             {
                 switch (show->treasureInvestigators.mapLayoutId)
                 {
-                    case 0x115 ... 0x117:
+                    case LAYOUT_SS_TIDAL_CORRIDOR:
+                    case LAYOUT_SS_TIDAL_LOWER_DECK:
+                    case LAYOUT_SS_TIDAL_ROOMS:
                         sTVShowState = 2;
                         break;
                     default:
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 2e6f1642a..e42bf8a23 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -1,27 +1,27 @@
 #include "global.h"
 #include "wild_encounter.h"
 #include "pokemon.h"
-#include "constants/species.h"
 #include "metatile_behavior.h"
 #include "fieldmap.h"
 #include "random.h"
-#include "constants/maps.h"
 #include "field_player_avatar.h"
-#include "constants/abilities.h"
 #include "event_data.h"
 #include "safari_zone.h"
 #include "overworld.h"
 #include "pokeblock.h"
 #include "battle_setup.h"
 #include "roamer.h"
-#include "constants/game_stat.h"
 #include "tv.h"
 #include "link.h"
 #include "script.h"
 #include "battle_pike.h"
 #include "battle_pyramid.h"
+#include "constants/abilities.h"
+#include "constants/game_stat.h"
 #include "constants/items.h"
+#include "constants/layouts.h"
 #include "constants/maps.h"
+#include "constants/species.h"
 
 extern const u8 EventScript_RepelWoreOff[];
 
@@ -413,7 +413,7 @@ static bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 ar
     level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]);
     if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(level))
         return FALSE;
-    if (gMapHeader.mapLayoutId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level))
+    if (gMapHeader.mapLayoutId != LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level))
         return FALSE;
 
     CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level);
@@ -474,7 +474,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
     {
         u32 ability = GetMonAbility(&gPlayerParty[0]);
 
-        if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == 0x169)
+        if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
             encounterRate = encounterRate * 3 / 4;
         else if (ability == ABILITY_STENCH)
             encounterRate /= 2;
@@ -522,7 +522,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
     headerId = GetCurrentMapWildMonHeaderId();
     if (headerId == 0xFFFF)
     {
-        if (gMapHeader.mapLayoutId == 0x166)
+        if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3)
         {
             headerId = GetBattlePikeWildMonHeaderId();
             if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
@@ -537,7 +537,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
             BattleSetup_StartBattlePikeWildBattle();
             return TRUE;
         }
-        if (gMapHeader.mapLayoutId == 0x169)
+        if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
         {
             headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
             if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
@@ -665,7 +665,7 @@ bool8 SweetScentWildEncounter(void)
     headerId = GetCurrentMapWildMonHeaderId();
     if (headerId == 0xFFFF)
     {
-        if (gMapHeader.mapLayoutId == 0x166)
+        if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3)
         {
             headerId = GetBattlePikeWildMonHeaderId();
             if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE)
@@ -675,7 +675,7 @@ bool8 SweetScentWildEncounter(void)
             BattleSetup_StartBattlePikeWildBattle();
             return TRUE;
         }
-        if (gMapHeader.mapLayoutId == 0x169)
+        if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
         {
             headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
             if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE)
diff --git a/sym_common.txt b/sym_common.txt
index 3a7d698fd..414d223e9 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -23,57 +23,14 @@
 	.include "contest.o"
 	.include "tv.o"
 	.include "mauville_old_man.o"
-
-gUnknown_03006164: @ 3006164
-	.space 0x4
-
-gUnknown_03006168: @ 3006168
-	.space 0x4
-
-gUnknown_0300616C: @ 300616C
-	.space 0x4
-
-gUnknown_03006170: @ 3006170
-	.space 0x4
-
-gUnknown_03006174: @ 3006174
-	.space 0x4
-
-gUnknown_03006178: @ 3006178
-	.space 0x4
-
-gUnknown_0300617C: @ 300617C
-	.space 0x4
-
-gUnknown_03006180: @ 3006180
-	.space 0x4
-
-gUnknown_03006184: @ 3006184
-	.space 0x4
-
-gUnknown_03006188: @ 3006188
-	.space 0x8
-
-gUnknown_03006190: @ 3006190
-	.space 0x10
-
-gUnknown_030061A0: @ 30061A0
-	.space 0x20
-
-gUnknown_030061C0: @ 30061C0
+	.include "contest_painting_effects.o"
+	
 	.space 0x4
-
-gContestPaintingMonPalette: @ 30061C4
-	.space 0xC
-
+	
+	.include "contest_painting.o"
 	.include "field_specials.o"
-
-gCB2_AfterEvolution: @ 30061E8
-	.space 0x4
-
-gDexCryScreenState: @ 30061EC
-	.space 0x4
-
+	.include "evolution_scene.o"
+	.include "pokedex_cry_screen.o"
 	.include "save.o"
 	.include "battle_tower.o"
 	.include "intro.o"
@@ -84,14 +41,14 @@ gDexCryScreenState: @ 30061EC
 	.space 0x8
 	
 	.include "list_menu.o"
-
-gUnknown_03006328: @ 3006328
-	.space 0x48
+	.include "party_menu.o"
+	
+	.space 0x44
 
 gUnknown_03006370: @ 3006370
 	.space 0x10
 
-	.include "m4a_2.o"
+	.include "m4a.o"
 	.include "agb_flash.o"
 
 gRfuState: @ 3007868
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 9e836d0fe..361c0921f 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -140,19 +140,6 @@ gUnknown_02022D00: @ 2022D00
 	.include "src/scanline_effect.o"
 	.include "src/option_menu.o"
 	.include "src/pokedex.o"
-
-gTrainerCards: @ 2039B58
-	.space 0x14
-
-gUnknown_02039B6C: @ 2039B6C
-	.space 0x2
-
-gUnknown_02039B6E: @ 2039B6E
-	.space 0x1A
-
-gUnknown_02039B88: @ 2039B88
-	.space 0x160
-
 	.include "src/trainer_card.o"
 	.include "src/frontier_pass.o"
 	.include "src/pokemon_storage_system.o"
@@ -161,14 +148,6 @@ gUnknown_02039B88: @ 2039B88
 	.include "src/map_name_popup.o"
 	.include "src/item.o"
 	.include "src/contest.o"
-
-	.align 2
-gUnknown_02039F5C: @ 2039F5C
-	.space 0x1
-
-gUnknown_02039F5D: @ 2039F5D
-	.space 0x3
-
 	.include "src/shop.o"
 	.include "src/fldeff_escalator.o"
 	.include "src/script_menu.o"
@@ -177,21 +156,12 @@ gUnknown_02039F5D: @ 2039F5D
 	.include "src/record_mixing.o"
 	.include "src/secret_base.o"
 	.include "src/tv.o"
-
-gUnknown_0203A034: @ 203A034
-	.space 0x4
-
+	.include "src/contest_link_80F57C4.o"
 	.include "src/rotating_gate.o"
 	.include "src/safari_zone.o"
-
-gUnknown_0203A0F4: @ 203A0F4
-	.space 0x4
-
+	.include "src/item_use.o"
 	.include "src/battle_anim_effects_1.o"
-
-gUnknown_0203A100: @ 203A100
-	.space 0x10
-
+	.include "src/dragon.o"
 	.include "src/battle_anim_utility_funcs.o"
 	.include "src/battle_intro.o"
 	.include "src/easy_chat.o"
diff --git a/tools/mapjson/.gitignore b/tools/mapjson/.gitignore
new file mode 100755
index 000000000..a5d568479
--- /dev/null
+++ b/tools/mapjson/.gitignore
@@ -0,0 +1 @@
+mapjson
diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile
new file mode 100644
index 000000000..d09acad50
--- /dev/null
+++ b/tools/mapjson/Makefile
@@ -0,0 +1,15 @@
+CXX := g++
+
+CXXFLAGS := -Wall -std=c++11 -O2
+
+SRCS := json11.cpp mapjson.cpp
+
+HEADERS := mapjson.h
+
+.PHONY: clean
+
+mapjson: $(SRCS) $(HEADERS)
+	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
+
+clean:
+	$(RM) mapjson mapjson.exe
diff --git a/tools/mapjson/json11.cpp b/tools/mapjson/json11.cpp
new file mode 100644
index 000000000..1da530206
--- /dev/null
+++ b/tools/mapjson/json11.cpp
@@ -0,0 +1,786 @@
+/* Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "json11.h"
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <cstdio>
+#include <limits>
+
+namespace json11 {
+
+static const int max_depth = 200;
+
+using std::string;
+using std::vector;
+using std::map;
+using std::make_shared;
+using std::initializer_list;
+using std::move;
+
+/* Helper for representing null - just a do-nothing struct, plus comparison
+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
+ * it may not be orderable.
+ */
+struct NullStruct {
+    bool operator==(NullStruct) const { return true; }
+    bool operator<(NullStruct) const { return false; }
+};
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Serialization
+ */
+
+static void dump(NullStruct, string &out) {
+    out += "null";
+}
+
+static void dump(double value, string &out) {
+    if (std::isfinite(value)) {
+        char buf[32];
+        snprintf(buf, sizeof buf, "%.17g", value);
+        out += buf;
+    } else {
+        out += "null";
+    }
+}
+
+static void dump(int value, string &out) {
+    char buf[32];
+    snprintf(buf, sizeof buf, "%d", value);
+    out += buf;
+}
+
+static void dump(bool value, string &out) {
+    out += value ? "true" : "false";
+}
+
+static void dump(const string &value, string &out) {
+    out += '"';
+    for (size_t i = 0; i < value.length(); i++) {
+        const char ch = value[i];
+        if (ch == '\\') {
+            out += "\\\\";
+        } else if (ch == '"') {
+            out += "\\\"";
+        } else if (ch == '\b') {
+            out += "\\b";
+        } else if (ch == '\f') {
+            out += "\\f";
+        } else if (ch == '\n') {
+            out += "\\n";
+        } else if (ch == '\r') {
+            out += "\\r";
+        } else if (ch == '\t') {
+            out += "\\t";
+        } else if (static_cast<uint8_t>(ch) <= 0x1f) {
+            char buf[8];
+            snprintf(buf, sizeof buf, "\\u%04x", ch);
+            out += buf;
+        } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x80
+                   && static_cast<uint8_t>(value[i+2]) == 0xa8) {
+            out += "\\u2028";
+            i += 2;
+        } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x80
+                   && static_cast<uint8_t>(value[i+2]) == 0xa9) {
+            out += "\\u2029";
+            i += 2;
+        } else {
+            out += ch;
+        }
+    }
+    out += '"';
+}
+
+static void dump(const Json::array &values, string &out) {
+    bool first = true;
+    out += "[";
+    for (const auto &value : values) {
+        if (!first)
+            out += ", ";
+        value.dump(out);
+        first = false;
+    }
+    out += "]";
+}
+
+static void dump(const Json::object &values, string &out) {
+    bool first = true;
+    out += "{";
+    for (const auto &kv : values) {
+        if (!first)
+            out += ", ";
+        dump(kv.first, out);
+        out += ": ";
+        kv.second.dump(out);
+        first = false;
+    }
+    out += "}";
+}
+
+void Json::dump(string &out) const {
+    m_ptr->dump(out);
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Value wrappers
+ */
+
+template <Json::Type tag, typename T>
+class Value : public JsonValue {
+protected:
+
+    // Constructors
+    explicit Value(const T &value) : m_value(value) {}
+    explicit Value(T &&value)      : m_value(move(value)) {}
+
+    // Get type tag
+    Json::Type type() const override {
+        return tag;
+    }
+
+    // Comparisons
+    bool equals(const JsonValue * other) const override {
+        return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
+    }
+    bool less(const JsonValue * other) const override {
+        return m_value < static_cast<const Value<tag, T> *>(other)->m_value;
+    }
+
+    const T m_value;
+    void dump(string &out) const override { json11::dump(m_value, out); }
+};
+
+class JsonDouble final : public Value<Json::NUMBER, double> {
+    double number_value() const override { return m_value; }
+    int int_value() const override { return static_cast<int>(m_value); }
+    bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
+    bool less(const JsonValue * other)   const override { return m_value <  other->number_value(); }
+public:
+    explicit JsonDouble(double value) : Value(value) {}
+};
+
+class JsonInt final : public Value<Json::NUMBER, int> {
+    double number_value() const override { return m_value; }
+    int int_value() const override { return m_value; }
+    bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
+    bool less(const JsonValue * other)   const override { return m_value <  other->number_value(); }
+public:
+    explicit JsonInt(int value) : Value(value) {}
+};
+
+class JsonBoolean final : public Value<Json::BOOL, bool> {
+    bool bool_value() const override { return m_value; }
+public:
+    explicit JsonBoolean(bool value) : Value(value) {}
+};
+
+class JsonString final : public Value<Json::STRING, string> {
+    const string &string_value() const override { return m_value; }
+public:
+    explicit JsonString(const string &value) : Value(value) {}
+    explicit JsonString(string &&value)      : Value(move(value)) {}
+};
+
+class JsonArray final : public Value<Json::ARRAY, Json::array> {
+    const Json::array &array_items() const override { return m_value; }
+    const Json & operator[](size_t i) const override;
+public:
+    explicit JsonArray(const Json::array &value) : Value(value) {}
+    explicit JsonArray(Json::array &&value)      : Value(move(value)) {}
+};
+
+class JsonObject final : public Value<Json::OBJECT, Json::object> {
+    const Json::object &object_items() const override { return m_value; }
+    const Json & operator[](const string &key) const override;
+public:
+    explicit JsonObject(const Json::object &value) : Value(value) {}
+    explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
+};
+
+class JsonNull final : public Value<Json::NUL, NullStruct> {
+public:
+    JsonNull() : Value({}) {}
+};
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Static globals - static-init-safe
+ */
+struct Statics {
+    const std::shared_ptr<JsonValue> null = make_shared<JsonNull>();
+    const std::shared_ptr<JsonValue> t = make_shared<JsonBoolean>(true);
+    const std::shared_ptr<JsonValue> f = make_shared<JsonBoolean>(false);
+    const string empty_string;
+    const vector<Json> empty_vector;
+    const map<string, Json> empty_map;
+    Statics() {}
+};
+
+static const Statics & statics() {
+    static const Statics s {};
+    return s;
+}
+
+static const Json & static_null() {
+    // This has to be separate, not in Statics, because Json() accesses statics().null.
+    static const Json json_null;
+    return json_null;
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Constructors
+ */
+
+Json::Json() noexcept                  : m_ptr(statics().null) {}
+Json::Json(std::nullptr_t) noexcept    : m_ptr(statics().null) {}
+Json::Json(double value)               : m_ptr(make_shared<JsonDouble>(value)) {}
+Json::Json(int value)                  : m_ptr(make_shared<JsonInt>(value)) {}
+Json::Json(bool value)                 : m_ptr(value ? statics().t : statics().f) {}
+Json::Json(const string &value)        : m_ptr(make_shared<JsonString>(value)) {}
+Json::Json(string &&value)             : m_ptr(make_shared<JsonString>(move(value))) {}
+Json::Json(const char * value)         : m_ptr(make_shared<JsonString>(value)) {}
+Json::Json(const Json::array &values)  : m_ptr(make_shared<JsonArray>(values)) {}
+Json::Json(Json::array &&values)       : m_ptr(make_shared<JsonArray>(move(values))) {}
+Json::Json(const Json::object &values) : m_ptr(make_shared<JsonObject>(values)) {}
+Json::Json(Json::object &&values)      : m_ptr(make_shared<JsonObject>(move(values))) {}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Accessors
+ */
+
+Json::Type Json::type()                           const { return m_ptr->type();         }
+double Json::number_value()                       const { return m_ptr->number_value(); }
+int    Json::int_value()                          const { return m_ptr->int_value();    }
+bool   Json::bool_value()                         const { return m_ptr->bool_value();   }
+const string & Json::string_value()               const { return m_ptr->string_value(); }
+const vector<Json> & Json::array_items()          const { return m_ptr->array_items();  }
+const map<string, Json> & Json::object_items()    const { return m_ptr->object_items(); }
+const Json & Json::operator[] (size_t i)          const { return (*m_ptr)[i];           }
+const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key];         }
+
+double                    JsonValue::number_value()              const { return 0; }
+int                       JsonValue::int_value()                 const { return 0; }
+bool                      JsonValue::bool_value()                const { return false; }
+const string &            JsonValue::string_value()              const { return statics().empty_string; }
+const vector<Json> &      JsonValue::array_items()               const { return statics().empty_vector; }
+const map<string, Json> & JsonValue::object_items()              const { return statics().empty_map; }
+const Json &              JsonValue::operator[] (size_t)         const { return static_null(); }
+const Json &              JsonValue::operator[] (const string &) const { return static_null(); }
+
+const Json & JsonObject::operator[] (const string &key) const {
+    auto iter = m_value.find(key);
+    return (iter == m_value.end()) ? static_null() : iter->second;
+}
+const Json & JsonArray::operator[] (size_t i) const {
+    if (i >= m_value.size()) return static_null();
+    else return m_value[i];
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Comparison
+ */
+
+bool Json::operator== (const Json &other) const {
+    if (m_ptr == other.m_ptr)
+        return true;
+    if (m_ptr->type() != other.m_ptr->type())
+        return false;
+
+    return m_ptr->equals(other.m_ptr.get());
+}
+
+bool Json::operator< (const Json &other) const {
+    if (m_ptr == other.m_ptr)
+        return false;
+    if (m_ptr->type() != other.m_ptr->type())
+        return m_ptr->type() < other.m_ptr->type();
+
+    return m_ptr->less(other.m_ptr.get());
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Parsing
+ */
+
+/* esc(c)
+ *
+ * Format char c suitable for printing in an error message.
+ */
+static inline string esc(char c) {
+    char buf[12];
+    if (static_cast<uint8_t>(c) >= 0x20 && static_cast<uint8_t>(c) <= 0x7f) {
+        snprintf(buf, sizeof buf, "'%c' (%d)", c, c);
+    } else {
+        snprintf(buf, sizeof buf, "(%d)", c);
+    }
+    return string(buf);
+}
+
+static inline bool in_range(long x, long lower, long upper) {
+    return (x >= lower && x <= upper);
+}
+
+namespace {
+/* JsonParser
+ *
+ * Object that tracks all state of an in-progress parse.
+ */
+struct JsonParser final {
+
+    /* State
+     */
+    const string &str;
+    size_t i;
+    string &err;
+    bool failed;
+    const JsonParse strategy;
+
+    /* fail(msg, err_ret = Json())
+     *
+     * Mark this parse as failed.
+     */
+    Json fail(string &&msg) {
+        return fail(move(msg), Json());
+    }
+
+    template <typename T>
+    T fail(string &&msg, const T err_ret) {
+        if (!failed)
+            err = std::move(msg);
+        failed = true;
+        return err_ret;
+    }
+
+    /* consume_whitespace()
+     *
+     * Advance until the current character is non-whitespace.
+     */
+    void consume_whitespace() {
+        while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t')
+            i++;
+    }
+
+    /* consume_comment()
+     *
+     * Advance comments (c-style inline and multiline).
+     */
+    bool consume_comment() {
+      bool comment_found = false;
+      if (str[i] == '/') {
+        i++;
+        if (i == str.size())
+          return fail("unexpected end of input after start of comment", false);
+        if (str[i] == '/') { // inline comment
+          i++;
+          // advance until next line, or end of input
+          while (i < str.size() && str[i] != '\n') {
+            i++;
+          }
+          comment_found = true;
+        }
+        else if (str[i] == '*') { // multiline comment
+          i++;
+          if (i > str.size()-2)
+            return fail("unexpected end of input inside multi-line comment", false);
+          // advance until closing tokens
+          while (!(str[i] == '*' && str[i+1] == '/')) {
+            i++;
+            if (i > str.size()-2)
+              return fail(
+                "unexpected end of input inside multi-line comment", false);
+          }
+          i += 2;
+          comment_found = true;
+        }
+        else
+          return fail("malformed comment", false);
+      }
+      return comment_found;
+    }
+
+    /* consume_garbage()
+     *
+     * Advance until the current character is non-whitespace and non-comment.
+     */
+    void consume_garbage() {
+      consume_whitespace();
+      if(strategy == JsonParse::COMMENTS) {
+        bool comment_found = false;
+        do {
+          comment_found = consume_comment();
+          if (failed) return;
+          consume_whitespace();
+        }
+        while(comment_found);
+      }
+    }
+
+    /* get_next_token()
+     *
+     * Return the next non-whitespace character. If the end of the input is reached,
+     * flag an error and return 0.
+     */
+    char get_next_token() {
+        consume_garbage();
+        if (failed) return static_cast<char>(0);
+        if (i == str.size())
+            return fail("unexpected end of input", static_cast<char>(0));
+
+        return str[i++];
+    }
+
+    /* encode_utf8(pt, out)
+     *
+     * Encode pt as UTF-8 and add it to out.
+     */
+    void encode_utf8(long pt, string & out) {
+        if (pt < 0)
+            return;
+
+        if (pt < 0x80) {
+            out += static_cast<char>(pt);
+        } else if (pt < 0x800) {
+            out += static_cast<char>((pt >> 6) | 0xC0);
+            out += static_cast<char>((pt & 0x3F) | 0x80);
+        } else if (pt < 0x10000) {
+            out += static_cast<char>((pt >> 12) | 0xE0);
+            out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
+            out += static_cast<char>((pt & 0x3F) | 0x80);
+        } else {
+            out += static_cast<char>((pt >> 18) | 0xF0);
+            out += static_cast<char>(((pt >> 12) & 0x3F) | 0x80);
+            out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
+            out += static_cast<char>((pt & 0x3F) | 0x80);
+        }
+    }
+
+    /* parse_string()
+     *
+     * Parse a string, starting at the current position.
+     */
+    string parse_string() {
+        string out;
+        long last_escaped_codepoint = -1;
+        while (true) {
+            if (i == str.size())
+                return fail("unexpected end of input in string", "");
+
+            char ch = str[i++];
+
+            if (ch == '"') {
+                encode_utf8(last_escaped_codepoint, out);
+                return out;
+            }
+
+            if (in_range(ch, 0, 0x1f))
+                return fail("unescaped " + esc(ch) + " in string", "");
+
+            // The usual case: non-escaped characters
+            if (ch != '\\') {
+                encode_utf8(last_escaped_codepoint, out);
+                last_escaped_codepoint = -1;
+                out += ch;
+                continue;
+            }
+
+            // Handle escapes
+            if (i == str.size())
+                return fail("unexpected end of input in string", "");
+
+            ch = str[i++];
+
+            if (ch == 'u') {
+                // Extract 4-byte escape sequence
+                string esc = str.substr(i, 4);
+                // Explicitly check length of the substring. The following loop
+                // relies on std::string returning the terminating NUL when
+                // accessing str[length]. Checking here reduces brittleness.
+                if (esc.length() < 4) {
+                    return fail("bad \\u escape: " + esc, "");
+                }
+                for (size_t j = 0; j < 4; j++) {
+                    if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F')
+                            && !in_range(esc[j], '0', '9'))
+                        return fail("bad \\u escape: " + esc, "");
+                }
+
+                long codepoint = strtol(esc.data(), nullptr, 16);
+
+                // JSON specifies that characters outside the BMP shall be encoded as a pair
+                // of 4-hex-digit \u escapes encoding their surrogate pair components. Check
+                // whether we're in the middle of such a beast: the previous codepoint was an
+                // escaped lead (high) surrogate, and this is a trail (low) surrogate.
+                if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF)
+                        && in_range(codepoint, 0xDC00, 0xDFFF)) {
+                    // Reassemble the two surrogate pairs into one astral-plane character, per
+                    // the UTF-16 algorithm.
+                    encode_utf8((((last_escaped_codepoint - 0xD800) << 10)
+                                 | (codepoint - 0xDC00)) + 0x10000, out);
+                    last_escaped_codepoint = -1;
+                } else {
+                    encode_utf8(last_escaped_codepoint, out);
+                    last_escaped_codepoint = codepoint;
+                }
+
+                i += 4;
+                continue;
+            }
+
+            encode_utf8(last_escaped_codepoint, out);
+            last_escaped_codepoint = -1;
+
+            if (ch == 'b') {
+                out += '\b';
+            } else if (ch == 'f') {
+                out += '\f';
+            } else if (ch == 'n') {
+                out += '\n';
+            } else if (ch == 'r') {
+                out += '\r';
+            } else if (ch == 't') {
+                out += '\t';
+            } else if (ch == '"' || ch == '\\' || ch == '/') {
+                out += ch;
+            } else {
+                return fail("invalid escape character " + esc(ch), "");
+            }
+        }
+    }
+
+    /* parse_number()
+     *
+     * Parse a double.
+     */
+    Json parse_number() {
+        size_t start_pos = i;
+
+        if (str[i] == '-')
+            i++;
+
+        // Integer part
+        if (str[i] == '0') {
+            i++;
+            if (in_range(str[i], '0', '9'))
+                return fail("leading 0s not permitted in numbers");
+        } else if (in_range(str[i], '1', '9')) {
+            i++;
+            while (in_range(str[i], '0', '9'))
+                i++;
+        } else {
+            return fail("invalid " + esc(str[i]) + " in number");
+        }
+
+        if (str[i] != '.' && str[i] != 'e' && str[i] != 'E'
+                && (i - start_pos) <= static_cast<size_t>(std::numeric_limits<int>::digits10)) {
+            return std::atoi(str.c_str() + start_pos);
+        }
+
+        // Decimal part
+        if (str[i] == '.') {
+            i++;
+            if (!in_range(str[i], '0', '9'))
+                return fail("at least one digit required in fractional part");
+
+            while (in_range(str[i], '0', '9'))
+                i++;
+        }
+
+        // Exponent part
+        if (str[i] == 'e' || str[i] == 'E') {
+            i++;
+
+            if (str[i] == '+' || str[i] == '-')
+                i++;
+
+            if (!in_range(str[i], '0', '9'))
+                return fail("at least one digit required in exponent");
+
+            while (in_range(str[i], '0', '9'))
+                i++;
+        }
+
+        return std::strtod(str.c_str() + start_pos, nullptr);
+    }
+
+    /* expect(str, res)
+     *
+     * Expect that 'str' starts at the character that was just read. If it does, advance
+     * the input and return res. If not, flag an error.
+     */
+    Json expect(const string &expected, Json res) {
+        assert(i != 0);
+        i--;
+        if (str.compare(i, expected.length(), expected) == 0) {
+            i += expected.length();
+            return res;
+        } else {
+            return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length()));
+        }
+    }
+
+    /* parse_json()
+     *
+     * Parse a JSON object.
+     */
+    Json parse_json(int depth) {
+        if (depth > max_depth) {
+            return fail("exceeded maximum nesting depth");
+        }
+
+        char ch = get_next_token();
+        if (failed)
+            return Json();
+
+        if (ch == '-' || (ch >= '0' && ch <= '9')) {
+            i--;
+            return parse_number();
+        }
+
+        if (ch == 't')
+            return expect("true", true);
+
+        if (ch == 'f')
+            return expect("false", false);
+
+        if (ch == 'n')
+            return expect("null", Json());
+
+        if (ch == '"')
+            return parse_string();
+
+        if (ch == '{') {
+            map<string, Json> data;
+            ch = get_next_token();
+            if (ch == '}')
+                return data;
+
+            while (1) {
+                if (ch != '"')
+                    return fail("expected '\"' in object, got " + esc(ch));
+
+                string key = parse_string();
+                if (failed)
+                    return Json();
+
+                ch = get_next_token();
+                if (ch != ':')
+                    return fail("expected ':' in object, got " + esc(ch));
+
+                data[std::move(key)] = parse_json(depth + 1);
+                if (failed)
+                    return Json();
+
+                ch = get_next_token();
+                if (ch == '}')
+                    break;
+                if (ch != ',')
+                    return fail("expected ',' in object, got " + esc(ch));
+
+                ch = get_next_token();
+            }
+            return data;
+        }
+
+        if (ch == '[') {
+            vector<Json> data;
+            ch = get_next_token();
+            if (ch == ']')
+                return data;
+
+            while (1) {
+                i--;
+                data.push_back(parse_json(depth + 1));
+                if (failed)
+                    return Json();
+
+                ch = get_next_token();
+                if (ch == ']')
+                    break;
+                if (ch != ',')
+                    return fail("expected ',' in list, got " + esc(ch));
+
+                ch = get_next_token();
+                (void)ch;
+            }
+            return data;
+        }
+
+        return fail("expected value, got " + esc(ch));
+    }
+};
+}//namespace {
+
+Json Json::parse(const string &in, string &err, JsonParse strategy) {
+    JsonParser parser { in, 0, err, false, strategy };
+    Json result = parser.parse_json(0);
+
+    // Check for any trailing garbage
+    parser.consume_garbage();
+    if (parser.failed)
+        return Json();
+    if (parser.i != in.size())
+        return parser.fail("unexpected trailing " + esc(in[parser.i]));
+
+    return result;
+}
+
+// Documented in json11.hpp
+vector<Json> Json::parse_multi(const string &in,
+                               std::string::size_type &parser_stop_pos,
+                               string &err,
+                               JsonParse strategy) {
+    JsonParser parser { in, 0, err, false, strategy };
+    parser_stop_pos = 0;
+    vector<Json> json_vec;
+    while (parser.i != in.size() && !parser.failed) {
+        json_vec.push_back(parser.parse_json(0));
+        if (parser.failed)
+            break;
+
+        // Check for another object
+        parser.consume_garbage();
+        if (parser.failed)
+            break;
+        parser_stop_pos = parser.i;
+    }
+    return json_vec;
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Shape-checking
+ */
+
+bool Json::has_shape(const shape & types, string & err) const {
+    if (!is_object()) {
+        err = "expected JSON object, got " + dump();
+        return false;
+    }
+
+    for (auto & item : types) {
+        if ((*this)[item.first].type() != item.second) {
+            err = "bad type for " + item.first + " in " + dump();
+            return false;
+        }
+    }
+
+    return true;
+}
+
+} // namespace json11
diff --git a/tools/mapjson/json11.h b/tools/mapjson/json11.h
new file mode 100644
index 000000000..c04c4362f
--- /dev/null
+++ b/tools/mapjson/json11.h
@@ -0,0 +1,230 @@
+/* json11
+ *
+ * json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
+ *
+ * The core object provided by the library is json11::Json. A Json object represents any JSON
+ * value: null, bool, number (int or double), string (std::string), array (std::vector), or
+ * object (std::map).
+ *
+ * Json objects act like values: they can be assigned, copied, moved, compared for equality or
+ * order, etc. There are also helper methods Json::dump, to serialize a Json to a string, and
+ * Json::parse (static) to parse a std::string as a Json object.
+ *
+ * Internally, the various types of Json object are represented by the JsonValue class
+ * hierarchy.
+ *
+ * A note on numbers - JSON specifies the syntax of number formatting but not its semantics,
+ * so some JSON implementations distinguish between integers and floating-point numbers, while
+ * some don't. In json11, we choose the latter. Because some JSON implementations (namely
+ * Javascript itself) treat all numbers as the same type, distinguishing the two leads
+ * to JSON that will be *silently* changed by a round-trip through those implementations.
+ * Dangerous! To avoid that risk, json11 stores all numbers as double internally, but also
+ * provides integer helpers.
+ *
+ * Fortunately, double-precision IEEE754 ('double') can precisely store any integer in the
+ * range +/-2^53, which includes every 'int' on most systems. (Timestamps often use int64
+ * or long long to avoid the Y2038K problem; a double storing microseconds since some epoch
+ * will be exact for +/- 275 years.)
+ */
+
+/* Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+#include <map>
+#include <memory>
+#include <initializer_list>
+
+#ifdef _MSC_VER
+    #if _MSC_VER <= 1800 // VS 2013
+        #ifndef noexcept
+            #define noexcept throw()
+        #endif
+
+        #ifndef snprintf
+            #define snprintf _snprintf_s
+        #endif
+    #endif
+#endif
+
+namespace json11 {
+
+enum JsonParse {
+    STANDARD, COMMENTS
+};
+
+class JsonValue;
+
+class Json final {
+public:
+    // Types
+    enum Type {
+        NUL, NUMBER, BOOL, STRING, ARRAY, OBJECT
+    };
+
+    // Array and object typedefs
+    typedef std::vector<Json> array;
+    typedef std::map<std::string, Json> object;
+
+    // Constructors for the various types of JSON value.
+    Json() noexcept;                // NUL
+    Json(std::nullptr_t) noexcept;  // NUL
+    Json(double value);             // NUMBER
+    Json(int value);                // NUMBER
+    Json(bool value);               // BOOL
+    Json(const std::string &value); // STRING
+    Json(std::string &&value);      // STRING
+    Json(const char * value);       // STRING
+    Json(const array &values);      // ARRAY
+    Json(array &&values);           // ARRAY
+    Json(const object &values);     // OBJECT
+    Json(object &&values);          // OBJECT
+
+    // Implicit constructor: anything with a to_json() function.
+    template <class T, class = decltype(&T::to_json)>
+    Json(const T & t) : Json(t.to_json()) {}
+
+    // Implicit constructor: map-like objects (std::map, std::unordered_map, etc)
+    template <class M, typename std::enable_if<
+        std::is_constructible<std::string, decltype(std::declval<M>().begin()->first)>::value
+        && std::is_constructible<Json, decltype(std::declval<M>().begin()->second)>::value,
+            int>::type = 0>
+    Json(const M & m) : Json(object(m.begin(), m.end())) {}
+
+    // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc)
+    template <class V, typename std::enable_if<
+        std::is_constructible<Json, decltype(*std::declval<V>().begin())>::value,
+            int>::type = 0>
+    Json(const V & v) : Json(array(v.begin(), v.end())) {}
+
+    // This prevents Json(some_pointer) from accidentally producing a bool. Use
+    // Json(bool(some_pointer)) if that behavior is desired.
+    Json(void *) = delete;
+
+    // Accessors
+    Type type() const;
+
+    bool is_null()   const { return type() == NUL; }
+    bool is_number() const { return type() == NUMBER; }
+    bool is_bool()   const { return type() == BOOL; }
+    bool is_string() const { return type() == STRING; }
+    bool is_array()  const { return type() == ARRAY; }
+    bool is_object() const { return type() == OBJECT; }
+
+    // Return the enclosed value if this is a number, 0 otherwise. Note that json11 does not
+    // distinguish between integer and non-integer numbers - number_value() and int_value()
+    // can both be applied to a NUMBER-typed object.
+    double number_value() const;
+    int int_value() const;
+
+    // Return the enclosed value if this is a boolean, false otherwise.
+    bool bool_value() const;
+    // Return the enclosed string if this is a string, "" otherwise.
+    const std::string &string_value() const;
+    // Return the enclosed std::vector if this is an array, or an empty vector otherwise.
+    const array &array_items() const;
+    // Return the enclosed std::map if this is an object, or an empty map otherwise.
+    const object &object_items() const;
+
+    // Return a reference to arr[i] if this is an array, Json() otherwise.
+    const Json & operator[](size_t i) const;
+    // Return a reference to obj[key] if this is an object, Json() otherwise.
+    const Json & operator[](const std::string &key) const;
+
+    // Serialize.
+    void dump(std::string &out) const;
+    std::string dump() const {
+        std::string out;
+        dump(out);
+        return out;
+    }
+
+    // Parse. If parse fails, return Json() and assign an error message to err.
+    static Json parse(const std::string & in,
+                      std::string & err,
+                      JsonParse strategy = JsonParse::STANDARD);
+    static Json parse(const char * in,
+                      std::string & err,
+                      JsonParse strategy = JsonParse::STANDARD) {
+        if (in) {
+            return parse(std::string(in), err, strategy);
+        } else {
+            err = "null input";
+            return nullptr;
+        }
+    }
+    // Parse multiple objects, concatenated or separated by whitespace
+    static std::vector<Json> parse_multi(
+        const std::string & in,
+        std::string::size_type & parser_stop_pos,
+        std::string & err,
+        JsonParse strategy = JsonParse::STANDARD);
+
+    static inline std::vector<Json> parse_multi(
+        const std::string & in,
+        std::string & err,
+        JsonParse strategy = JsonParse::STANDARD) {
+        std::string::size_type parser_stop_pos;
+        return parse_multi(in, parser_stop_pos, err, strategy);
+    }
+
+    bool operator== (const Json &rhs) const;
+    bool operator<  (const Json &rhs) const;
+    bool operator!= (const Json &rhs) const { return !(*this == rhs); }
+    bool operator<= (const Json &rhs) const { return !(rhs < *this); }
+    bool operator>  (const Json &rhs) const { return  (rhs < *this); }
+    bool operator>= (const Json &rhs) const { return !(*this < rhs); }
+
+    /* has_shape(types, err)
+     *
+     * Return true if this is a JSON object and, for each item in types, has a field of
+     * the given type. If not, return false and set err to a descriptive message.
+     */
+    typedef std::initializer_list<std::pair<std::string, Type>> shape;
+    bool has_shape(const shape & types, std::string & err) const;
+
+private:
+    std::shared_ptr<JsonValue> m_ptr;
+};
+
+// Internal class hierarchy - JsonValue objects are not exposed to users of this API.
+class JsonValue {
+protected:
+    friend class Json;
+    friend class JsonInt;
+    friend class JsonDouble;
+    virtual Json::Type type() const = 0;
+    virtual bool equals(const JsonValue * other) const = 0;
+    virtual bool less(const JsonValue * other) const = 0;
+    virtual void dump(std::string &out) const = 0;
+    virtual double number_value() const;
+    virtual int int_value() const;
+    virtual bool bool_value() const;
+    virtual const std::string &string_value() const;
+    virtual const Json::array &array_items() const;
+    virtual const Json &operator[](size_t i) const;
+    virtual const Json::object &object_items() const;
+    virtual const Json &operator[](const std::string &key) const;
+    virtual ~JsonValue() {}
+};
+
+} // namespace json11
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
new file mode 100644
index 000000000..2dd6e5b31
--- /dev/null
+++ b/tools/mapjson/mapjson.cpp
@@ -0,0 +1,538 @@
+// mapjson.cpp
+
+#include <iostream>
+using std::cout; using std::endl;
+
+#include <string>
+using std::string;
+
+#include <vector>
+using std::vector;
+
+#include <algorithm>
+using std::sort; using std::find;
+
+#include <map>
+using std::map;
+
+#include <fstream>
+using std::ofstream; using std::ifstream;
+
+#include <sstream>
+using std::ostringstream;
+
+#include <limits>
+using std::numeric_limits;
+
+#include "json11.h"
+using json11::Json;
+
+#include "mapjson.h"
+
+
+string read_text_file(string filepath) {
+    ifstream in_file(filepath);
+
+    if (!in_file.is_open())
+        FATAL_ERROR("Cannot open file %s for reading.\n", filepath.c_str());
+
+    string text;
+
+    in_file.seekg(0, std::ios::end);
+    text.resize(in_file.tellg());
+
+    in_file.seekg(0, std::ios::beg);
+    in_file.read(&text[0], text.size());
+
+    in_file.close();
+
+    return text;
+}
+
+void write_text_file(string filepath, string text) {
+    ofstream out_file(filepath, std::ofstream::binary);
+
+    if (!out_file.is_open())
+        FATAL_ERROR("Cannot open file %s for writing.\n", filepath.c_str());
+
+    out_file << text;
+
+    out_file.close();
+}
+
+string generate_map_header_text(Json map_data, Json layouts_data, string version) {
+    string map_layout_id = map_data["layout"].string_value();
+
+    vector<Json> matched;
+
+    for (auto &field : layouts_data["layouts"].array_items()) {
+        if (map_layout_id == field["id"].string_value())
+            matched.push_back(field);
+    }
+
+    if (matched.size() != 1)
+        FATAL_ERROR("Failed to find matching layout for %s.\n", map_layout_id.c_str());
+
+    Json layout = matched[0];
+
+    ostringstream text;
+
+    text << map_data["name"].string_value() << ":\n"
+         << "\t.4byte " << layout["name"].string_value() << "\n";
+
+    if (map_data.object_items().find("shared_events_map") != map_data.object_items().end())
+        text << "\t.4byte " << map_data["shared_events_map"].string_value() << "_MapEvents\n";
+    else
+        text << "\t.4byte " << map_data["name"].string_value() << "_MapEvents\n";
+
+    if (map_data.object_items().find("shared_scripts_map") != map_data.object_items().end())
+        text << "\t.4byte " << map_data["shared_scripts_map"].string_value() << "_MapScripts\n";
+    else
+        text << "\t.4byte " << map_data["name"].string_value() << "_MapScripts\n";
+
+    if (map_data.object_items().find("connections") != map_data.object_items().end()
+     && map_data["connections"].array_items().size() > 0)
+        text << "\t.4byte " << map_data["name"].string_value() << "_MapConnections\n";
+    else
+        text << "\t.4byte 0x0\n";
+
+    text << "\t.2byte " << map_data["music"].string_value() << "\n"
+         << "\t.2byte " << layout["id"].string_value() << "\n"
+         << "\t.byte "  << map_data["region_map_section"].string_value() << "\n"
+         << "\t.byte "  << map_data["requires_flash"].bool_value() << "\n"
+         << "\t.byte "  << map_data["weather"].string_value() << "\n"
+         << "\t.byte "  << map_data["map_type"].string_value() << "\n"
+         << "\t.2byte 0\n";
+
+    if (version == "ruby")
+        text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n";
+    else if (version == "emerald")
+        text << "\tmap_header_flags "
+             << "allow_bike=" << map_data["allow_bike"].bool_value() << ", "
+             << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", "
+             << "allow_run=" << map_data["allow_running"].bool_value() << ", "
+             << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n";
+
+     text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n";
+
+    return text.str();
+}
+
+string generate_map_connections_text(Json map_data) {
+    if (map_data["connections"] == Json())
+        return string("\n");
+
+    ostringstream text;
+
+    text << map_data["name"].string_value() << "_MapConnectionsList:\n";
+
+    for (auto &connection : map_data["connections"].array_items()) {
+        text << "\tconnection "
+             << connection["direction"].string_value() << ", "
+             << connection["offset"].int_value() << ", "
+             << connection["map"].string_value() << "\n";
+    }
+
+    text << "\n" << map_data["name"].string_value() << "_MapConnections:\n"
+         << "\t.4byte " << map_data["connections"].array_items().size() << "\n"
+         << "\t.4byte " << map_data["name"].string_value() << "_MapConnectionsList\n\n";
+
+    return text.str();
+}
+
+string generate_map_events_text(Json map_data) {
+    if (map_data.object_items().find("shared_events_map") != map_data.object_items().end())
+        return string("\n");
+
+    ostringstream text;
+
+    string objects_label, warps_label, coords_label, bgs_label;
+
+    if (map_data["object_events"].array_items().size() > 0) {
+        objects_label = map_data["name"].string_value() + "_EventObjects";
+        text << objects_label << ":\n";
+        for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
+            auto obj_event = map_data["object_events"].array_items()[i];
+            text << "\tobject_event " << i + 1 << ", "
+                 << obj_event["graphics_id"].string_value() << ", 0, "
+                 << obj_event["x"].int_value() << ", "
+                 << obj_event["y"].int_value() << ", "
+                 << obj_event["elevation"].int_value() << ", "
+                 << obj_event["movement_type"].string_value() << ", "
+                 << obj_event["movement_range_x"].int_value() << ", "
+                 << obj_event["movement_range_y"].int_value() << ", "
+                 << obj_event["trainer_type"].int_value() << ", "
+                 << obj_event["trainer_sight_or_berry_tree_id"].int_value() << ", "
+                 << obj_event["script"].string_value() << ", "
+                 << obj_event["flag"].string_value() << "\n";
+        }
+        text << "\n";
+    } else {
+        objects_label = "0x0";
+    }
+
+    if (map_data["warp_events"].array_items().size() > 0) {
+        warps_label = map_data["name"].string_value() + "_MapWarps";
+        text << warps_label << ":\n";
+        for (auto &warp_event : map_data["warp_events"].array_items()) {
+            text << "\twarp_def "
+                 << warp_event["x"].int_value() << ", "
+                 << warp_event["y"].int_value() << ", "
+                 << warp_event["elevation"].int_value() << ", "
+                 << warp_event["dest_warp_id"].int_value() << ", "
+                 << warp_event["dest_map"].string_value() << "\n";
+        }
+        text << "\n";
+    } else {
+        warps_label = "0x0";
+    }
+
+    if (map_data["coord_events"].array_items().size() > 0) {
+        coords_label = map_data["name"].string_value() + "_MapCoordEvents";
+        text << coords_label << ":\n";
+        for (auto &coord_event : map_data["coord_events"].array_items()) {
+            if (coord_event["type"].string_value() == "trigger") {
+                text << "\tcoord_event "
+                     << coord_event["x"].int_value() << ", "
+                     << coord_event["y"].int_value() << ", "
+                     << coord_event["elevation"].int_value() << ", "
+                     << coord_event["var"].string_value() << ", "
+                     << coord_event["var_value"].int_value() << ", "
+                     << coord_event["script"].string_value() << "\n";
+            }
+            else if (coord_event["type"] == "weather") {
+                text << "\tcoord_weather_event "
+                     << coord_event["x"].int_value() << ", "
+                     << coord_event["y"].int_value() << ", "
+                     << coord_event["elevation"].int_value() << ", "
+                     << coord_event["weather"].string_value() << "\n";
+            }
+        }
+        text << "\n";
+    } else {
+        coords_label = "0x0";
+    }
+
+    if (map_data["bg_events"].array_items().size() > 0) {
+        bgs_label = map_data["name"].string_value() + "_MapBGEvents";
+        text << bgs_label << ":\n";
+        for (auto &bg_event : map_data["bg_events"].array_items()) {
+            if (bg_event["type"] == "sign") {
+                text << "\tbg_event "
+                     << bg_event["x"].int_value() << ", "
+                     << bg_event["y"].int_value() << ", "
+                     << bg_event["elevation"].int_value() << ", "
+                     << bg_event["player_facing_dir"].string_value() << ", "
+                     << bg_event["script"].string_value() << "\n";
+            }
+            else if (bg_event["type"] == "hidden_item") {
+                text << "\tbg_hidden_item_event "
+                     << bg_event["x"].int_value() << ", "
+                     << bg_event["y"].int_value() << ", "
+                     << bg_event["elevation"].int_value() << ", "
+                     << bg_event["item"].string_value() << ", "
+                     << bg_event["flag"].string_value() << "\n";
+            }
+            else if (bg_event["type"] == "secret_base") {
+                text << "\tbg_secret_base_event "
+                     << bg_event["x"].int_value() << ", "
+                     << bg_event["y"].int_value() << ", "
+                     << bg_event["elevation"].int_value() << ", "
+                     << bg_event["secret_base_id"].string_value() << "\n";
+            }
+        }
+        text << "\n";
+    } else {
+        bgs_label = "0x0";
+    }
+
+    text << map_data["name"].string_value() << "_MapEvents::\n"
+         << "\tmap_events " << objects_label << ", " << warps_label << ", "
+         << coords_label << ", " << bgs_label << "\n\n";
+
+    return text.str();
+}
+
+string get_directory_name(string filename) {
+    size_t dir_pos = filename.find_last_of("/\\");
+
+    return filename.substr(0, dir_pos + 1);
+}
+
+void process_map(string map_filepath, string layouts_filepath, string version) {
+    string mapdata_err, layouts_err;
+
+    string mapdata_json_text = read_text_file(map_filepath);
+    string layouts_json_text = read_text_file(layouts_filepath);
+
+    Json map_data = Json::parse(mapdata_json_text, mapdata_err);
+    if (map_data == Json())
+        FATAL_ERROR("%s\n", mapdata_err.c_str());
+
+    Json layouts_data = Json::parse(layouts_json_text, layouts_err);
+    if (layouts_data == Json())
+        FATAL_ERROR("%s\n", layouts_err.c_str());
+
+    string header_text = generate_map_header_text(map_data, layouts_data, version);
+    string events_text = generate_map_events_text(map_data);
+    string connections_text = generate_map_connections_text(map_data);
+
+    string files_dir = get_directory_name(map_filepath);
+    write_text_file(files_dir + "header.inc", header_text);
+    write_text_file(files_dir + "events.inc", events_text);
+    write_text_file(files_dir + "connections.inc", connections_text);
+}
+
+string generate_groups_text(Json groups_data) {
+    ostringstream text;
+
+    for (auto &key : groups_data["group_order"].array_items()) {
+        string group = key.string_value();
+        text << group << "::\n";
+        auto maps = groups_data[group].array_items();
+        for (Json &map_name : maps)
+            text << "\t.4byte " << map_name.string_value() << "\n";
+        text << "\n";
+    }
+
+    text << "\t.align 2\n" << "gMapGroups::\n";
+    for (auto &group : groups_data["group_order"].array_items())
+        text << "\t.4byte " << group.string_value() << "\n";
+    text << "\n";
+
+    return text.str();
+}
+
+string generate_connections_text(Json groups_data) {
+    vector<Json> map_names;
+
+    for (auto &group : groups_data["group_order"].array_items())
+    for (auto map_name : groups_data[group.string_value()].array_items())
+        map_names.push_back(map_name);
+
+    vector<Json> connections_include_order = groups_data["connections_include_order"].array_items();
+
+    if (connections_include_order.size() > 0)
+        sort(map_names.begin(), map_names.end(), [connections_include_order](const Json &a, const Json &b) {
+            auto iter_a = find(connections_include_order.begin(), connections_include_order.end(), a);
+            if (iter_a == connections_include_order.end())
+                iter_a = connections_include_order.begin() + numeric_limits<int>::max();
+            auto iter_b = find(connections_include_order.begin(), connections_include_order.end(), b);
+            if (iter_b == connections_include_order.end())
+                iter_b = connections_include_order.begin() + numeric_limits<int>::max();
+            return iter_a < iter_b;
+        });
+
+    ostringstream text;
+
+    for (Json map_name : map_names)
+        text << "\t.include \"data/maps/" << map_name.string_value() << "/connections.inc\"\n";
+
+    return text.str();
+}
+
+string generate_headers_text(Json groups_data) {
+    vector<string> map_names;
+
+    for (auto &group : groups_data["group_order"].array_items())
+    for (auto map_name : groups_data[group.string_value()].array_items())
+        map_names.push_back(map_name.string_value());
+
+    ostringstream text;
+
+    for (string map_name : map_names)
+        text << "\t.include \"data/maps/" << map_name << "/header.inc\"\n";
+
+    return text.str();
+}
+
+string generate_events_text(Json groups_data) {
+    vector<string> map_names;
+
+    for (auto &group : groups_data["group_order"].array_items())
+    for (auto map_name : groups_data[group.string_value()].array_items())
+        map_names.push_back(map_name.string_value());
+
+    ostringstream text;
+
+    for (string map_name : map_names)
+        text << "\t.include \"data/maps/" << map_name << "/events.inc\"\n";
+
+    return text.str();
+}
+
+string generate_map_constants_text(string groups_filepath, Json groups_data) {
+    string file_dir = get_directory_name(groups_filepath);
+    char dir_separator = file_dir.back();
+
+    ostringstream text;
+
+    text << "#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n"
+         << "#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n";
+
+    int group_num = 0;
+
+    for (auto &group : groups_data["group_order"].array_items()) {
+        text << "// Map Group " << group_num << "\n";
+        vector<Json> map_ids;
+        size_t max_length = 0;
+
+        for (auto &map_name : groups_data[group.string_value()].array_items()) {
+            string header_filepath = file_dir + map_name.string_value() + dir_separator + "map.json";
+            string err_str;
+            Json map_data = Json::parse(read_text_file(header_filepath), err_str);
+            map_ids.push_back(map_data["id"]);
+            if (map_data["id"].string_value().length() > max_length)
+                max_length = map_data["id"].string_value().length();
+        }
+
+        int map_id_num = 0;
+        for (Json map_id : map_ids) {
+            text << "#define " << map_id.string_value() << string((max_length - map_id.string_value().length() + 1), ' ')
+                 << "(" << map_id_num++ << " | (" << group_num << " << 8))\n";
+        }
+        text << "\n";
+
+        group_num++;
+    }
+
+    text << "#define MAP_GROUPS_COUNT " << group_num << "\n\n";
+    text << "#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n";
+
+    return text.str();
+}
+
+void process_groups(string groups_filepath) {
+    string err;
+    Json groups_data = Json::parse(read_text_file(groups_filepath), err);
+
+    if (groups_data == Json())
+        FATAL_ERROR("%s\n", err.c_str());
+
+    string groups_text = generate_groups_text(groups_data);
+    string connections_text = generate_connections_text(groups_data);
+    string headers_text = generate_headers_text(groups_data);
+    string events_text = generate_events_text(groups_data);
+    string map_header_text = generate_map_constants_text(groups_filepath, groups_data);
+
+    string file_dir = get_directory_name(groups_filepath);
+    char s = file_dir.back();
+
+    write_text_file(file_dir + "groups.inc", groups_text);
+    write_text_file(file_dir + "connections.inc", connections_text);
+    write_text_file(file_dir + "headers.inc", headers_text);
+    write_text_file(file_dir + "events.inc", events_text);
+    write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "map_groups.h", map_header_text);
+}
+
+string generate_layout_headers_text(Json layouts_data) {
+    ostringstream text;
+
+    for (auto &layout : layouts_data["layouts"].array_items()) {
+        string border_label = layout["name"].string_value() + "_Border";
+        string blockdata_label = layout["name"].string_value() + "_Blockdata";
+        text << border_label << "::\n"
+             << "\t.incbin \"" << layout["border_filepath"].string_value() << "\"\n\n"
+             << blockdata_label << "::\n"
+             << "\t.incbin \"" << layout["blockdata_filepath"].string_value() << "\"\n\n"
+             << "\t.align 2\n"
+             << layout["name"].string_value() << "::\n"
+             << "\t.4byte " << layout["width"].int_value() << "\n"
+             << "\t.4byte " << layout["height"].int_value() << "\n"
+             << "\t.4byte " << border_label << "\n"
+             << "\t.4byte " << blockdata_label << "\n"
+             << "\t.4byte " << layout["primary_tileset"].string_value() << "\n"
+             << "\t.4byte " << layout["secondary_tileset"].string_value() << "\n\n";
+    }
+
+    return text.str();
+}
+
+string generate_layouts_table_text(Json layouts_data) {
+    ostringstream text;
+
+    text << "\t.align 2\n"
+         << layouts_data["layouts_table_label"].string_value() << "::\n";
+
+    for (auto &layout : layouts_data["layouts"].array_items())
+        text << "\t.4byte " << layout["name"].string_value() << "\n";
+
+    return text.str();
+}
+
+string generate_layouts_constants_text(Json layouts_data) {
+    ostringstream text;
+
+    text << "#ifndef GUARD_CONSTANTS_LAYOUTS_H\n"
+         << "#define GUARD_CONSTANTS_LAYOUTS_H\n\n";
+
+    int i = 0;
+    for (auto &layout : layouts_data["layouts"].array_items())
+        text << "#define " << layout["id"].string_value() << " " << ++i << "\n";
+
+    text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n";
+
+    return text.str();
+}
+
+void process_layouts(string layouts_filepath) {
+    string err;
+    Json layouts_data = Json::parse(read_text_file(layouts_filepath), err);
+
+    if (layouts_data == Json())
+        FATAL_ERROR("%s\n", err.c_str());
+
+    string layout_headers_text = generate_layout_headers_text(layouts_data);
+    string layouts_table_text = generate_layouts_table_text(layouts_data);
+    string layouts_constants_text = generate_layouts_constants_text(layouts_data);
+
+    string file_dir = get_directory_name(layouts_filepath);
+    char s = file_dir.back();
+
+    write_text_file(file_dir + "layouts.inc", layout_headers_text);
+    write_text_file(file_dir + "layouts_table.inc", layouts_table_text);
+    write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "layouts.h", layouts_constants_text);
+}
+
+int main(int argc, char *argv[]) {
+    if (argc < 3)
+        FATAL_ERROR("USAGE: mapjson <mode> <game-version> [options]\n");
+
+    char *version_arg = argv[2];
+    string version(version_arg);
+    if (version != "emerald" && version != "ruby")
+        FATAL_ERROR("ERROR: <game-version> must be 'emerald' or 'ruby'.\n");
+
+    char *mode_arg = argv[1];
+    string mode(mode_arg);
+    if (mode != "layouts" && mode != "map" && mode != "groups")
+        FATAL_ERROR("ERROR: <mode> must be 'layouts', 'map', or 'groups'.\n");
+
+    if (mode == "map") {
+        if (argc != 5)
+            FATAL_ERROR("USAGE: mapjson map <game-version> <map_file> <layouts_file>\n");
+
+        string filepath(argv[3]);
+        string layouts_filepath(argv[4]);
+
+        process_map(filepath, layouts_filepath, version);
+    }
+    else if (mode == "groups") {
+        if (argc != 4)
+            FATAL_ERROR("USAGE: mapjson groups <game-version> <groups_file>\n");
+
+        string filepath(argv[3]);
+
+        process_groups(filepath);
+    }
+    else if (mode == "layouts") {
+        if (argc != 4)
+            FATAL_ERROR("USAGE: mapjson layouts <game-version> <layouts_file>\n");
+
+        string filepath(argv[3]);
+
+        process_layouts(filepath);
+    }
+
+    return 0;
+}
diff --git a/tools/mapjson/mapjson.h b/tools/mapjson/mapjson.h
new file mode 100644
index 000000000..6e961a28e
--- /dev/null
+++ b/tools/mapjson/mapjson.h
@@ -0,0 +1,31 @@
+// mapjson.h
+
+#ifndef MAPJSON_H
+#define MAPJSON_H
+
+#include <cstdio>
+using std::fprintf; using std::exit;
+
+#include <cstdlib>
+
+#ifdef _MSC_VER
+
+#define FATAL_ERROR(format, ...)          \
+do                                        \
+{                                         \
+    fprintf(stderr, format, __VA_ARGS__); \
+    exit(1);                              \
+} while (0)
+
+#else
+
+#define FATAL_ERROR(format, ...)            \
+do                                          \
+{                                           \
+    fprintf(stderr, format, ##__VA_ARGS__); \
+    exit(1);                                \
+} while (0)
+
+#endif // _MSC_VER
+
+#endif // MAPJSON_H