Merge branch 'master' into decomp_battle2

author: DizzyEggg <jajkodizzy@wp.pl> 2017-10-01 18:55:21 +0200
committer: DizzyEggg <jajkodizzy@wp.pl> 2017-10-01 18:55:21 +0200
commit: d4e1c417d37b097bd8e7539e87a75f7026d4dc9a (patch)
tree: dc44f9b404cd3005d74f254207e5913de03b0ce5
parent: 1fcafaf35aaf92251e7802e1e3ea36e8d5a6067b (diff)
parent: d9603769f31000bb13ec6c9bd1bd42942651d111 (diff)
81 files changed, 2439 insertions, 174 deletions
diff --git a/asm/intro.s b/asm/intro.s
index 01ac2204b..cd8f7c2d8 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -376,11 +376,11 @@ task_intro_1: @ 816CF18
 	movs r0, 0x12
 	movs r1, 0x28
 	bl SetGpuReg
-	ldr r0, =gIntroLeavesBgGfx
+	ldr r0, =gIntro1BGLeavesGfx
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, =gIntroLeavesForegroundTilemap
+	ldr r0, =gIntro1BG0_Tilemap
 	ldr r1, =0x06008000
 	bl LZ77UnCompVram
 	ldr r1, =0x06008800
@@ -393,7 +393,7 @@ task_intro_1: @ 816CF18
 	ldr r5, =0x81000400
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gIntroLeavesMidgroundTilemap
+	ldr r0, =gIntro1BG1_Tilemap
 	ldr r1, =0x06009000
 	bl LZ77UnCompVram
 	ldr r1, =0x06009800
@@ -403,7 +403,7 @@ task_intro_1: @ 816CF18
 	str r1, [r4, 0x4]
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gIntroLeavesBgLeavesTilemap
+	ldr r0, =gIntro1BG2_Tilemap
 	ldr r1, =0x0600a000
 	bl LZ77UnCompVram
 	ldr r1, =0x0600a800
@@ -413,7 +413,7 @@ task_intro_1: @ 816CF18
 	str r1, [r4, 0x4]
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gIntroLeavesBgMountainsTilemap
+	ldr r0, =gIntro1BG3_Tilemap
 	ldr r1, =0x0600b000
 	bl LZ77UnCompVram
 	ldr r1, =0x0600b800
@@ -423,7 +423,7 @@ task_intro_1: @ 816CF18
 	str r1, [r4, 0x4]
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gIntroLeavesPal
+	ldr r0, =gIntro1BGPals
 	movs r5, 0x80
 	lsls r5, 2
 	movs r1, 0
@@ -1779,14 +1779,14 @@ task_intro_10: @ 816DBAC
 	lsls r5, 24
 	lsrs r5, 24
 	bl intro_reset_and_hide_bgs
-	ldr r0, =gIntroBattlePokeBallGfx
+	ldr r0, =gIntro3Pokeball_Gfx
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, =gIntroBattlePokeBallTilemap
+	ldr r0, =gIntro3Pokeball_Tilemap
 	ldr r1, =0x06004000
 	bl LZ77UnCompVram
-	ldr r0, =gIntroBattlePokeBallPal
+	ldr r0, =gIntro3PokeballPal
 	movs r2, 0x80
 	lsls r2, 2
 	movs r1, 0
diff --git a/data/battle_7.s b/data/battle_7.s
index 4b0eea65a..ffd2e8daa 100644
--- a/data/battle_7.s
+++ b/data/battle_7.s
@@ -40,7 +40,5 @@ gUnknown_0832C108:: @ 832C108
 
     .align 2
 gUnknown_0832C128:: @ 832C128
-	obj_pal gUnknown_08C11B9C, 0xd6ff
-	obj_pal gUnknown_08C11BBC, 0xd704
-
-	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
+	obj_pal gBattleInterface_BallStatusBarPal, 0xd6ff
+	obj_pal gBattleInterface_BallDisplayPal, 0xd704
diff --git a/data/battle_interface.s b/data/battle_interface.s
index 3fd9060fd..766f34752 100644
--- a/data/battle_interface.s
+++ b/data/battle_interface.s
@@ -4,53 +4,177 @@
 	.section .rodata
 	.align 2, 0
 
+gUnknown_0832C138:: @ 832C138
+	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
+
+	.align 2
 gUnknown_0832C140:: @ 832C140
-	.incbin "baserom.gba", 0x32c140, 0x30
+	spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+	.align 2
+gUnknown_0832C158:: @ 832C158
+	spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_0832C170:: @ 832C170
-	.incbin "baserom.gba", 0x32c170, 0x30
+	spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
+gUnknown_0832C188:: @ 832C188
+	spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+	.align 2
 gUnknown_0832C1A0:: @ 832C1A0
-	.incbin "baserom.gba", 0x32c1a0, 0x20
+	spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
-gUnknown_0832C1C0:: @ 832C1C0
-	.incbin "baserom.gba", 0x32c1c0, 0xcc
+	.align 2
+gUnknown_0832C1B8:: @ 832C1B8
+	.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
 
+	.align 2
+gUnknown_0832C1C0:: @ 832C1C0
+	spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C1D8:: @ 832C1D8
+	spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C1F0:: @ 832C1F0
+	spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C208:: @ 832C208
+	spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C220:: @ 832C220
+	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
+	.byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
+	.byte 0x30, 0x20, 0x85, 0x43
+
+	.align 2
+gUnknown_0832C234:: @ 832C234
+	.byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
+	.byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
+	.byte 0x30, 0x20, 0x85, 0x47
+
+	.align 2
+gUnknown_0832C248:: @ 832C248
+	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
+
+	.align 2
+gUnknown_0832C250:: @ 832C250
+	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
+
+	.align 2
+gUnknown_0832C258:: @ 832C258
+	.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
+
+	.align 2
+gUnknown_0832C260:: @ 832C260
+	.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
+	.byte 0xe0, 0x00, 0x80, 0x40
+
+	.align 2
+gUnknown_0832C26C:: @ 832C26C
+	.4byte 0x00000005, gUnknown_0832C220
+	.4byte 0x00000002, gUnknown_0832C248
+	.4byte 0x00000005, gUnknown_0832C234
+	.4byte 0x00000002, gUnknown_0832C250
+
+	.align 2
 gUnknown_0832C28C:: @ 832C28C
-	.incbin "baserom.gba", 0x32c28c, 0x38
+	.4byte 0x00000002, gUnknown_0832C258
+	.4byte 0x00000003, gUnknown_0832C260
+
+	.align 2
+gUnknown_0832C29C:: @ 832C29C
+	.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
+	.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
+
+	.align 2
+gUnknown_0832C2AC:: @ 832C2AC
+	.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
+	.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
+	.byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
 
+	.align 2
 gUnknown_0832C2C4:: @ 832C2C4
-	.incbin "baserom.gba", 0x32c2c4, 0x8
+	.4byte 0x00000004, gUnknown_0832C29C
 
+	.align 2
 gUnknown_0832C2CC:: @ 832C2CC
-	.incbin "baserom.gba", 0x32c2cc, 0x68
+	.4byte 0x00000006, gUnknown_0832C2AC
 
+	.align 2
+gUnknown_0832C2D4:: @ 832C2D4
+	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
+	.2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
+
+	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
+	.2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
+
+	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
+	.2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
+
+	.align 2
 gUnknown_0832C334:: @ 832C334
-	.incbin "baserom.gba", 0x32c334, 0x8
+	obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
 
+	.align 2
 gUnknown_0832C33C:: @ 832C33C
-	.incbin "baserom.gba", 0x32c33c, 0x8
+	obj_pal gBattleInterface_BallStatusBarPal, 0xd710
 
+	.align 2
 gUnknown_0832C344:: @ 832C344
-	.incbin "baserom.gba", 0x32c344, 0x8
+	obj_pal gBattleInterface_BallDisplayPal, 0xd712
 
+	.align 2
 gUnknown_0832C34C:: @ 832C34C
-	.incbin "baserom.gba", 0x32c34c, 0x18
+	obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
+
+	.align 2
+gUnknown_0832C354:: @ 832C354
+	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
 
+	.align 2
+gUnknown_0832C35C:: @ 832C35C
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
+
+	.align 2
 gUnknown_0832C364:: @ 832C364
-	.incbin "baserom.gba", 0x32c364, 0x30
+	spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
+
+	.align 2
+gUnknown_0832C37C:: @ 832C37C
+	spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
 
+	.align 2
 gUnknown_0832C394:: @ 832C394
-	.incbin "baserom.gba", 0x32c394, 0x30
+	spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
+
+	.align 2
+gUnknown_0832C3AC:: @ 832C3AC
+	spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
 
+	.align 2
 gUnknown_0832C3C4:: @ 832C3C4
-	.incbin "baserom.gba", 0x32c3c4, 0x14
+	.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00
 
+	.align 2
 gUnknown_0832C3D8:: @ 832C3D8
-	.incbin "baserom.gba", 0x32c3d8, 0x14
+	.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00
 
+	.align 2
 gUnknown_0832C3EC:: @ 832C3EC
-	.incbin "baserom.gba", 0x32c3ec, 0xc
+	.byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
+	.byte 0xdc, 0x29, 0x00, 0x00
 
+	.align 2
 gUnknown_0832C3F8:: @ 832C3F8
-	.incbin "baserom.gba", 0x32c3f8, 0x8
+	.byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00
diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s
index c357efb12..d6ad2e578 100644
--- a/data/evolution_graphics.s
+++ b/data/evolution_graphics.s
@@ -3,7 +3,7 @@
 
 	.section .rodata
 
-	.incbin "baserom.gba", 0x5f53c4, 0x48
+	.incbin "baserom.gba", 0x5f53cc, 0x40
 
 gUnknown_085F540C:: @ 85F540C
 	.incbin "baserom.gba", 0x5f540c, 0x10
diff --git a/data/graphics.s b/data/graphics.s
index 0fa256449..e5c8ad49f 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -30,14 +30,25 @@ gUnknown_08C0237C:: @ 8C0237C
 gUnknown_08C093F0:: @ 8C093F0
 	.incbin "baserom.gba", 0xc093f0, 0x87ac
 
-gUnknown_08C11B9C:: @ 8C11B9C
-	.incbin "baserom.gba", 0xc11b9c, 0x20
+    .align 2
+gBattleInterface_BallStatusBarPal:: @ 8C11B9C
+	.incbin "graphics/battle_interface/ball_status_bar.gbapal"
 
-gUnknown_08C11BBC:: @ 8C11BBC
-	.incbin "baserom.gba", 0xc11bbc, 0x20
+    .align 2
+gBattleInterface_BallDisplayPal:: @ 8C11BBC
+	.incbin "graphics/battle_interface/ball_display.gbapal"
 
+    .align 2
 gUnknown_08C11BDC:: @ 8C11BDC
-	.incbin "baserom.gba", 0xc11bdc, 0x52b4
+	.incbin "baserom.gba", 0xc11bdc, 0x840
+
+    .align 2
+gBattleInterface_BallDisplayGfx:: @ 8C1241C
+	.incbin "graphics/battle_interface/ball_display.4bpp"
+
+    .align 2
+gUnknown_08C1249C:: @ 8C1249C
+	.incbin "baserom.gba", 0xc1249c, 0x49f4
 
 gUnknown_08C16E90:: @ 8C16E90
 	.incbin "baserom.gba", 0xc16e90, 0x118
@@ -366,8 +377,13 @@ gUnknown_08D85A1C:: @ 8D85A1C
 	.incbin "baserom.gba", 0xd85a1c, 0x234
 
 gUnknown_08D85C50:: @ 8D85C50
-	.incbin "baserom.gba", 0xd85c50, 0x80
+	.incbin "baserom.gba", 0xd85c50, 0x60
+
+	.align 2
+gIntro2BrendanNoTurnPal:: @ 8D85CB0
+	.incbin "graphics/intro/intro2_brendan_noturn.gbapal"
 
+	.align 2
 gUnknown_08D85CD0:: @ 8D85CD0
 	.incbin "baserom.gba", 0xd85cd0, 0x182
 
@@ -381,36 +397,46 @@ gUnknown_08D85E7C:: @ 8D85E7C
 	.incbin "baserom.gba", 0xd85e7c, 0x54
 
 	.align 2
-gIntroVolbeatPal:: @ 8D85ED0
-	.incbin "graphics/intro/volbeat.gbapal"
+gIntro2VolbeatPal:: @ 8D85ED0
+	.incbin "graphics/intro/intro2_volbeat.gbapal"
+
+	.align 2
+gIntro2TorchicPal:: @ 8D85EF0
+	.incbin "graphics/intro/intro2_torchic.gbapal"
+
+	.align 2
+gIntro2ManectricPal:: @ 8D85ED0
+	.incbin "graphics/intro/intro2_manectric.gbapal"
 
 	.align 2
-gIntroTorchicPal:: @ 8D85EF0
-	.incbin "graphics/intro/torchic.gbapal"
+gIntro2FlygonPal:: @ 8D85F30
+	.incbin "graphics/intro/intro2_flygon.gbapal"
 
 	.align 2
-gIntroManectricPal:: @ 8D85ED0
-	.incbin "graphics/intro/manectric.gbapal"
+gIntro2VolbeatGfx:: @ 8D85F50
+	.incbin "graphics/intro/intro2_volbeat.4bpp.lz"
 
 	.align 2
-gUnknown_08D85F30:: @ 8D85ED0
-	.incbin "baserom.gba", 0xd85f30, 0x20
+gIntro2TorchicGfx:: @ 8D86130
+	.incbin "graphics/intro/intro2_torchic.4bpp.lz"
 
 	.align 2
-gIntroVolbeatGfx:: @ 8D85F50
-	.incbin "graphics/intro/volbeat.4bpp.lz"
+gIntro2ManectricGfx:: @ 8D86550
+	.incbin "graphics/intro/intro2_manectric.4bpp.lz"
 
 	.align 2
-gIntroTorchicGfx:: @ 8D86130
-	.incbin "graphics/intro/torchic.4bpp.lz"
+gIntro2FlygonGfx:: @ 8D8702C
+	.incbin "graphics/intro/intro2_flygon.4bpp.lz"
 
 	.align 2
-gIntroManectricGfx:: @ 8D86550
-	.incbin "graphics/intro/manectric.4bpp.lz"
+gIntro2BrendanNoTurnGfx:: @ 8D87568
+	.incbin "graphics/intro/intro2_brendan_noturn.4bpp.lz"
 
 	.align 2
-	.incbin "baserom.gba", 0xd8702c, 0x1468
+gIntro2MayNoTurnGfx:: @ 8D87CA4
+	.incbin "graphics/intro/intro2_may_noturn.4bpp.lz"
 
+	.align 2
 gUnknown_08D88494:: @ 8D88494
 	.incbin "baserom.gba", 0xd88494, 0x8ac
 
@@ -445,12 +471,12 @@ gUnknown_08D8B6E8:: @ 8D8B6E8
 	.incbin "baserom.gba", 0xd8b6e8, 0x124
 
 	.align 2
-gIntroRayquazaLightningGfx:: @ 8D8B80C
-	.incbin "graphics/intro/rayquaza_lightning.4bpp.lz"
+gIntro3LightningGfx:: @ 8D8B80C
+	.incbin "graphics/intro/intro3_lightning.4bpp.lz"
 
 	.align 2
-gIntroRayquazaLightningPal:: @ 8D8BA54
-	.incbin "graphics/intro/rayquaza_lightning.gbapal"
+gIntro3LightningPal:: @ 8D8BA54
+	.incbin "graphics/intro/intro3_lightning.gbapal"
 
 	.align 2
 gUnknown_08D8BA74:: @ 8D8BA74
@@ -466,20 +492,20 @@ gUnknown_08D8CCC8:: @ 8D8CCC8
 	.incbin "baserom.gba", 0xd8ccc8, 0x27c
 
 	.align 2
-gIntroKyogreBubblesGfx:: @ 8D8CF44
-	.incbin "graphics/intro/kyogre_bubbles.4bpp.lz"
+gIntro2BubblesGfx:: @ 8D8CF44
+	.incbin "graphics/intro/intro2_bubbles.4bpp.lz"
 
 	.align 2
-gIntroKyogreBubblesPal:: @ 8D8D110
-	.incbin "graphics/intro/kyogre_bubbles.gbapal"
+gIntro2BubblesPal:: @ 8D8D110
+	.incbin "graphics/intro/intro2_bubbles.gbapal"
 
 	.align 2
-gIntroFlygonSilhouette:: @ 8D8D130
-	.incbin "graphics/intro/flygon_silhouette.4bpp.lz"
+gIntro1FlygonGfx:: @ 8D8D130
+	.incbin "graphics/intro/intro1_flygon.4bpp.lz"
 
 	.align 2
-gIntroLeavesDropletSparkleGfx:: @ 8D8D208
-	.incbin "graphics/intro/droplet_sparkle.4bpp.lz"
+gIntro1SparkleGfx:: @ 8D8D208
+	.incbin "graphics/intro/intro1_sparkle.4bpp.lz"
 
 	.align 2
 	.incbin "baserom.gba", 0xd8d2a4, 0x16c
@@ -506,7 +532,11 @@ gUnknown_08D8FB9C:: @ 8D8FB9C
 	.incbin "baserom.gba", 0xd8fb9c, 0x24
 
 gUnknown_08D8FBC0:: @ 8D8FBC0
-	.incbin "baserom.gba", 0xd8fbc0, 0xb4
+	.incbin "baserom.gba", 0xd8fbc0, 0x30
+
+	.align 2
+gBattleInterface_BallStatusBarGfx:: @ 8D8FBF0
+	.incbin "graphics/battle_interface/ball_status_bar.4bpp.lz"
 
 	.align 2
 gMonIcon_Egg:: @ 8D8FC74
diff --git a/data/intro.s b/data/intro.s
index ea6223c7e..d43a57972 100644
--- a/data/intro.s
+++ b/data/intro.s
@@ -4,79 +4,79 @@
 	.section .rodata
 
 	.align 2
-gIntroLeavesDropsPal:: @ 85DFF90
-	.incbin "graphics/intro/leaves_drops.gbapal"
+gIntro1DropsPal:: @ 85DFF90
+	.incbin "graphics/intro/intro1_drops.gbapal"
 
 	.align 2
-gIntroLeavesGFLogoPal:: @ 85DFFB0
-	.incbin "graphics/intro/leaves_gflogo.gbapal"
+gIntro1GFLogoPal:: @ 85DFFB0
+	.incbin "graphics/intro/intro1_gflogo.gbapal"
 
 	.align 2
-gIntroLeavesGFLogoGfx:: @ 85DFFD0
-	.incbin "graphics/intro/leaves_gflogo.4bpp.lz"
+gIntroTiles:: @ 85DFFD0
+	.incbin "graphics/intro/intro.4bpp.lz"
 
 	.align 2
-gIntroLeavesPal:: @ 85E05C4
-	.incbin "graphics/intro/leaves.gbapal"
+gIntro1BGPals:: @ 85E05C4
+	.incbin "graphics/intro/intro1_bgpal.gbapal"
 
 	.align 2
-gIntroLeavesForegroundTilemap:: @ 85E07C4
-	.incbin "graphics/intro/leaves_foreground.bin.lz"
+gIntro1BG0_Tilemap:: @ 85E07C4
+	.incbin "graphics/intro/intro1_bg0_map.bin.lz"
 
 	.align 2
-gIntroLeavesMidgroundTilemap:: @ 85E0B78
-	.incbin "graphics/intro/leaves_midground.bin.lz"
+gIntro1BG1_Tilemap:: @ 85E0B78
+	.incbin "graphics/intro/intro1_bg1_map.bin.lz"
 
 	.align 2
-gIntroLeavesBgLeavesTilemap:: @ 85E0EAC
-	.incbin "graphics/intro/leaves_bgleaves.bin.lz"
+gIntro1BG2_Tilemap:: @ 85E0EAC
+	.incbin "graphics/intro/intro1_bg2_map.bin.lz"
 
 	.align 2
-gIntroLeavesBgMountainsTilemap:: @ 85E119C
-	.incbin "graphics/intro/leaves_bgmountains.bin.lz"
+gIntro1BG3_Tilemap:: @ 85E119C
+	.incbin "graphics/intro/intro1_bg3_map.bin.lz"
 
 	.align 2
-gIntroLeavesBgGfx:: @ 85E13B4
-	.incbin "graphics/intro/leaves_bg.4bpp.lz"
+gIntro1BGLeavesGfx:: @ 85E13B4
+	.incbin "graphics/intro/introgfx.4bpp.lz"
 
 	.align 2
-gIntroBattlePokeBallPal:: @ 85E3524
-	.incbin "graphics/intro/battle_pokeball.gbapal"
+gIntro3PokeballPal:: @ 85E3524
+	.incbin "graphics/intro/intro3_pokeball.gbapal"
 
 	.align 2
-gIntroBattlePokeBallTilemap:: @ 85E3724
-	.incbin "graphics/intro/battle_pokeball.bin.lz"
+gIntro3Pokeball_Tilemap:: @ 85E3724
+	.incbin "graphics/intro/intro3_pokeball_map.bin.lz"
 
 	.align 2
-gIntroBattlePokeBallGfx:: @ 85E3854
-	.incbin "graphics/intro/battle_pokeball.8bpp.lz"
+gIntro3Pokeball_Gfx:: @ 85E3854
+	.incbin "graphics/intro/intro3_pokeball.8bpp.lz"
 
 	.align 2
-	.incbin "graphics/intro/battle_streaks.gbapal"
+	.incbin "graphics/intro/intro3_streaks.gbapal"
 
 	.align 2
-	.incbin "graphics/intro/battle_streaks.4bpp.lz"
+	.incbin "graphics/intro/intro3_streaks.4bpp.lz"
 
 	.align 2
-	.incbin "graphics/intro/battle_streaks.bin.lz"
+	.incbin "graphics/intro/intro3_streaks_map.bin.lz"
 
 	.align 2
-gIntroBattleCirclePal:: @ 85E4570
-	.incbin "graphics/intro/battle_circle_1.gbapal"
+gIntro3Misc1Pal:: @ 85E4570
+	.incbin "graphics/intro/intro3_misc1.gbapal"
 
 	.align 2
-	.incbin "graphics/intro/battle_circle_2.gbapal"
+	.incbin "graphics/intro/intro3_misc2.gbapal"
 
 	.align 2
-gIntroBattleCircleGfx:: @ 85E45B0
-	.incbin "graphics/intro/battle_circle.4bpp.lz"
+gIntro3MiscTiles:: @ 85E45B0
+	.incbin "graphics/intro/intro3_misc.4bpp.lz"
 
 	.align 2
-gIntroFlyingPkmnSilhouettePal:: @ 85E492C
-	.incbin "graphics/intro/flying_silhouette.gbapal"
+gIntro1FlygonPal:: @ 85E492C
+	.incbin "graphics/intro/intro1_flygon.gbapal"
 
 	.align 2
-	.incbin "graphics/intro/latis.4bpp.lz"
+	.incbin "graphics/intro/intro1_eon.4bpp.lz"
 
 	.align 2
 	.byte 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06
@@ -90,12 +90,12 @@ gIntroFlyingPkmnSilhouettePal:: @ 85E492C
 
 	.align 2
 gUnknown_085E4A74:: @ 85E4A74
-	obj_tiles gIntroLeavesDropletSparkleGfx, 0x0400, 0x05e1
+	obj_tiles gIntro1SparkleGfx, 0x0400, 0x05e1
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4A84:: @ 85E4A84
-	obj_pal gIntroRayquazaLightningPal, 0x05e1
+	obj_pal gIntro3LightningPal, 0x05e1
 	null_obj_pal
 
 	.align 2
@@ -122,16 +122,16 @@ gUnknown_085E4AD0:: @ 85E4AD0
 
 	.align 2
 gUnknown_085E4AE8:: @ 85E4AE8
-	obj_tiles gIntroVolbeatGfx, 0x0400, 0x05dc
-	obj_tiles gIntroTorchicGfx, 0x0c00, 0x05dd
-	obj_tiles gIntroManectricGfx, 0x2000, 0x05de
+	obj_tiles gIntro2VolbeatGfx, 0x0400, 0x05dc
+	obj_tiles gIntro2TorchicGfx, 0x0c00, 0x05dd
+	obj_tiles gIntro2ManectricGfx, 0x2000, 0x05de
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4B08:: @ 85E4B08
-	obj_pal gIntroVolbeatPal, 0x05dc
-	obj_pal gIntroTorchicPal, 0x05dd
-	obj_pal gIntroManectricPal, 0x05de
+	obj_pal gIntro2VolbeatPal, 0x05dc
+	obj_pal gIntro2TorchicPal, 0x05dd
+	obj_pal gIntro2ManectricPal, 0x05de
 	null_obj_pal
 
 	.align 2
@@ -194,12 +194,12 @@ gUnknown_085E4BDC:: @ 85E4BDC
 
 	.align 2
 gUnknown_085E4BF4:: @ 85E4BF4
-	obj_tiles gIntroRayquazaLightningGfx, 0x0c00, 0x05df
+	obj_tiles gIntro3LightningGfx, 0x0c00, 0x05df
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4C04:: @ 85E4C04
-	obj_pal gIntroRayquazaLightningPal, 0x05df
+	obj_pal gIntro3LightningPal, 0x05df
 	null_obj_pal
 
 	.align 2
@@ -236,12 +236,12 @@ gUnknown_085E4C64:: @ 85E4C64
 
 	.align 2
 gUnknown_085E4C88:: @ 85E4C88
-	obj_tiles gIntroKyogreBubblesGfx, 0x0600, 0x05e0
+	obj_tiles gIntro2BubblesGfx, 0x0600, 0x05e0
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4C98:: @ 85E4C98
-	obj_pal gIntroKyogreBubblesPal, 0x05e0
+	obj_pal gIntro2BubblesPal, 0x05e0
 	null_obj_pal
 
 	.align 2
@@ -488,18 +488,18 @@ gUnknown_085E4FC4:: @ 85E4FC4
 
 	.align 2
 gUnknown_085E4FDC:: @ 85E4FDC
-	obj_tiles gIntroLeavesGFLogoGfx, 0x1400, 0x07d0
+	obj_tiles gIntroTiles, 0x1400, 0x07d0
 	null_obj_tiles
 
 gUnknown_085E4FEC:: @ 85E4FEC
-	obj_tiles gIntroFlygonSilhouette, 0x0400, 0x07d2
+	obj_tiles gIntro1FlygonGfx, 0x0400, 0x07d2
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4FFC:: @ 85E4FFC
-	obj_pal gIntroLeavesDropsPal, 0x07d0
-	obj_pal gIntroLeavesGFLogoPal, 0x07d1
-	obj_pal gIntroFlyingPkmnSilhouettePal, 0x07d2
+	obj_pal gIntro1DropsPal, 0x07d0
+	obj_pal gIntro1GFLogoPal, 0x07d1
+	obj_pal gIntro1FlygonPal, 0x07d2
 	null_obj_pal
 
 	.align 2
@@ -520,10 +520,10 @@ gUnknown_085E5030:: @ 85E5030
 
 	.align 2
 gUnknown_085E5048:: @ 85E5048
-	obj_tiles gIntroBattleCircleGfx, 0x0a00, 0x07d3
+	obj_tiles gIntro3MiscTiles, 0x0a00, 0x07d3
 	null_obj_tiles
 
 gUnknown_085E5058:: @ 85E5058
-	obj_pal gIntroBattleCirclePal, 0x07d3
+	obj_pal gIntro3Misc1Pal, 0x07d3
 	null_obj_pal
 
diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s
index a1a0eb460..636c1a8fb 100644
--- a/data/intro_credits_graphics.s
+++ b/data/intro_credits_graphics.s
@@ -3,146 +3,457 @@
 
 	.section .rodata
 
+	.align 2
 gUnknown_085F06E0:: @ 85F06E0
-	.incbin "baserom.gba", 0x5f06e0, 0x20
+	.incbin "graphics/intro/intro2_grass.gbapal"
 
+	.align 2
 gUnknown_085F0700:: @ 85F0700
-	.incbin "baserom.gba", 0x5f0700, 0x20
+	.incbin "graphics/intro/intro2_grass_afternoon.gbapal"
 
+	.align 2
 gUnknown_085F0720:: @ 85F0720
-	.incbin "baserom.gba", 0x5f0720, 0x20
+	.incbin "graphics/intro/intro2_grass_night.gbapal"
 
+	.align 2
 gUnknown_085F0740:: @ 85F0740
-	.incbin "baserom.gba", 0x5f0740, 0x480
+	.incbin "graphics/intro/intro2_grass.4bpp.lz"
 
+	.align 2
 gUnknown_085F0BC0:: @ 85F0BC0
-	.incbin "baserom.gba", 0x5f0bc0, 0x13c
+	.incbin "graphics/intro/intro2_grass_map.bin.lz"
 
+	.align 2
 gUnknown_085F0CFC:: @ 85F0CFC
-	.incbin "baserom.gba", 0x5f0cfc, 0x60
+	.incbin "graphics/intro/85F0CFC.gbapal"
 
+	.align 2
 gUnknown_085F0D5C:: @ 85F0D5C
-	.incbin "baserom.gba", 0x5f0d5c, 0x60
+	.incbin "graphics/intro/85F0D5C.gbapal"
 
+	.align 2
 gUnknown_085F0DBC:: @ 85F0DBC
-	.incbin "baserom.gba", 0x5f0dbc, 0x5dc
+	.incbin "graphics/intro/intro2_bgclouds.4bpp.lz"
 
+	.align 2
 gUnknown_085F1398:: @ 85F1398
-	.incbin "baserom.gba", 0x5f1398, 0x2d0
+	.incbin "graphics/intro/intro2_bgclouds_map.bin.lz"
 
+	.align 2
 gUnknown_085F1668:: @ 85F1668
-	.incbin "baserom.gba", 0x5f1668, 0x20
+	.incbin "graphics/intro/intro2_bgclouds.gbapal"
 
+	.align 2
 gUnknown_085F1688:: @ 85F1688
-	.incbin "baserom.gba", 0x5f1688, 0x20
+	.incbin "graphics/intro/intro2_bgclouds_afternoon.gbapal"
 
+	.align 2
 gUnknown_085F16A8:: @ 85F16A8
-	.incbin "baserom.gba", 0x5f16a8, 0x13c
+	.incbin "graphics/intro/intro2_bgclouds2.4bpp.lz"
 
+	.align 2
 gUnknown_085F17E4:: @ 85F17E4
-	.incbin "baserom.gba", 0x5f17e4, 0x20
+	.incbin "graphics/intro/intro2_bgtrees2.gbapal"
 
+	.align 2
 gUnknown_085F1804:: @ 85F1804
-	.incbin "baserom.gba", 0x5f1804, 0x20
+	.incbin "graphics/intro/intro2_bgtrees2_afternoon.gbapal"
 
+	.align 2
 gUnknown_085F1824:: @ 85F1824
-	.incbin "baserom.gba", 0x5f1824, 0x688
+	.incbin "graphics/intro/intro2_bgtrees.4bpp.lz"
 
+	.align 2
 gUnknown_085F1EAC:: @ 85F1EAC
-	.incbin "baserom.gba", 0x5f1eac, 0x304
+	.incbin "graphics/intro/intro2_bgtrees_map.bin.lz"
 
+	.align 2
 gUnknown_085F21B0:: @ 85F21B0
-	.incbin "baserom.gba", 0x5f21b0, 0x16c
+	.incbin "graphics/intro/intro2_bgtrees.gbapal"
 
+	.align 2
+gIntro2TreeGfx:: @ 85F21D0
+	.incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz"
+
+	.align 2
 gUnknown_085F231C:: @ 85F231C
-	.incbin "baserom.gba", 0x5f231c, 0x40
+	.incbin "graphics/intro/85F231C.gbapal"
 
+	.align 2
 gUnknown_085F235C:: @ 85F235C
-	.incbin "baserom.gba", 0x5f235c, 0x1ec
+	.incbin "graphics/intro/intro2_bgnight.4bpp.lz"
 
+	.align 2
 gUnknown_085F2548:: @ 85F2548
-	.incbin "baserom.gba", 0x5f2548, 0x20
+	.incbin "graphics/intro/intro2_bgnight.gbapal"
 
+	.align 2
 gUnknown_085F2568:: @ 85F2568
-	.incbin "baserom.gba", 0x5f2568, 0x2ae4
+	.incbin "graphics/intro/intro2_bgnight_map.bin.lz"
+
+	.align 2
+gIntro2NightGfx:: @ 85F2814
+	.incbin "graphics/intro/intro2_night.4bpp.lz"
+
+	.align 2
+gIntro2BrendanPal:: @ 85F2898
+	.incbin "graphics/intro/intro2_brendan.gbapal"
+
+	.align 2
+gIntro2BrendanGfx:: @ 85F28B8
+	.incbin "graphics/intro/intro2_brendan.4bpp.lz"
+
+	.align 2
+gIntro2MayPal:: @ 85F3470
+	.incbin "graphics/intro/intro2_may.gbapal"
+
+	.align 2
+gUnknown_085F3490:: @ 85F3490
+	.space 0x1E0
+
+	.align 2
+gIntro2MayGfx:: @ 85F3670
+	.incbin "graphics/intro/intro2_may.4bpp.lz"
 
+	.align 2
+gIntro2BicycleGfx:: @ 85F4318
+	.incbin "graphics/intro/intro2_bicycle.4bpp.lz"
+
+	.align 2
+gIntro2LatiosPal:: @ 85F4744
+	.incbin "graphics/intro/intro2_latios.gbapal"
+
+	.align 2
+gIntro2LatiosGfx:: @ 85F4764
+	.incbin "graphics/intro/intro2_latios.4bpp.lz"
+
+	.align 2
+gIntro2LatiasPal:: @ 85F4C08
+	.incbin "graphics/intro/intro2_latias.gbapal"
+
+	.align 2
+gIntro2LatiasGfx:: @ 85F4C28
+	.incbin "graphics/intro/intro2_latias.4bpp.lz"
+
+	.align 2
 gUnknown_085F504C:: @ 85F504C
-	.incbin "baserom.gba", 0x5f504c, 0x18
+	spr_template 0x07d0, 0xffff, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
 
+	.align 2
 gUnknown_085F5064:: @ 85F5064
-	.incbin "baserom.gba", 0x5f5064, 0x30
-
+	obj_tiles gUnknown_085F16A8, 0x0400, 0x07d0
+	null_obj_tiles
+
+	.align 2
+gUnknown_085F5074:: @ 85F5074
+	obj_image_anim_frame 0, 30
+	obj_image_anim_end
+
+	.align 2
+gUnknown_085F507C:: @ 85F507C
+	obj_image_anim_frame 16, 30
+	obj_image_anim_end
+
+	.align 2
+gUnknown_085F5084:: @ 85F5084
+	obj_image_anim_frame 20, 30
+	obj_image_anim_end
+
+	.align 2
+gUnknown_085F508C:: @ 85F508C
+	obj_image_anim_frame 22, 30
+	obj_image_anim_end
+
+	.align 2
 gUnknown_085F5094:: @ 85F5094
-	.incbin "baserom.gba", 0x5f5094, 0x10
+	.4byte gUnknown_085F5074
+	.4byte gUnknown_085F507C
+	.4byte gUnknown_085F5084
+	.4byte gUnknown_085F508C
 
+	.align 2
 gUnknown_085F50A4:: @ 85F50A4
-	.incbin "baserom.gba", 0x5f50a4, 0x48
-
+	.byte -128, 72, 32, 100
+	.2byte 0xC00
+	.space 2
+	.byte -128, -98, 32, 100
+	.2byte 0xC00
+	.space 2
+	.byte 65, -64, 40, 101
+	.2byte 0x800
+	.space 2
+	.byte 65, 56, 40, 101
+	.2byte 0x800
+	.space 2
+	.byte 18, 100, 44, 102
+	.2byte 0x400
+	.space 2
+	.byte 18, -104, 44, 102
+	.2byte 0x400
+	.space 2
+	.byte 19, 8, 46, 103
+	.2byte 0x100
+	.space 2
+	.byte 19, 56, 46, 103
+	.2byte 0x100
+	.space 2
+	.byte 19, -16, 46, 103
+	.2byte 0x100
+	.space 2
+
+	.align 2
 gUnknown_085F50EC:: @ 85F50EC
-	.incbin "baserom.gba", 0x5f50ec, 0x28
+	obj_tiles gIntro2TreeGfx, 0x0400, 0x07d0
+	null_obj_tiles
+
+	.align 2
+gUnknown_085F50FC:: @ 85F50FC
+	obj_image_anim_frame 0, 30
+	obj_image_anim_end
+
+	.align 2
+gUnknown_085F5104:: @ 85F5104
+	obj_image_anim_frame 16, 30
+	obj_image_anim_end
 
+	.align 2
+gUnknown_085F510C:: @ 85F510C
+	obj_image_anim_frame 24, 30
+	obj_image_anim_end
+
+	.align 2
 gUnknown_085F5114:: @ 85F5114
-	.incbin "baserom.gba", 0x5f5114, 0xc
+	.4byte gUnknown_085F50FC
+	.4byte gUnknown_085F5104
+	.4byte gUnknown_085F510C
 
+	.align 2
 gUnknown_085F5120:: @ 85F5120
-	.incbin "baserom.gba", 0x5f5120, 0x60
-
+	.byte -128, 16, 88, 100
+	.2byte 0x2000
+	.space 2
+	.byte -128, 80, 88, 100
+	.2byte 0x2000
+	.space 2
+	.byte -128, -112, 88, 100
+	.2byte 0x2000
+	.space 2
+	.byte -128, -48, 88, 100
+	.2byte 0x2000
+	.space 2
+	.byte -95, 40, 88, 101
+	.2byte 0x1000
+	.space 2
+	.byte -95, 104, 88, 101
+	.2byte 0x1000
+	.space 2
+	.byte -95, -88, 88, 101
+	.2byte 0x1000
+	.space 2
+	.byte -95, -24, 88, 101
+	.2byte 0x1000
+	.space 2
+	.byte -94, 56, 88, 102
+	.2byte 0x800
+	.space 2
+	.byte -94, 120, 88, 102
+	.2byte 0x800
+	.space 2
+	.byte -94, -72, 88, 102
+	.2byte 0x800
+	.space 2
+	.byte -94, -8, 88, 102
+	.2byte 0x800
+	.space 2
+
+	.align 2
 gUnknown_085F5180:: @ 85F5180
-	.incbin "baserom.gba", 0x5f5180, 0x18
+	obj_tiles gIntro2NightGfx, 0x0400, 0x07d0
+	null_obj_tiles
+
+	.align 2
+gUnknown_085F5190:: @ 85F5190
+	obj_image_anim_frame 0, 30
+	obj_image_anim_end
 
+	.align 2
 gUnknown_085F5198:: @ 85F5198
-	.incbin "baserom.gba", 0x5f5198, 0x4
+	.4byte gUnknown_085F5190
 
+	.align 2
 gUnknown_085F519C:: @ 85F519C
-	.incbin "baserom.gba", 0x5f519c, 0x50
-
+	.byte -128, 24, 88, 100
+	.2byte 0x1000
+	.space 2
+	.byte -128, 64, 88, 100
+	.2byte 0x1000
+	.space 2
+	.byte -128, 104, 88, 100
+	.2byte 0x1000
+	.space 2
+	.byte -128, -112, 88, 100
+	.2byte 0x1000
+	.space 2
+	.byte -128, -72, 88, 100
+	.2byte 0x1000
+	.space 2
+	.byte -128, -32, 88, 100
+	.2byte 0x1000
+	.space 2
+
+	.align 2
+gOamData_85F51CC:: @ 85F51CC
+	.2byte 0x00A0
+	.2byte 0xC000
+	.2byte 0x0400
+
+	.align 2
+gUnknown_085F51D4:: @ 85F51D4
+	obj_image_anim_frame 0, 8
+	obj_image_anim_frame 64, 8
+	obj_image_anim_frame 128, 8
+	obj_image_anim_frame 192, 8
+	obj_image_anim_jump 0
+
+	.align 2
+gUnknown_085F51E8:: @ 85F51E8
+	.4byte gUnknown_085F51D4
+
+	.align 2
 gUnknown_085F51EC:: @ 85F51EC
-	.incbin "baserom.gba", 0x5f51ec, 0x18
+	spr_template 0x03ea, 0x03ea, gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
 
+	.align 2
 gUnknown_085F5204:: @ 85F5204
-	.incbin "baserom.gba", 0x5f5204, 0x38
-
+	spr_template 0x03eb, 0x03eb, gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
+
+	.align 2
+gUnknown_085F521C:: @ 85F521C
+	.2byte 0x40A0
+	.2byte 0xC000
+	.2byte 0x0400
+
+	.align 2
+gUnknown_085F5224:: @ 85F5224
+	obj_image_anim_frame 0, 8
+	obj_image_anim_frame 32, 8
+	obj_image_anim_frame 64, 8
+	obj_image_anim_frame 96, 8
+	obj_image_anim_jump 0
+
+	.align 2
+gUnknown_085F5238:: @ 85F5238
+	.4byte gUnknown_085F5224
+
+	.align 2
 gUnknown_085F523C:: @ 85F523C
-	.incbin "baserom.gba", 0x5f523c, 0x18
+	spr_template 0x03e9, 0x03ea, gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
 
+	.align 2
 gUnknown_085F5254:: @ 85F5254
-	.incbin "baserom.gba", 0x5f5254, 0x38
-
+	spr_template 0x03e9, 0x03eb, gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
+
+	.align 2
+gUnknown_085F526C:: @ 85F526C
+	.2byte 0x00A0
+	.2byte 0xC000
+	.2byte 0x0400
+
+	.align 2
+gUnknown_085F5274:: @ 85F5274
+	obj_image_anim_frame 0, 16
+	obj_image_anim_end
+
+	.align 2
+gUnknown_085F527C:: @ 85F527C
+	obj_image_anim_frame 64, 16
+	obj_image_anim_end
+
+	.align 2
+gUnknown_085F5284:: @ 85F5284
+	.4byte gUnknown_085F5274
+	.4byte gUnknown_085F527C
+
+	.align 2
 gUnknown_085F528C:: @ 85F528C
-	.incbin "baserom.gba", 0x5f528c, 0x18
+	spr_template 0x03ec, 0x03ec, gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
 
+	.align 2
 gUnknown_085F52A4:: @ 85F52A4
-	.incbin "baserom.gba", 0x5f52a4, 0x18
+	spr_template 0x03ed, 0x03ed, gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
 
+	.align 2
 gUnknown_085F52BC:: @ 85F52BC
-	.incbin "baserom.gba", 0x5f52bc, 0x10
+	obj_tiles gIntro2BrendanNoTurnGfx, 0x2000, 0x03ea
+	null_obj_tiles
 
+	.align 2
 gUnknown_085F52CC:: @ 85F52CC
-	.incbin "baserom.gba", 0x5f52cc, 0x10
+	obj_tiles gIntro2MayNoTurnGfx, 0x2000, 0x03eb
+	null_obj_tiles
 
+	.align 2
 gUnknown_085F52DC:: @ 85F52DC
-	.incbin "baserom.gba", 0x5f52dc, 0x20
+	obj_tiles gIntro2BicycleGfx, 0x1000, 0x03e9
+	null_obj_tiles
 
+	.align 2
+gUnknown_085F52EC:: @ 85F52EC
+	obj_tiles gIntro2FlygonGfx, 0x1000, 0x03ec
+	null_obj_tiles
+
+	.align 2
 gUnknown_085F52FC:: @ 85F52FC
-	.incbin "baserom.gba", 0x5f52fc, 0x10
+	obj_tiles gIntro2FlygonGfx, 0x1000, 0x03ed
+	null_obj_tiles
 
+	.align 2
 gUnknown_085F530C:: @ 85F530C
-	.incbin "baserom.gba", 0x5f530c, 0x28
+	obj_pal gIntro2BrendanNoTurnPal, 0x03ea
+	obj_pal gIntro2BrendanNoTurnPal, 0x03eb
+	obj_pal gIntro2FlygonPal, 0x03ec
+	obj_pal gIntro2FlygonPal, 0x03ed
+	null_obj_pal
 
+	.align 2
 gUnknown_085F5334:: @ 85F5334
-	.incbin "baserom.gba", 0x5f5334, 0x10
+	obj_tiles gIntro2BrendanGfx, 0x3800, 0x03ea
+	null_obj_tiles
 
+	.align 2
 gUnknown_085F5344:: @ 85F5344
-	.incbin "baserom.gba", 0x5f5344, 0x10
+	obj_tiles gIntro2MayGfx, 0x3800, 0x03eb
+	null_obj_tiles
 
+	.align 2
 gUnknown_085F5354:: @ 85F5354
-	.incbin "baserom.gba", 0x5f5354, 0x30
+	obj_tiles gIntro2BicycleGfx, 0x1000, 0x03e9
+	null_obj_tiles
+
+	.align 2
+gUnknown_085F5364:: @ 85F5364
+	obj_tiles gIntro2LatiosGfx, 0x1000, 0x03ec
+	null_obj_tiles
+
+	.align 2
+gUnknown_085F5374:: @ 85F5374
+	obj_tiles gIntro2LatiasGfx, 0x1000, 0x03ed
+	null_obj_pal
 
+	.align 2
 gUnknown_085F5384:: @ 85F5384
-	.incbin "baserom.gba", 0x5f5384, 0x28
+	obj_pal gIntro2BrendanPal, 0x03ea
+	obj_pal gIntro2MayPal, 0x03eb
+	obj_pal gIntro2LatiosPal, 0x03ec
+	obj_pal gIntro2LatiasPal, 0x03ed
+	null_obj_pal
 
+	.align 2
 gUnknown_085F53AC:: @ 85F53AC
-	.incbin "baserom.gba", 0x5f53ac, 0x10
+	obj_tiles gIntro2BrendanGfx, 0x2000, 0x03ea
+	null_obj_tiles
 
+	.align 2
 gUnknown_085F53BC:: @ 85F53BC
-	.incbin "baserom.gba", 0x5f53bc, 0x8
+	obj_tiles gIntro2MayGfx, 0x2000, 0x03eb
+	null_obj_tiles
diff --git a/graphics/battle_interface/ball_display.pal b/graphics/battle_interface/ball_display.pal
new file mode 100644
index 000000000..ea646bb82
--- /dev/null
+++ b/graphics/battle_interface/ball_display.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+57 57 57
+255 255 255
+213 205 189
+131 131 139
+74 65 90
+82 106 90
+255 180 123
+246 148 115
+222 106 90
+115 255 172
+90 213 131
+255 230 57
+205 172 8
+255 90 57
+172 65 74
diff --git a/graphics/battle_interface/ball_display.png b/graphics/battle_interface/ball_display.png
new file mode 100644
index 000000000..0c49d7ac4
--- /dev/null
+++ b/graphics/battle_interface/ball_display.png
diff --git a/graphics/battle_interface/ball_status_bar.pal b/graphics/battle_interface/ball_status_bar.pal
new file mode 100644
index 000000000..bc8e8f2bc
--- /dev/null
+++ b/graphics/battle_interface/ball_status_bar.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 65 65
+255 255 222
+222 213 180
+197 189 115
+123 148 131
+82 106 98
+32 57 0
+57 82 65
+255 230 0
+255 156 148
+65 205 255
+0 0 255
+0 255 0
+255 0 0
+106 148 255
diff --git a/graphics/battle_interface/ball_status_bar.png b/graphics/battle_interface/ball_status_bar.png
new file mode 100644
index 000000000..b947a7803
--- /dev/null
+++ b/graphics/battle_interface/ball_status_bar.png
diff --git a/graphics/intro/85F0CFC.pal b/graphics/intro/85F0CFC.pal
new file mode 100644
index 000000000..09a1ee728
--- /dev/null
+++ b/graphics/intro/85F0CFC.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+255 255 255
+82 131 246
+115 164 246
+139 197 246
+180 222 230
+197 246 230
+164 230 246
+131 164 255
+189 197 255
+156 197 255
+180 230 255
+189 197 255
+0 0 0
+255 255 255
+230 246 255
+205 238 255
+180 230 255
+164 222 255
+139 213 255
+115 205 255
+98 197 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+230 246 255
+205 238 255
+180 230 255
+164 222 255
+139 213 255
+115 205 255
+98 197 255
+230 230 255
+246 255 255
+213 222 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/85F0D5C.pal b/graphics/intro/85F0D5C.pal
new file mode 100644
index 000000000..4ff388f48
--- /dev/null
+++ b/graphics/intro/85F0D5C.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+255 255 255
+255 98 82
+255 123 106
+255 148 139
+255 172 172
+255 197 205
+255 222 238
+156 180 172
+197 197 156
+172 189 164
+255 222 156
+222 172 106
+0 0 0
+255 255 255
+255 238 205
+255 222 156
+255 222 156
+255 213 131
+255 197 106
+255 172 98
+255 156 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+255 238 205
+255 222 156
+255 222 156
+255 213 131
+255 197 106
+255 172 98
+255 156 90
+255 238 205
+246 255 255
+255 222 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/85F231C.pal b/graphics/intro/85F231C.pal
new file mode 100644
index 000000000..82855d938
--- /dev/null
+++ b/graphics/intro/85F231C.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+49 115 246
+57 74 123
+57 74 123
+57 74 123
+49 57 98
+49 49 82
+49 32 57
+49 24 41
+0 0 0
+0 0 0
+0 0 0
+57 74 123
+57 74 123
+246 246 123
+41 65 90
+0 0 0
+0 0 0
+0 0 0
+82 90 148
+148 131 164
+57 74 123
+131 106 156
+98 90 123
+156 164 197
+139 148 172
+90 131 139
+189 197 213
+90 115 164
+230 230 82
+131 131 164
+246 246 123
diff --git a/graphics/intro/leaves_gflogo.png b/graphics/intro/intro.png
index e0f28c841..e0f28c841 100644
--- a/graphics/intro/leaves_gflogo.png
+++ b/graphics/intro/intro.png
diff --git a/graphics/intro/leaves_foreground.bin b/graphics/intro/intro1_bg0_map.bin
index 8307cf656..8307cf656 100644
--- a/graphics/intro/leaves_foreground.bin
+++ b/graphics/intro/intro1_bg0_map.bin
diff --git a/graphics/intro/leaves_midground.bin b/graphics/intro/intro1_bg1_map.bin
index 7d34e5bba..7d34e5bba 100644
--- a/graphics/intro/leaves_midground.bin
+++ b/graphics/intro/intro1_bg1_map.bin
diff --git a/graphics/intro/leaves_bgleaves.bin b/graphics/intro/intro1_bg2_map.bin
index 7781e8b08..7781e8b08 100644
--- a/graphics/intro/leaves_bgleaves.bin
+++ b/graphics/intro/intro1_bg2_map.bin
diff --git a/graphics/intro/leaves_bgmountains.bin b/graphics/intro/intro1_bg3_map.bin
index 1af02a025..1af02a025 100644
--- a/graphics/intro/leaves_bgmountains.bin
+++ b/graphics/intro/intro1_bg3_map.bin
diff --git a/graphics/intro/leaves.pal b/graphics/intro/intro1_bgpal.pal
index 95145b854..95145b854 100644
--- a/graphics/intro/leaves.pal
+++ b/graphics/intro/intro1_bgpal.pal
diff --git a/graphics/intro/leaves_drops.pal b/graphics/intro/intro1_drops.pal
index 1b8ce3d6e..1b8ce3d6e 100644
--- a/graphics/intro/leaves_drops.pal
+++ b/graphics/intro/intro1_drops.pal
diff --git a/graphics/intro/latis.png b/graphics/intro/intro1_eon.png
index cf8eedc08..cf8eedc08 100644
--- a/graphics/intro/latis.png
+++ b/graphics/intro/intro1_eon.png
diff --git a/graphics/intro/flying_silhouette.pal b/graphics/intro/intro1_flygon.pal
index dcfc242a5..dcfc242a5 100644
--- a/graphics/intro/flying_silhouette.pal
+++ b/graphics/intro/intro1_flygon.pal
diff --git a/graphics/intro/flygon_silhouette.png b/graphics/intro/intro1_flygon.png
index 080ab1a65..080ab1a65 100644
--- a/graphics/intro/flygon_silhouette.png
+++ b/graphics/intro/intro1_flygon.png
diff --git a/graphics/intro/leaves_gflogo.pal b/graphics/intro/intro1_gflogo.pal
index aef9152e4..aef9152e4 100644
--- a/graphics/intro/leaves_gflogo.pal
+++ b/graphics/intro/intro1_gflogo.pal
diff --git a/graphics/intro/droplet_sparkle.png b/graphics/intro/intro1_sparkle.png
index f8db885ec..f8db885ec 100644
--- a/graphics/intro/droplet_sparkle.png
+++ b/graphics/intro/intro1_sparkle.png
diff --git a/graphics/intro/intro2_bgclouds.pal b/graphics/intro/intro2_bgclouds.pal
new file mode 100644
index 000000000..6b312a16c
--- /dev/null
+++ b/graphics/intro/intro2_bgclouds.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+230 246 255
+205 238 255
+180 230 255
+164 222 255
+139 213 255
+115 205 255
+98 197 255
+230 230 255
+246 255 255
+213 222 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_bgclouds.png b/graphics/intro/intro2_bgclouds.png
new file mode 100644
index 000000000..7ba3d78f4
--- /dev/null
+++ b/graphics/intro/intro2_bgclouds.png
diff --git a/graphics/intro/intro2_bgclouds2.png b/graphics/intro/intro2_bgclouds2.png
new file mode 100644
index 000000000..933332fdd
--- /dev/null
+++ b/graphics/intro/intro2_bgclouds2.png
diff --git a/graphics/intro/intro2_bgclouds_afternoon.pal b/graphics/intro/intro2_bgclouds_afternoon.pal
new file mode 100644
index 000000000..6d5d9dbcd
--- /dev/null
+++ b/graphics/intro/intro2_bgclouds_afternoon.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 238 205
+255 222 156
+255 222 156
+255 213 131
+255 197 106
+255 172 98
+255 156 90
+255 238 205
+246 255 255
+255 222 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_bgclouds_map.bin b/graphics/intro/intro2_bgclouds_map.bin
new file mode 100644
index 000000000..25b65f766
--- /dev/null
+++ b/graphics/intro/intro2_bgclouds_map.bin
diff --git a/graphics/intro/intro2_bgnight.pal b/graphics/intro/intro2_bgnight.pal
new file mode 100644
index 000000000..765aad45a
--- /dev/null
+++ b/graphics/intro/intro2_bgnight.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+82 90 148
+148 131 164
+57 74 123
+131 106 156
+98 90 123
+156 164 197
+139 148 172
+90 131 139
+189 197 213
+90 115 164
+230 230 82
+131 131 164
+246 246 123
diff --git a/graphics/intro/intro2_bgnight.png b/graphics/intro/intro2_bgnight.png
new file mode 100644
index 000000000..cb95bb04f
--- /dev/null
+++ b/graphics/intro/intro2_bgnight.png
diff --git a/graphics/intro/intro2_bgnight_map.bin b/graphics/intro/intro2_bgnight_map.bin
new file mode 100644
index 000000000..ef7c889ba
--- /dev/null
+++ b/graphics/intro/intro2_bgnight_map.bin
diff --git a/graphics/intro/intro2_bgtrees.pal b/graphics/intro/intro2_bgtrees.pal
new file mode 100644
index 000000000..5c506481a
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+156 189 246
+172 205 246
+197 230 255
+213 246 255
+238 255 255
+156 180 172
+197 197 156
+172 189 164
+98 139 98
+98 156 57
+123 164 131
+156 213 82
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_bgtrees.png b/graphics/intro/intro2_bgtrees.png
new file mode 100644
index 000000000..e6d163579
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees.png
diff --git a/graphics/intro/intro2_bgtrees2.pal b/graphics/intro/intro2_bgtrees2.pal
new file mode 100644
index 000000000..5c506481a
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+156 189 246
+172 205 246
+197 230 255
+213 246 255
+238 255 255
+156 180 172
+197 197 156
+172 189 164
+98 139 98
+98 156 57
+123 164 131
+156 213 82
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_bgtrees2_afternoon.pal b/graphics/intro/intro2_bgtrees2_afternoon.pal
new file mode 100644
index 000000000..9736a6e95
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees2_afternoon.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 106 57
+255 131 82
+255 197 106
+255 213 131
+255 222 156
+156 180 172
+197 197 156
+172 189 164
+115 139 57
+98 156 57
+131 172 57
+189 197 49
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_bgtrees_map.bin b/graphics/intro/intro2_bgtrees_map.bin
new file mode 100644
index 000000000..d1c23cc36
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees_map.bin
diff --git a/graphics/intro/intro2_bgtreessmall.png b/graphics/intro/intro2_bgtreessmall.png
new file mode 100644
index 000000000..33a7213b8
--- /dev/null
+++ b/graphics/intro/intro2_bgtreessmall.png
diff --git a/graphics/intro/intro2_bicycle.png b/graphics/intro/intro2_bicycle.png
new file mode 100644
index 000000000..ff63f93a4
--- /dev/null
+++ b/graphics/intro/intro2_bicycle.png
diff --git a/graphics/intro/intro2_brendan.pal b/graphics/intro/intro2_brendan.pal
new file mode 100644
index 000000000..a948fb920
--- /dev/null
+++ b/graphics/intro/intro2_brendan.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+82 74 74
+139 139 123
+197 189 222
+255 255 255
+230 49 0
+246 148 0
+0 0 0
+255 213 148
+222 164 139
+0 0 0
+246 57 131
+189 57 115
+131 255 131
+82 197 90
+131 164 65
diff --git a/graphics/intro/intro2_brendan.png b/graphics/intro/intro2_brendan.png
new file mode 100644
index 000000000..045953002
--- /dev/null
+++ b/graphics/intro/intro2_brendan.png
diff --git a/graphics/intro/intro2_brendan_noturn.pal b/graphics/intro/intro2_brendan_noturn.pal
new file mode 100644
index 000000000..49a329307
--- /dev/null
+++ b/graphics/intro/intro2_brendan_noturn.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+82 74 74
+139 139 123
+197 189 222
+255 255 255
+230 49 0
+246 148 0
+98 98 131
+255 213 148
+222 164 139
+180 172 115
+246 90 90
+189 57 115
+131 255 65
+82 197 90
+131 164 65
diff --git a/graphics/intro/intro2_brendan_noturn.png b/graphics/intro/intro2_brendan_noturn.png
new file mode 100644
index 000000000..7c7a9e494
--- /dev/null
+++ b/graphics/intro/intro2_brendan_noturn.png
diff --git a/graphics/intro/kyogre_bubbles.pal b/graphics/intro/intro2_bubbles.pal
index 85c483666..85c483666 100644
--- a/graphics/intro/kyogre_bubbles.pal
+++ b/graphics/intro/intro2_bubbles.pal
diff --git a/graphics/intro/kyogre_bubbles.png b/graphics/intro/intro2_bubbles.png
index d1f18701c..d1f18701c 100644
--- a/graphics/intro/kyogre_bubbles.png
+++ b/graphics/intro/intro2_bubbles.png
diff --git a/graphics/intro/intro2_flygon.pal b/graphics/intro/intro2_flygon.pal
new file mode 100644
index 000000000..09607ac17
--- /dev/null
+++ b/graphics/intro/intro2_flygon.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+82 74 74
+139 139 123
+197 189 222
+255 255 255
+164 98 106
+238 57 115
+255 106 139
+255 197 180
+246 255 139
+213 238 106
+172 213 65
+164 222 139
+123 197 115
+90 148 82
+0 0 0
diff --git a/graphics/intro/intro2_flygon.png b/graphics/intro/intro2_flygon.png
new file mode 100644
index 000000000..ab0b8d728
--- /dev/null
+++ b/graphics/intro/intro2_flygon.png
diff --git a/graphics/intro/intro2_grass.pal b/graphics/intro/intro2_grass.pal
new file mode 100644
index 000000000..389977abf
--- /dev/null
+++ b/graphics/intro/intro2_grass.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 164 98
+115 197 98
+164 230 90
diff --git a/graphics/intro/intro2_grass.png b/graphics/intro/intro2_grass.png
new file mode 100644
index 000000000..e573ca45e
--- /dev/null
+++ b/graphics/intro/intro2_grass.png
diff --git a/graphics/intro/intro2_grass_afternoon.pal b/graphics/intro/intro2_grass_afternoon.pal
new file mode 100644
index 000000000..20b1e45f5
--- /dev/null
+++ b/graphics/intro/intro2_grass_afternoon.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 164 98
+106 197 98
+164 197 131
diff --git a/graphics/intro/intro2_grass_map.bin b/graphics/intro/intro2_grass_map.bin
new file mode 100644
index 000000000..2a6f1a72b
--- /dev/null
+++ b/graphics/intro/intro2_grass_map.bin
diff --git a/graphics/intro/intro2_grass_night.pal b/graphics/intro/intro2_grass_night.pal
new file mode 100644
index 000000000..e44980f78
--- /dev/null
+++ b/graphics/intro/intro2_grass_night.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 164 98
+106 197 98
+131 197 164
diff --git a/graphics/intro/intro2_latias.pal b/graphics/intro/intro2_latias.pal
new file mode 100644
index 000000000..0af96be29
--- /dev/null
+++ b/graphics/intro/intro2_latias.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+123 106 106
+115 131 164
+222 213 238
+255 255 255
+213 65 57
+238 106 32
+172 74 65
+255 90 65
+180 172 197
+189 139 57
+189 98 41
+90 115 180
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_latias.png b/graphics/intro/intro2_latias.png
new file mode 100644
index 000000000..5623895ce
--- /dev/null
+++ b/graphics/intro/intro2_latias.png
diff --git a/graphics/intro/intro2_latios.pal b/graphics/intro/intro2_latios.pal
new file mode 100644
index 000000000..bb51c0a7d
--- /dev/null
+++ b/graphics/intro/intro2_latios.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+123 106 106
+115 131 164
+222 213 238
+255 255 255
+106 131 230
+139 197 255
+90 115 180
+139 156 230
+180 172 197
+238 82 32
+238 41 24
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_latios.png b/graphics/intro/intro2_latios.png
new file mode 100644
index 000000000..439e26fe6
--- /dev/null
+++ b/graphics/intro/intro2_latios.png
diff --git a/graphics/intro/manectric.pal b/graphics/intro/intro2_manectric.pal
index c6bf97aa3..c6bf97aa3 100644
--- a/graphics/intro/manectric.pal
+++ b/graphics/intro/intro2_manectric.pal
diff --git a/graphics/intro/manectric.png b/graphics/intro/intro2_manectric.png
index bcb054d7b..bcb054d7b 100644
--- a/graphics/intro/manectric.png
+++ b/graphics/intro/intro2_manectric.png
diff --git a/graphics/intro/intro2_may.pal b/graphics/intro/intro2_may.pal
new file mode 100644
index 000000000..1ff2ecd1d
--- /dev/null
+++ b/graphics/intro/intro2_may.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+82 74 74
+139 139 123
+197 189 222
+255 255 255
+82 197 0
+148 246 98
+98 98 131
+255 213 148
+222 164 139
+180 172 115
+246 90 90
+189 57 115
+131 255 65
+82 197 90
+131 164 65
diff --git a/graphics/intro/intro2_may.png b/graphics/intro/intro2_may.png
new file mode 100644
index 000000000..238924d88
--- /dev/null
+++ b/graphics/intro/intro2_may.png
diff --git a/graphics/intro/intro2_may_noturn.png b/graphics/intro/intro2_may_noturn.png
new file mode 100644
index 000000000..e88300610
--- /dev/null
+++ b/graphics/intro/intro2_may_noturn.png
diff --git a/graphics/intro/intro2_night.png b/graphics/intro/intro2_night.png
new file mode 100644
index 000000000..9a10567bb
--- /dev/null
+++ b/graphics/intro/intro2_night.png
diff --git a/graphics/intro/torchic.pal b/graphics/intro/intro2_torchic.pal
index 860b76b60..860b76b60 100644
--- a/graphics/intro/torchic.pal
+++ b/graphics/intro/intro2_torchic.pal
diff --git a/graphics/intro/torchic.png b/graphics/intro/intro2_torchic.png
index 1bd1b1184..1bd1b1184 100644
--- a/graphics/intro/torchic.png
+++ b/graphics/intro/intro2_torchic.png
diff --git a/graphics/intro/volbeat.pal b/graphics/intro/intro2_volbeat.pal
index 8d2464800..8d2464800 100644
--- a/graphics/intro/volbeat.pal
+++ b/graphics/intro/intro2_volbeat.pal
diff --git a/graphics/intro/volbeat.png b/graphics/intro/intro2_volbeat.png
index 8b6c61eb0..8b6c61eb0 100644
--- a/graphics/intro/volbeat.png
+++ b/graphics/intro/intro2_volbeat.png
diff --git a/graphics/intro/rayquaza_lightning.pal b/graphics/intro/intro3_lightning.pal
index 16aae4be3..16aae4be3 100644
--- a/graphics/intro/rayquaza_lightning.pal
+++ b/graphics/intro/intro3_lightning.pal
diff --git a/graphics/intro/rayquaza_lightning.png b/graphics/intro/intro3_lightning.png
index e858926ec..e858926ec 100644
--- a/graphics/intro/rayquaza_lightning.png
+++ b/graphics/intro/intro3_lightning.png
diff --git a/graphics/intro/battle_circle.png b/graphics/intro/intro3_misc.png
index 26be33c01..26be33c01 100644
--- a/graphics/intro/battle_circle.png
+++ b/graphics/intro/intro3_misc.png
diff --git a/graphics/intro/battle_circle_1.pal b/graphics/intro/intro3_misc1.pal
index a34bebc24..a34bebc24 100644
--- a/graphics/intro/battle_circle_1.pal
+++ b/graphics/intro/intro3_misc1.pal
diff --git a/graphics/intro/battle_circle_2.pal b/graphics/intro/intro3_misc2.pal
index 3c985dc07..3c985dc07 100644
--- a/graphics/intro/battle_circle_2.pal
+++ b/graphics/intro/intro3_misc2.pal
diff --git a/graphics/intro/battle_pokeball.pal b/graphics/intro/intro3_pokeball.pal
index d520a5e82..d520a5e82 100644
--- a/graphics/intro/battle_pokeball.pal
+++ b/graphics/intro/intro3_pokeball.pal
diff --git a/graphics/intro/battle_pokeball.png b/graphics/intro/intro3_pokeball.png
index 4af0187f8..4af0187f8 100644
--- a/graphics/intro/battle_pokeball.png
+++ b/graphics/intro/intro3_pokeball.png
diff --git a/graphics/intro/battle_pokeball.bin b/graphics/intro/intro3_pokeball_map.bin
index 2f968aa20..2f968aa20 100644
--- a/graphics/intro/battle_pokeball.bin
+++ b/graphics/intro/intro3_pokeball_map.bin
diff --git a/graphics/intro/battle_streaks.pal b/graphics/intro/intro3_streaks.pal
index 21ae1e434..21ae1e434 100644
--- a/graphics/intro/battle_streaks.pal
+++ b/graphics/intro/intro3_streaks.pal
diff --git a/graphics/intro/battle_streaks.png b/graphics/intro/intro3_streaks.png
index a19fa39c4..a19fa39c4 100644
--- a/graphics/intro/battle_streaks.png
+++ b/graphics/intro/intro3_streaks.png
diff --git a/graphics/intro/battle_streaks.bin b/graphics/intro/intro3_streaks_map.bin
index 2d1b69924..2d1b69924 100644
--- a/graphics/intro/battle_streaks.bin
+++ b/graphics/intro/intro3_streaks_map.bin
diff --git a/graphics/intro/leaves_bg.png b/graphics/intro/introgfx.png
index 041901463..041901463 100644
--- a/graphics/intro/leaves_bg.png
+++ b/graphics/intro/introgfx.png
diff --git a/include/map_constants.h b/include/map_constants.h
new file mode 100644
index 000000000..6199793c8
--- /dev/null
+++ b/include/map_constants.h
@@ -0,0 +1,1342 @@
+#ifndef GUARD_MAP_CONSTANTS_H
+#define GUARD_MAP_CONSTANTS_H
+
+//--------------------------------------------------
+// Map Group 0
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_PETALBURG_CITY,
+    MAP_ID_SLATEPORT_CITY,
+    MAP_ID_MAUVILLE_CITY,
+    MAP_ID_RUSTBORO_CITY,
+    MAP_ID_FORTREE_CITY,
+    MAP_ID_LILYCOVE_CITY,
+    MAP_ID_MOSSDEEP_CITY,
+    MAP_ID_SOOTOPOLIS_CITY,
+    MAP_ID_EVER_GRANDE_CITY,
+    MAP_ID_LITTLEROOT_TOWN,
+    MAP_ID_OLDALE_TOWN,
+    MAP_ID_DEWFORD_TOWN,
+    MAP_ID_LAVARIDGE_TOWN,
+    MAP_ID_FALLARBOR_TOWN,
+    MAP_ID_VERDANTURF_TOWN,
+    MAP_ID_PACIFIDLOG_TOWN,
+    MAP_ID_ROUTE101,
+    MAP_ID_ROUTE102,
+    MAP_ID_ROUTE103,
+    MAP_ID_ROUTE104,
+    MAP_ID_ROUTE105,
+    MAP_ID_ROUTE106,
+    MAP_ID_ROUTE107,
+    MAP_ID_ROUTE108,
+    MAP_ID_ROUTE109,
+    MAP_ID_ROUTE110,
+    MAP_ID_ROUTE111,
+    MAP_ID_ROUTE112,
+    MAP_ID_ROUTE113,
+    MAP_ID_ROUTE114,
+    MAP_ID_ROUTE115,
+    MAP_ID_ROUTE116,
+    MAP_ID_ROUTE117,
+    MAP_ID_ROUTE118,
+    MAP_ID_ROUTE119,
+    MAP_ID_ROUTE120,
+    MAP_ID_ROUTE121,
+    MAP_ID_ROUTE122,
+    MAP_ID_ROUTE123,
+    MAP_ID_ROUTE124,
+    MAP_ID_ROUTE125,
+    MAP_ID_ROUTE126,
+    MAP_ID_ROUTE127,
+    MAP_ID_ROUTE128,
+    MAP_ID_ROUTE129,
+    MAP_ID_ROUTE130,
+    MAP_ID_ROUTE131,
+    MAP_ID_ROUTE132,
+    MAP_ID_ROUTE133,
+    MAP_ID_ROUTE134,
+    MAP_ID_UNDERWATER1,
+    MAP_ID_UNDERWATER2,
+    MAP_ID_UNDERWATER3,
+    MAP_ID_UNDERWATER4,
+    MAP_ID_UNDERWATER5,
+    MAP_ID_UNDERWATER6,
+    MAP_ID_UNDERWATER7,
+};
+
+#define MAP_GROUP_PETALBURG_CITY   0
+#define MAP_GROUP_SLATEPORT_CITY   0
+#define MAP_GROUP_MAUVILLE_CITY    0
+#define MAP_GROUP_RUSTBORO_CITY    0
+#define MAP_GROUP_FORTREE_CITY     0
+#define MAP_GROUP_LILYCOVE_CITY    0
+#define MAP_GROUP_MOSSDEEP_CITY    0
+#define MAP_GROUP_SOOTOPOLIS_CITY  0
+#define MAP_GROUP_EVER_GRANDE_CITY 0
+#define MAP_GROUP_LITTLEROOT_TOWN  0
+#define MAP_GROUP_OLDALE_TOWN      0
+#define MAP_GROUP_DEWFORD_TOWN     0
+#define MAP_GROUP_LAVARIDGE_TOWN   0
+#define MAP_GROUP_FALLARBOR_TOWN   0
+#define MAP_GROUP_VERDANTURF_TOWN  0
+#define MAP_GROUP_PACIFIDLOG_TOWN  0
+#define MAP_GROUP_ROUTE101         0
+#define MAP_GROUP_ROUTE102         0
+#define MAP_GROUP_ROUTE103         0
+#define MAP_GROUP_ROUTE104         0
+#define MAP_GROUP_ROUTE105         0
+#define MAP_GROUP_ROUTE106         0
+#define MAP_GROUP_ROUTE107         0
+#define MAP_GROUP_ROUTE108         0
+#define MAP_GROUP_ROUTE109         0
+#define MAP_GROUP_ROUTE110         0
+#define MAP_GROUP_ROUTE111         0
+#define MAP_GROUP_ROUTE112         0
+#define MAP_GROUP_ROUTE113         0
+#define MAP_GROUP_ROUTE114         0
+#define MAP_GROUP_ROUTE115         0
+#define MAP_GROUP_ROUTE116         0
+#define MAP_GROUP_ROUTE117         0
+#define MAP_GROUP_ROUTE118         0
+#define MAP_GROUP_ROUTE119         0
+#define MAP_GROUP_ROUTE120         0
+#define MAP_GROUP_ROUTE121         0
+#define MAP_GROUP_ROUTE122         0
+#define MAP_GROUP_ROUTE123         0
+#define MAP_GROUP_ROUTE124         0
+#define MAP_GROUP_ROUTE125         0
+#define MAP_GROUP_ROUTE126         0
+#define MAP_GROUP_ROUTE127         0
+#define MAP_GROUP_ROUTE128         0
+#define MAP_GROUP_ROUTE129         0
+#define MAP_GROUP_ROUTE130         0
+#define MAP_GROUP_ROUTE131         0
+#define MAP_GROUP_ROUTE132         0
+#define MAP_GROUP_ROUTE133         0
+#define MAP_GROUP_ROUTE134         0
+#define MAP_GROUP_UNDERWATER1      0
+#define MAP_GROUP_UNDERWATER2      0
+#define MAP_GROUP_UNDERWATER3      0
+#define MAP_GROUP_UNDERWATER4      0
+#define MAP_GROUP_UNDERWATER5      0
+#define MAP_GROUP_UNDERWATER6      0
+#define MAP_GROUP_UNDERWATER7      0
+//--------------------------------------------------
+// Map Group 1
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F,
+    MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F,
+    MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_1F,
+    MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_2F,
+    MAP_ID_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB,
+};
+
+#define MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    1
+#define MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F    1
+#define MAP_GROUP_LITTLEROOT_TOWN_MAYS_HOUSE_1F        1
+#define MAP_GROUP_LITTLEROOT_TOWN_MAYS_HOUSE_2F        1
+#define MAP_GROUP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB 1
+
+//--------------------------------------------------
+// Map Group 2
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_OLDALE_TOWN_HOUSE1,
+    MAP_ID_OLDALE_TOWN_HOUSE2,
+    MAP_ID_OLDALE_TOWN_POKEMON_CENTER_1F,
+    MAP_ID_OLDALE_TOWN_POKEMON_CENTER_2F,
+    MAP_ID_OLDALE_TOWN_MART,
+};
+
+#define MAP_GROUP_OLDALE_TOWN_HOUSE1            2
+#define MAP_GROUP_OLDALE_TOWN_HOUSE2            2
+#define MAP_GROUP_OLDALE_TOWN_POKEMON_CENTER_1F 2
+#define MAP_GROUP_OLDALE_TOWN_POKEMON_CENTER_2F 2
+#define MAP_GROUP_OLDALE_TOWN_MART              2
+
+//--------------------------------------------------
+// Map Group 3
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_DEWFORD_TOWN_HOUSE1,
+    MAP_ID_DEWFORD_TOWN_POKEMON_CENTER_1F,
+    MAP_ID_DEWFORD_TOWN_POKEMON_CENTER_2F,
+    MAP_ID_DEWFORD_TOWN_GYM,
+    MAP_ID_DEWFORD_TOWN_HALL,
+    MAP_ID_DEWFORD_TOWN_HOUSE2,
+};
+
+#define MAP_GROUP_DEWFORD_TOWN_HOUSE1            3
+#define MAP_GROUP_DEWFORD_TOWN_POKEMON_CENTER_1F 3
+#define MAP_GROUP_DEWFORD_TOWN_POKEMON_CENTER_2F 3
+#define MAP_GROUP_DEWFORD_TOWN_GYM               3
+#define MAP_GROUP_DEWFORD_TOWN_HALL              3
+#define MAP_GROUP_DEWFORD_TOWN_HOUSE2            3
+
+//--------------------------------------------------
+// Map Group 4
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_LAVARIDGE_TOWN_HERB_SHOP,
+    MAP_ID_LAVARIDGE_TOWN_GYM_1F,
+    MAP_ID_LAVARIDGE_TOWN_GYM_B1F,
+    MAP_ID_LAVARIDGE_TOWN_HOUSE,
+    MAP_ID_LAVARIDGE_TOWN_MART,
+    MAP_ID_LAVARIDGE_TOWN_POKEMON_CENTER_1F,
+    MAP_ID_LAVARIDGE_TOWN_POKEMON_CENTER_2F,
+};
+
+#define MAP_GROUP_LAVARIDGE_TOWN_HERB_SHOP         4
+#define MAP_GROUP_LAVARIDGE_TOWN_GYM_1F            4
+#define MAP_GROUP_LAVARIDGE_TOWN_GYM_B1F           4
+#define MAP_GROUP_LAVARIDGE_TOWN_HOUSE             4
+#define MAP_GROUP_LAVARIDGE_TOWN_MART              4
+#define MAP_GROUP_LAVARIDGE_TOWN_POKEMON_CENTER_1F 4
+#define MAP_GROUP_LAVARIDGE_TOWN_POKEMON_CENTER_2F 4
+
+//--------------------------------------------------
+// Map Group 5
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_FALLARBOR_TOWN_MART,
+    MAP_ID_FALLARBOR_TOWN_TENT_LOBBY,
+    MAP_ID_FALLARBOR_TOWN_TENT_HALL,
+    MAP_ID_FALLARBOR_TOWN_TENT_ARENA,
+    MAP_ID_FALLARBOR_TOWN_POKEMON_CENTER_1F,
+    MAP_ID_FALLARBOR_TOWN_POKEMON_CENTER_2F,
+    MAP_ID_FALLARBOR_TOWN_HOUSE1,
+    MAP_ID_FALLARBOR_TOWN_HOUSE2,
+};
+
+#define MAP_GROUP_FALLARBOR_TOWN_MART              5
+#define MAP_GROUP_FALLARBOR_TOWN_TENT_LOBBY     5
+#define MAP_GROUP_FALLARBOR_TOWN_TENT_HALL          5
+#define MAP_GROUP_FALLARBOR_TOWN_TENT_ARENA          5
+#define MAP_GROUP_FALLARBOR_TOWN_POKEMON_CENTER_1F 5
+#define MAP_GROUP_FALLARBOR_TOWN_POKEMON_CENTER_2F 5
+#define MAP_GROUP_FALLARBOR_TOWN_HOUSE1            5
+#define MAP_GROUP_FALLARBOR_TOWN_HOUSE2            5
+
+//--------------------------------------------------
+// Map Group 6
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_VERDANTURF_TOWN_TENT_LOBBY,
+    MAP_ID_VERDANTURF_TOWN_TENT_HALL,
+    MAP_ID_VERDANTURF_TOWN_TENT_ARENA,
+    MAP_ID_VERDANTURF_TOWN_MART,
+    MAP_ID_VERDANTURF_TOWN_POKEMON_CENTER_1F,
+    MAP_ID_VERDANTURF_TOWN_POKEMON_CENTER_2F,
+    MAP_ID_VERDANTURF_TOWN_WANDAS_HOUSE,
+    MAP_ID_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE,
+    MAP_ID_VERDANTURF_TOWN_HOUSE,
+};
+
+#define MAP_GROUP_VERDANTURF_TOWN_TENT_LOBBY           6
+#define MAP_GROUP_VERDANTURF_TOWN_TENT_HALL            6
+#define MAP_GROUP_VERDANTURF_TOWN_TENT_ARENA            6
+#define MAP_GROUP_VERDANTURF_TOWN_MART                    6
+#define MAP_GROUP_VERDANTURF_TOWN_POKEMON_CENTER_1F       6
+#define MAP_GROUP_VERDANTURF_TOWN_POKEMON_CENTER_2F       6
+#define MAP_GROUP_VERDANTURF_TOWN_WANDAS_HOUSE            6
+#define MAP_GROUP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE 6
+#define MAP_GROUP_VERDANTURF_TOWN_HOUSE                   6
+
+//--------------------------------------------------
+// Map Group 7
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_PACIFIDLOG_TOWN_POKEMON_CENTER_1F,
+    MAP_ID_PACIFIDLOG_TOWN_POKEMON_CENTER_2F,
+    MAP_ID_PACIFIDLOG_TOWN_HOUSE1,
+    MAP_ID_PACIFIDLOG_TOWN_HOUSE2,
+    MAP_ID_PACIFIDLOG_TOWN_HOUSE3,
+    MAP_ID_PACIFIDLOG_TOWN_HOUSE4,
+    MAP_ID_PACIFIDLOG_TOWN_HOUSE5,
+};
+
+#define MAP_GROUP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F 7
+#define MAP_GROUP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F 7
+#define MAP_GROUP_PACIFIDLOG_TOWN_HOUSE1            7
+#define MAP_GROUP_PACIFIDLOG_TOWN_HOUSE2            7
+#define MAP_GROUP_PACIFIDLOG_TOWN_HOUSE3            7
+#define MAP_GROUP_PACIFIDLOG_TOWN_HOUSE4            7
+#define MAP_GROUP_PACIFIDLOG_TOWN_HOUSE5            7
+
+//--------------------------------------------------
+// Map Group 8
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_PETALBURG_CITY_WALLYS_HOUSE,
+    MAP_ID_PETALBURG_CITY_GYM,
+    MAP_ID_PETALBURG_CITY_HOUSE1,
+    MAP_ID_PETALBURG_CITY_HOUSE2,
+    MAP_ID_PETALBURG_CITY_POKEMON_CENTER_1F,
+    MAP_ID_PETALBURG_CITY_POKEMON_CENTER_2F,
+    MAP_ID_PETALBURG_CITY_MART,
+};
+
+#define MAP_GROUP_PETALBURG_CITY_WALLYS_HOUSE      8
+#define MAP_GROUP_PETALBURG_CITY_GYM               8
+#define MAP_GROUP_PETALBURG_CITY_HOUSE1            8
+#define MAP_GROUP_PETALBURG_CITY_HOUSE2            8
+#define MAP_GROUP_PETALBURG_CITY_POKEMON_CENTER_1F 8
+#define MAP_GROUP_PETALBURG_CITY_POKEMON_CENTER_2F 8
+#define MAP_GROUP_PETALBURG_CITY_MART              8
+
+//--------------------------------------------------
+// Map Group 9
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_SLATEPORT_CITY_STERNS_SHIPYARD_1F,
+    MAP_ID_SLATEPORT_CITY_STERNS_SHIPYARD_2F,
+    MAP_ID_SLATEPORT_CITY_TENT_LOBBY,
+    MAP_ID_SLATEPORT_CITY_TENT_HALL,
+    MAP_ID_SLATEPORT_CITY_TENT_ARENA,
+    MAP_ID_SLATEPORT_CITY_HOUSE1,
+    MAP_ID_SLATEPORT_CITY_POKEMON_FAN_CLUB,
+    MAP_ID_SLATEPORT_CITY_OCEANIC_MUSEUM_1F,
+    MAP_ID_SLATEPORT_CITY_OCEANIC_MUSEUM_2F,
+    MAP_ID_SLATEPORT_CITY_HARBOR,
+    MAP_ID_SLATEPORT_CITY_HOUSE2,
+    MAP_ID_SLATEPORT_CITY_POKEMON_CENTER_1F,
+    MAP_ID_SLATEPORT_CITY_POKEMON_CENTER_2F,
+    MAP_ID_SLATEPORT_CITY_MART,
+};
+
+#define MAP_GROUP_SLATEPORT_CITY_STERNS_SHIPYARD_1F 9
+#define MAP_GROUP_SLATEPORT_CITY_STERNS_SHIPYARD_2F 9
+#define MAP_GROUP_SLATEPORT_CITY_TENT_LOBBY      9
+#define MAP_GROUP_SLATEPORT_CITY_TENT_HALL       9
+#define MAP_GROUP_SLATEPORT_CITY_TENT_ARENA       9
+#define MAP_GROUP_SLATEPORT_CITY_HOUSE1             9
+#define MAP_GROUP_SLATEPORT_CITY_POKEMON_FAN_CLUB   9
+#define MAP_GROUP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F  9
+#define MAP_GROUP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F  9
+#define MAP_GROUP_SLATEPORT_CITY_HARBOR             9
+#define MAP_GROUP_SLATEPORT_CITY_HOUSE2             9
+#define MAP_GROUP_SLATEPORT_CITY_POKEMON_CENTER_1F  9
+#define MAP_GROUP_SLATEPORT_CITY_POKEMON_CENTER_2F  9
+#define MAP_GROUP_SLATEPORT_CITY_MART               9
+
+//--------------------------------------------------
+// Map Group 10
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_MAUVILLE_CITY_GYM,
+    MAP_ID_MAUVILLE_CITY_BIKE_SHOP,
+    MAP_ID_MAUVILLE_CITY_HOUSE1,
+    MAP_ID_MAUVILLE_CITY_GAME_CORNER,
+    MAP_ID_MAUVILLE_CITY_HOUSE2,
+    MAP_ID_MAUVILLE_CITY_POKEMON_CENTER_1F,
+    MAP_ID_MAUVILLE_CITY_POKEMON_CENTER_2F,
+    MAP_ID_MAUVILLE_CITY_MART,
+};
+
+#define MAP_GROUP_MAUVILLE_CITY_GYM               10
+#define MAP_GROUP_MAUVILLE_CITY_BIKE_SHOP         10
+#define MAP_GROUP_MAUVILLE_CITY_HOUSE1            10
+#define MAP_GROUP_MAUVILLE_CITY_GAME_CORNER       10
+#define MAP_GROUP_MAUVILLE_CITY_HOUSE2            10
+#define MAP_GROUP_MAUVILLE_CITY_POKEMON_CENTER_1F 10
+#define MAP_GROUP_MAUVILLE_CITY_POKEMON_CENTER_2F 10
+#define MAP_GROUP_MAUVILLE_CITY_MART              10
+
+//--------------------------------------------------
+// Map Group 11
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_RUSTBORO_CITY_DEVON_CORP_1F,
+    MAP_ID_RUSTBORO_CITY_DEVON_CORP_2F,
+    MAP_ID_RUSTBORO_CITY_DEVON_CORP_3F,
+    MAP_ID_RUSTBORO_CITY_GYM,
+    MAP_ID_RUSTBORO_CITY_POKEMON_SCHOOL,
+    MAP_ID_RUSTBORO_CITY_POKEMON_CENTER_1F,
+    MAP_ID_RUSTBORO_CITY_POKEMON_CENTER_2F,
+    MAP_ID_RUSTBORO_CITY_MART,
+    MAP_ID_RUSTBORO_CITY_FLAT1_1F,
+    MAP_ID_RUSTBORO_CITY_FLAT1_2F,
+    MAP_ID_RUSTBORO_CITY_HOUSE1,
+    MAP_ID_RUSTBORO_CITY_CUTTERS_HOUSE,
+    MAP_ID_RUSTBORO_CITY_HOUSE2,
+    MAP_ID_RUSTBORO_CITY_FLAT2_1F,
+    MAP_ID_RUSTBORO_CITY_FLAT2_2F,
+    MAP_ID_RUSTBORO_CITY_FLAT2_3F,
+    MAP_ID_RUSTBORO_CITY_HOUSE3,
+};
+
+#define MAP_GROUP_RUSTBORO_CITY_DEVON_CORP_1F     11
+#define MAP_GROUP_RUSTBORO_CITY_DEVON_CORP_2F     11
+#define MAP_GROUP_RUSTBORO_CITY_DEVON_CORP_3F     11
+#define MAP_GROUP_RUSTBORO_CITY_GYM               11
+#define MAP_GROUP_RUSTBORO_CITY_POKEMON_SCHOOL    11
+#define MAP_GROUP_RUSTBORO_CITY_POKEMON_CENTER_1F 11
+#define MAP_GROUP_RUSTBORO_CITY_POKEMON_CENTER_2F 11
+#define MAP_GROUP_RUSTBORO_CITY_MART              11
+#define MAP_GROUP_RUSTBORO_CITY_FLAT1_1F          11
+#define MAP_GROUP_RUSTBORO_CITY_FLAT1_2F          11
+#define MAP_GROUP_RUSTBORO_CITY_HOUSE1            11
+#define MAP_GROUP_RUSTBORO_CITY_CUTTERS_HOUSE     11
+#define MAP_GROUP_RUSTBORO_CITY_HOUSE2            11
+#define MAP_GROUP_RUSTBORO_CITY_FLAT2_1F          11
+#define MAP_GROUP_RUSTBORO_CITY_FLAT2_2F          11
+#define MAP_GROUP_RUSTBORO_CITY_FLAT2_3F          11
+#define MAP_GROUP_RUSTBORO_CITY_HOUSE3            11
+
+//--------------------------------------------------
+// Map Group 12
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_FORTREE_CITY_HOUSE1,
+    MAP_ID_FORTREE_CITY_GYM,
+    MAP_ID_FORTREE_CITY_POKEMON_CENTER_1F,
+    MAP_ID_FORTREE_CITY_POKEMON_CENTER_2F,
+    MAP_ID_FORTREE_CITY_MART,
+    MAP_ID_FORTREE_CITY_HOUSE2,
+    MAP_ID_FORTREE_CITY_HOUSE3,
+    MAP_ID_FORTREE_CITY_HOUSE4,
+    MAP_ID_FORTREE_CITY_HOUSE5,
+    MAP_ID_FORTREE_CITY_DECORATION_SHOP,
+};
+
+#define MAP_GROUP_FORTREE_CITY_HOUSE1            12
+#define MAP_GROUP_FORTREE_CITY_GYM               12
+#define MAP_GROUP_FORTREE_CITY_POKEMON_CENTER_1F 12
+#define MAP_GROUP_FORTREE_CITY_POKEMON_CENTER_2F 12
+#define MAP_GROUP_FORTREE_CITY_MART              12
+#define MAP_GROUP_FORTREE_CITY_HOUSE2            12
+#define MAP_GROUP_FORTREE_CITY_HOUSE3            12
+#define MAP_GROUP_FORTREE_CITY_HOUSE4            12
+#define MAP_GROUP_FORTREE_CITY_HOUSE5            12
+#define MAP_GROUP_FORTREE_CITY_DECORATION_SHOP   12
+
+//--------------------------------------------------
+// Map Group 13
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_LILYCOVE_CITY_COVE_LILY_MOTEL_1F,
+    MAP_ID_LILYCOVE_CITY_COVE_LILY_MOTEL_2F,
+    MAP_ID_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F,
+    MAP_ID_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F,
+    MAP_ID_LILYCOVE_CITY_CONTEST_LOBBY,
+    MAP_ID_LILYCOVE_CITY_CONTEST_HALL,
+    MAP_ID_LILYCOVE_CITY_POKEMON_CENTER_1F,
+    MAP_ID_LILYCOVE_CITY_POKEMON_CENTER_2F,
+    MAP_ID_LILYCOVE_CITY_UNUSED_MART,
+    MAP_ID_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB,
+    MAP_ID_LILYCOVE_CITY_HARBOR,
+    MAP_ID_LILYCOVE_CITY_MOVE_DELETERS_HOUSE,
+    MAP_ID_LILYCOVE_CITY_HOUSE1,
+    MAP_ID_LILYCOVE_CITY_HOUSE2,
+    MAP_ID_LILYCOVE_CITY_HOUSE3,
+    MAP_ID_LILYCOVE_CITY_HOUSE4,
+    MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_1F,
+    MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_2F,
+    MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_3F,
+    MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_4F,
+    MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_5F,
+    MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP,
+    MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR,
+};
+
+#define MAP_GROUP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F        13
+#define MAP_GROUP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F        13
+#define MAP_GROUP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F        13
+#define MAP_GROUP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F        13
+#define MAP_GROUP_LILYCOVE_CITY_CONTEST_LOBBY             13
+#define MAP_GROUP_LILYCOVE_CITY_CONTEST_HALL              13
+#define MAP_GROUP_LILYCOVE_CITY_POKEMON_CENTER_1F         13
+#define MAP_GROUP_LILYCOVE_CITY_POKEMON_CENTER_2F         13
+#define MAP_GROUP_LILYCOVE_CITY_UNUSED_MART               13
+#define MAP_GROUP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB  13
+#define MAP_GROUP_LILYCOVE_CITY_HARBOR                    13
+#define MAP_GROUP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE       13
+#define MAP_GROUP_LILYCOVE_CITY_HOUSE1                    13
+#define MAP_GROUP_LILYCOVE_CITY_HOUSE2                    13
+#define MAP_GROUP_LILYCOVE_CITY_HOUSE3                    13
+#define MAP_GROUP_LILYCOVE_CITY_HOUSE4                    13
+#define MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_1F       13
+#define MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_2F       13
+#define MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_3F       13
+#define MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_4F       13
+#define MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_5F       13
+#define MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP  13
+#define MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 13
+
+//--------------------------------------------------
+// Map Group 14
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_MOSSDEEP_CITY_GYM,
+    MAP_ID_MOSSDEEP_CITY_HOUSE1,
+    MAP_ID_MOSSDEEP_CITY_HOUSE2,
+    MAP_ID_MOSSDEEP_CITY_POKEMON_CENTER_1F,
+    MAP_ID_MOSSDEEP_CITY_POKEMON_CENTER_2F,
+    MAP_ID_MOSSDEEP_CITY_MART,
+    MAP_ID_MOSSDEEP_CITY_HOUSE3,
+    MAP_ID_MOSSDEEP_CITY_STEVENS_HOUSE,
+    MAP_ID_MOSSDEEP_CITY_HOUSE4,
+    MAP_ID_MOSSDEEP_CITY_SPACE_CENTER_1F,
+    MAP_ID_MOSSDEEP_CITY_SPACE_CENTER_2F,
+    MAP_ID_MOSSDEEP_CITY_GAME_CORNER_1F,
+    MAP_ID_MOSSDEEP_CITY_GAME_CORNER_B1F,
+};
+
+#define MAP_GROUP_MOSSDEEP_CITY_GYM               14
+#define MAP_GROUP_MOSSDEEP_CITY_HOUSE1            14
+#define MAP_GROUP_MOSSDEEP_CITY_HOUSE2            14
+#define MAP_GROUP_MOSSDEEP_CITY_POKEMON_CENTER_1F 14
+#define MAP_GROUP_MOSSDEEP_CITY_POKEMON_CENTER_2F 14
+#define MAP_GROUP_MOSSDEEP_CITY_MART              14
+#define MAP_GROUP_MOSSDEEP_CITY_HOUSE3            14
+#define MAP_GROUP_MOSSDEEP_CITY_STEVENS_HOUSE     14
+#define MAP_GROUP_MOSSDEEP_CITY_HOUSE4            14
+#define MAP_GROUP_MOSSDEEP_CITY_SPACE_CENTER_1F   14
+#define MAP_GROUP_MOSSDEEP_CITY_SPACE_CENTER_2F   14
+#define MAP_GROUP_MOSSDEEP_CITY_GAME_CORNER_1F    14
+#define MAP_GROUP_MOSSDEEP_CITY_GAME_CORNER_B1F   14
+
+//--------------------------------------------------
+// Map Group 15
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_SOOTOPOLIS_CITY_GYM_1F,
+    MAP_ID_SOOTOPOLIS_CITY_GYM_B1F,
+    MAP_ID_SOOTOPOLIS_CITY_POKEMON_CENTER_1F,
+    MAP_ID_SOOTOPOLIS_CITY_POKEMON_CENTER_2F,
+    MAP_ID_SOOTOPOLIS_CITY_MART,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE1,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE2,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE3,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE4,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE5,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE6,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE7,
+    MAP_ID_SOOTOPOLIS_CITY_HOUSE8,
+    MAP_ID_SOOTOPOLIS_CITY_BATTLEHOUSE_1,
+    MAP_ID_SOOTOPOLIS_CITY_BATTLEHOUSE_2,
+};
+
+#define MAP_GROUP_SOOTOPOLIS_CITY_GYM_1F            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_GYM_B1F           15
+#define MAP_GROUP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F 15
+#define MAP_GROUP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F 15
+#define MAP_GROUP_SOOTOPOLIS_CITY_MART              15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE1            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE2            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE3            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE4            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE5            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE6            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE7            15
+#define MAP_GROUP_SOOTOPOLIS_CITY_HOUSE8            15
+#define MAP_ID_SOOTOPOLIS_CITY_BATTLEHOUSE_1        15
+#define MAP_ID_SOOTOPOLIS_CITY_BATTLEHOUSE_2        15
+//--------------------------------------------------
+// Map Group 16
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_EVER_GRANDE_CITY_SIDNEYS_ROOM,
+    MAP_ID_EVER_GRANDE_CITY_PHOEBES_ROOM,
+    MAP_ID_EVER_GRANDE_CITY_GLACIAS_ROOM,
+    MAP_ID_EVER_GRANDE_CITY_DRAKES_ROOM,
+    MAP_ID_EVER_GRANDE_CITY_CHAMPIONS_ROOM,
+    MAP_ID_EVER_GRANDE_CITY_CORRIDOR1,
+    MAP_ID_EVER_GRANDE_CITY_CORRIDOR2,
+    MAP_ID_EVER_GRANDE_CITY_CORRIDOR3,
+    MAP_ID_EVER_GRANDE_CITY_CORRIDOR4,
+    MAP_ID_EVER_GRANDE_CITY_CORRIDOR5,
+    MAP_ID_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
+    MAP_ID_EVER_GRANDE_CITY_HALL_OF_FAME,
+    MAP_ID_EVER_GRANDE_CITY_POKEMON_CENTER_1F,
+    MAP_ID_EVER_GRANDE_CITY_POKEMON_CENTER_2F,
+    MAP_ID_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F,
+};
+
+#define MAP_GROUP_EVER_GRANDE_CITY_SIDNEYS_ROOM      16
+#define MAP_GROUP_EVER_GRANDE_CITY_PHOEBES_ROOM      16
+#define MAP_GROUP_EVER_GRANDE_CITY_GLACIAS_ROOM      16
+#define MAP_GROUP_EVER_GRANDE_CITY_DRAKES_ROOM       16
+#define MAP_GROUP_EVER_GRANDE_CITY_CHAMPIONS_ROOM    16
+#define MAP_GROUP_EVER_GRANDE_CITY_CORRIDOR1         16
+#define MAP_GROUP_EVER_GRANDE_CITY_CORRIDOR2         16
+#define MAP_GROUP_EVER_GRANDE_CITY_CORRIDOR3         16
+#define MAP_GROUP_EVER_GRANDE_CITY_CORRIDOR4         16
+#define MAP_GROUP_EVER_GRANDE_CITY_CORRIDOR5         16
+#define MAP_GROUP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F    16
+#define MAP_GROUP_EVER_GRANDE_CITY_HALL_OF_FAME      16
+#define MAP_GROUP_EVER_GRANDE_CITY_POKEMON_CENTER_1F 16
+#define MAP_GROUP_EVER_GRANDE_CITY_POKEMON_CENTER_2F 16
+#define MAP_GROUP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F    16
+
+//--------------------------------------------------
+// Map Group 17
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE104_MR_BRINEYS_HOUSE,
+    MAP_ID_ROUTE104_PRETTY_PETAL_FLOWER_SHOP,
+};
+
+#define MAP_GROUP_ROUTE104_MR_BRINEYS_HOUSE         17
+#define MAP_GROUP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP 17
+
+//--------------------------------------------------
+// Map Group 18
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE111_WINSTRATE_FAMILYS_HOUSE,
+    MAP_ID_ROUTE111_OLD_LADYS_REST_STOP,
+};
+
+#define MAP_GROUP_ROUTE111_WINSTRATE_FAMILYS_HOUSE 18
+#define MAP_GROUP_ROUTE111_OLD_LADYS_REST_STOP     18
+
+//--------------------------------------------------
+// Map Group 19
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE112_CABLE_CAR_STATION,
+    MAP_ID_MT_CHIMNEY_CABLE_CAR_STATION,
+};
+
+#define MAP_GROUP_ROUTE112_CABLE_CAR_STATION   19
+#define MAP_GROUP_MT_CHIMNEY_CABLE_CAR_STATION 19
+
+//--------------------------------------------------
+// Map Group 20
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE114_FOSSIL_MANIACS_HOUSE,
+    MAP_ID_ROUTE114_FOSSIL_MANIACS_TUNNEL,
+    MAP_ID_ROUTE114_LANETTES_HOUSE,
+};
+
+#define MAP_GROUP_ROUTE114_FOSSIL_MANIACS_HOUSE  20
+#define MAP_GROUP_ROUTE114_FOSSIL_MANIACS_TUNNEL 20
+#define MAP_GROUP_ROUTE114_LANETTES_HOUSE        20
+
+//--------------------------------------------------
+// Map Group 21
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE116_TUNNELERS_REST_HOUSE,
+};
+
+#define MAP_GROUP_ROUTE116_TUNNELERS_REST_HOUSE 21
+
+//--------------------------------------------------
+// Map Group 22
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE117_POKEMON_DAY_CARE,
+};
+
+#define MAP_GROUP_ROUTE117_POKEMON_DAY_CARE 22
+
+//--------------------------------------------------
+// Map Group 23
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE121_SAFARI_ZONE_ENTRANCE,
+};
+
+#define MAP_GROUP_ROUTE121_SAFARI_ZONE_ENTRANCE 23
+
+//--------------------------------------------------
+// Map Group 24
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_METEOR_FALLS_1F_1R,
+    MAP_ID_METEOR_FALLS_1F_2R,
+    MAP_ID_METEOR_FALLS_B1F_1R,
+    MAP_ID_METEOR_FALLS_B1F_2R,
+    MAP_ID_RUSTURF_TUNNEL,
+    MAP_ID_UNDERWATER_SOOTOPOLIS_CITY,
+    MAP_ID_DESERT_RUINS,
+    MAP_ID_GRANITE_CAVE_1F,
+    MAP_ID_GRANITE_CAVE_B1F,
+    MAP_ID_GRANITE_CAVE_B2F,
+    MAP_ID_GRANITE_CAVE_STEVENS_ROOM,
+    MAP_ID_PETALBURG_WOODS,
+    MAP_ID_MT_CHIMNEY,
+    MAP_ID_JAGGED_PASS,
+    MAP_ID_FIERY_PATH,
+    MAP_ID_MT_PYRE_1F,
+    MAP_ID_MT_PYRE_2F,
+    MAP_ID_MT_PYRE_3F,
+    MAP_ID_MT_PYRE_4F,
+    MAP_ID_MT_PYRE_5F,
+    MAP_ID_MT_PYRE_6F,
+    MAP_ID_MT_PYRE_EXTERIOR,
+    MAP_ID_MT_PYRE_SUMMIT,
+    MAP_ID_AQUA_HIDEOUT_1F,
+    MAP_ID_AQUA_HIDEOUT_B1F,
+    MAP_ID_AQUA_HIDEOUT_B2F,
+    MAP_ID_UNDERWATER_SEAFLOOR_CAVERN,
+    MAP_ID_SEAFLOOR_CAVERN_ENTRANCE,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM1,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM2,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM3,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM4,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM5,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM6,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM7,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM8,
+    MAP_ID_SEAFLOOR_CAVERN_ROOM9,
+    MAP_ID_CAVE_OF_ORIGIN_ENTRANCE,
+    MAP_ID_CAVE_OF_ORIGIN_1F,
+    MAP_ID_CAVE_OF_ORIGIN_B1F,
+    MAP_ID_CAVE_OF_ORIGIN_B2F,
+    MAP_ID_CAVE_OF_ORIGIN_B3F,
+    MAP_ID_CAVE_OF_ORIGIN_B4F,
+    MAP_ID_VICTORY_ROAD_1F,
+    MAP_ID_VICTORY_ROAD_B1F,
+    MAP_ID_VICTORY_ROAD_B2F,
+    MAP_ID_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM,
+    MAP_ID_SHOAL_CAVE_LOW_TIDE_INNER_ROOM,
+    MAP_ID_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM,
+    MAP_ID_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM,
+    MAP_ID_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM,
+    MAP_ID_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM,
+    MAP_ID_NEW_MAUVILLE_ENTRANCE,
+    MAP_ID_NEW_MAUVILLE_INSIDE,
+    MAP_ID_ABANDONED_SHIP_DECK,
+    MAP_ID_ABANDONED_SHIP_CORRIDORS_1F,
+    MAP_ID_ABANDONED_SHIP_ROOMS_1F,
+    MAP_ID_ABANDONED_SHIP_CORRIDORS_B1F,
+    MAP_ID_ABANDONED_SHIP_ROOMS_B1F,
+    MAP_ID_ABANDONED_SHIP_ROOMS2_B1F,
+    MAP_ID_ABANDONED_SHIP_UNDERWATER1,
+    MAP_ID_ABANDONED_SHIP_ROOM_B1F,
+    MAP_ID_ABANDONED_SHIP_ROOMS2_1F,
+    MAP_ID_ABANDONED_SHIP_CAPTAINS_OFFICE,
+    MAP_ID_ABANDONED_SHIP_UNDERWATER2,
+    MAP_ID_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS,
+    MAP_ID_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS,
+    MAP_ID_ISLAND_CAVE,
+    MAP_ID_ANCIENT_TOMB,
+    MAP_ID_UNDERWATER_ROUTE134,
+    MAP_ID_UNDERWATER_SEALED_CHAMBER,
+    MAP_ID_SEALED_CHAMBER_OUTER_ROOM,
+    MAP_ID_SEALED_CHAMBER_INNER_ROOM,
+    MAP_ID_SCORCHED_SLAB,
+    MAP_ID_UNUSED_AQUA_HIDEOUT_1F,
+    MAP_ID_UNUSED_AQUA_HIDEOUT_B1F,
+    MAP_ID_UNUSED_AQUA_HIDEOUT_B2F,
+    MAP_ID_SKY_PILLAR_ENTRANCE,
+    MAP_ID_SKY_PILLAR_OUTSIDE,
+    MAP_ID_SKY_PILLAR_1F,
+    MAP_ID_SKY_PILLAR_2F,
+    MAP_ID_SKY_PILLAR_3F,
+    MAP_ID_SKY_PILLAR_4F,
+    MAP_ID_SHOAL_CAVE_LOW_TIDE_ICE_ROOM,
+    MAP_ID_SKY_PILLAR_5F,
+    MAP_ID_SKY_PILLAR_TOP,
+    MAP_ID_MAGMA_HIDEOUT_ENTRANCE,
+    MAP_ID_MAGMA_HIDEOUT_B1F,
+    MAP_ID_MAGMA_HIDEOUT_B2F,
+    MAP_ID_MAGMA_HIDEOUT_B3F,
+    MAP_ID_MAGMA_HIDEOUT_B4F,
+    MAP_ID_MAGMA_HIDEOUT_B5F,
+    MAP_ID_MAGMA_HIDEOUT_B6F,
+    MAP_ID_MAGMA_HIDEOUT_B7F,
+    MAP_ID_MIRAGE_TOWER_1F,
+    MAP_ID_MIRAGE_TOWER_2F,
+    MAP_ID_MIRAGE_TOWER_3F,
+    MAP_ID_MIRAGE_TOWER_4F,
+    MAP_ID_DESERT_UNDERPASS,
+    MAP_ID_ARTISAN_CAVE_1F,
+    MAP_ID_ARTISAN_CAVE_2F,
+    MAP_ID_UNKNOWN_UNDERWATER,
+    MAP_ID_MARINE_CAVE_1F,
+    MAP_ID_MARINE_CAVE_2F,
+    MAP_ID_TERRA_CAVE_1F,
+    MAP_ID_TERRA_CAVE_2F,
+    MAP_ID_ALTERING_CAVE,
+    MAP_ID_METEOR_FALLS_B1F_3R,
+};
+
+#define MAP_GROUP_METEOR_FALLS_1F_1R                    24
+#define MAP_GROUP_METEOR_FALLS_1F_2R                    24
+#define MAP_GROUP_METEOR_FALLS_B1F_1R                   24
+#define MAP_GROUP_METEOR_FALLS_B1F_2R                   24
+#define MAP_GROUP_RUSTURF_TUNNEL                        24
+#define MAP_GROUP_UNDERWATER_SOOTOPOLIS_CITY            24
+#define MAP_GROUP_DESERT_RUINS                          24
+#define MAP_GROUP_GRANITE_CAVE_1F                       24
+#define MAP_GROUP_GRANITE_CAVE_B1F                      24
+#define MAP_GROUP_GRANITE_CAVE_B2F                      24
+#define MAP_GROUP_GRANITE_CAVE_STEVENS_ROOM             24
+#define MAP_GROUP_PETALBURG_WOODS                       24
+#define MAP_GROUP_MT_CHIMNEY                            24
+#define MAP_GROUP_JAGGED_PASS                           24
+#define MAP_GROUP_FIERY_PATH                            24
+#define MAP_GROUP_MT_PYRE_1F                            24
+#define MAP_GROUP_MT_PYRE_2F                            24
+#define MAP_GROUP_MT_PYRE_3F                            24
+#define MAP_GROUP_MT_PYRE_4F                            24
+#define MAP_GROUP_MT_PYRE_5F                            24
+#define MAP_GROUP_MT_PYRE_6F                            24
+#define MAP_GROUP_MT_PYRE_EXTERIOR                      24
+#define MAP_GROUP_MT_PYRE_SUMMIT                        24
+#define MAP_GROUP_AQUA_HIDEOUT_1F                       24
+#define MAP_GROUP_AQUA_HIDEOUT_B1F                      24
+#define MAP_GROUP_AQUA_HIDEOUT_B2F                      24
+#define MAP_GROUP_UNDERWATER_SEAFLOOR_CAVERN            24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ENTRANCE              24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM1                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM2                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM3                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM4                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM5                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM6                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM7                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM8                 24
+#define MAP_GROUP_SEAFLOOR_CAVERN_ROOM9                 24
+#define MAP_GROUP_CAVE_OF_ORIGIN_ENTRANCE               24
+#define MAP_GROUP_CAVE_OF_ORIGIN_1F                     24
+#define MAP_GROUP_CAVE_OF_ORIGIN_B1F                    24
+#define MAP_GROUP_CAVE_OF_ORIGIN_B2F                    24
+#define MAP_GROUP_CAVE_OF_ORIGIN_B3F                    24
+#define MAP_GROUP_CAVE_OF_ORIGIN_B4F                    24
+#define MAP_GROUP_VICTORY_ROAD_1F                       24
+#define MAP_GROUP_VICTORY_ROAD_B1F                      24
+#define MAP_GROUP_VICTORY_ROAD_B2F                      24
+#define MAP_GROUP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM     24
+#define MAP_GROUP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM        24
+#define MAP_GROUP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM       24
+#define MAP_GROUP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM        24
+#define MAP_GROUP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM    24
+#define MAP_GROUP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM       24
+#define MAP_GROUP_NEW_MAUVILLE_ENTRANCE                 24
+#define MAP_GROUP_NEW_MAUVILLE_INSIDE                   24
+#define MAP_GROUP_ABANDONED_SHIP_DECK                   24
+#define MAP_GROUP_ABANDONED_SHIP_CORRIDORS_1F           24
+#define MAP_GROUP_ABANDONED_SHIP_ROOMS_1F               24
+#define MAP_GROUP_ABANDONED_SHIP_CORRIDORS_B1F          24
+#define MAP_GROUP_ABANDONED_SHIP_ROOMS_B1F              24
+#define MAP_GROUP_ABANDONED_SHIP_ROOMS2_B1F             24
+#define MAP_GROUP_ABANDONED_SHIP_UNDERWATER1            24
+#define MAP_GROUP_ABANDONED_SHIP_ROOM_B1F               24
+#define MAP_GROUP_ABANDONED_SHIP_ROOMS2_1F              24
+#define MAP_GROUP_ABANDONED_SHIP_CAPTAINS_OFFICE        24
+#define MAP_GROUP_ABANDONED_SHIP_UNDERWATER2            24
+#define MAP_GROUP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 24
+#define MAP_GROUP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS     24
+#define MAP_GROUP_ISLAND_CAVE                           24
+#define MAP_GROUP_ANCIENT_TOMB                          24
+#define MAP_GROUP_UNDERWATER_ROUTE134                   24
+#define MAP_GROUP_UNDERWATER_SEALED_CHAMBER             24
+#define MAP_GROUP_SEALED_CHAMBER_OUTER_ROOM             24
+#define MAP_GROUP_SEALED_CHAMBER_INNER_ROOM             24
+#define MAP_GROUP_SCORCHED_SLAB                         24
+#define MAP_GROUP_UNUSED_AQUA_HIDEOUT_1F                24
+#define MAP_GROUP_UNUSED_AQUA_HIDEOUT_B1F               24
+#define MAP_GROUP_UNUSED_AQUA_HIDEOUT_B2F               24
+#define MAP_GROUP_SKY_PILLAR_ENTRANCE                   24
+#define MAP_GROUP_SKY_PILLAR_OUTSIDE                    24
+#define MAP_GROUP_SKY_PILLAR_1F                         24
+#define MAP_GROUP_SKY_PILLAR_2F                         24
+#define MAP_GROUP_SKY_PILLAR_3F                         24
+#define MAP_GROUP_SKY_PILLAR_4F                         24
+#define MAP_GROUP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM          24
+#define MAP_GROUP_SKY_PILLAR_5F                         24
+#define MAP_GROUP_SKY_PILLAR_TOP                        24
+#define MAP_GROUP_MAGMA_HIDEOUT_ENTRANCE                24
+#define MAP_GROUP_MAGMA_HIDEOUT_B1F                     24
+#define MAP_GROUP_MAGMA_HIDEOUT_B2F                     24
+#define MAP_GROUP_MAGMA_HIDEOUT_B3F                     24
+#define MAP_GROUP_MAGMA_HIDEOUT_B4F                     24
+#define MAP_GROUP_MAGMA_HIDEOUT_B5F                     24
+#define MAP_GROUP_MAGMA_HIDEOUT_B6F                     24
+#define MAP_GROUP_MAGMA_HIDEOUT_B7F                     24
+#define MAP_GROUP_MIRAGE_TOWER_1F                       24
+#define MAP_GROUP_MIRAGE_TOWER_2F                       24
+#define MAP_GROUP_MIRAGE_TOWER_3F                       24
+#define MAP_GROUP_MIRAGE_TOWER_4F                       24
+#define MAP_GROUP_DESERT_UNDERPASS                      24
+#define MAP_GROUP_ARTISAN_CAVE_1F                       24
+#define MAP_GROUP_ARTISAN_CAVE_2F                       24
+#define MAP_GROUP_UNKNOWN_UNDERWATER                    24
+#define MAP_GROUP_MARINE_CAVE_1F                        24
+#define MAP_GROUP_MARINE_CAVE_2F                        24
+#define MAP_GROUP_TERRA_CAVE_1F                         24
+#define MAP_GROUP_TERRA_CAVE_2F                         24
+#define MAP_GROUP_ALTERING_CAVE                         24
+#define MAP_GROUP_METEOR_FALLS_B1F_3R                   24
+
+//--------------------------------------------------
+// Map Group 25
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_SECRET_BASE_RED_CAVE1,
+    MAP_ID_SECRET_BASE_BROWN_CAVE1,
+    MAP_ID_SECRET_BASE_BLUE_CAVE1,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE1,
+    MAP_ID_SECRET_BASE_TREE1,
+    MAP_ID_SECRET_BASE_SHRUB1,
+    MAP_ID_SECRET_BASE_RED_CAVE2,
+    MAP_ID_SECRET_BASE_BROWN_CAVE2,
+    MAP_ID_SECRET_BASE_BLUE_CAVE2,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE2,
+    MAP_ID_SECRET_BASE_TREE2,
+    MAP_ID_SECRET_BASE_SHRUB2,
+    MAP_ID_SECRET_BASE_RED_CAVE3,
+    MAP_ID_SECRET_BASE_BROWN_CAVE3,
+    MAP_ID_SECRET_BASE_BLUE_CAVE3,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE3,
+    MAP_ID_SECRET_BASE_TREE3,
+    MAP_ID_SECRET_BASE_SHRUB3,
+    MAP_ID_SECRET_BASE_RED_CAVE4,
+    MAP_ID_SECRET_BASE_BROWN_CAVE4,
+    MAP_ID_SECRET_BASE_BLUE_CAVE4,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE4,
+    MAP_ID_SECRET_BASE_TREE4,
+    MAP_ID_SECRET_BASE_SHRUB4,
+    MAP_ID_SINGLE_BATTLE_COLOSSEUM,
+    MAP_ID_TRADE_CENTER,
+    MAP_ID_RECORD_CORNER,
+    MAP_ID_DOUBLE_BATTLE_COLOSSEUM,
+    MAP_ID_LINK_CONTEST_ROOM1,
+    MAP_ID_UNKNOWN_MAP_25_29,
+    MAP_ID_UNKNOWN_MAP_25_30,
+    MAP_ID_UNKNOWN_MAP_25_31,
+    MAP_ID_UNKNOWN_MAP_25_32,
+    MAP_ID_UNKNOWN_MAP_25_33,
+    MAP_ID_UNKNOWN_MAP_25_34,
+    MAP_ID_LINK_CONTEST_ROOM2,
+    MAP_ID_LINK_CONTEST_ROOM3,
+    MAP_ID_LINK_CONTEST_ROOM4,
+    MAP_ID_LINK_CONTEST_ROOM5,
+    MAP_ID_LINK_CONTEST_ROOM6,
+    MAP_ID_INSIDE_OF_TRUCK,
+    MAP_ID_SS_TIDAL_CORRIDOR,
+    MAP_ID_SS_TIDAL_LOWER_DECK,
+    MAP_ID_SS_TIDAL_ROOMS,
+    MAP_ID_TEST_ROOM_1,
+    MAP_ID_TEST_ROOM_2,
+    MAP_ID_TEST_ROOM_3,
+    MAP_ID_TEST_ROOM_4,
+    MAP_ID_TEST_ROOM_5,
+    MAP_ID_TEST_ROOM_6,
+    MAP_ID_TEST_ROOM_7,
+    MAP_ID_TEST_ROOM_8,
+    MAP_ID_TEST_ROOM_9,
+    MAP_ID_TEST_ROOM_10,
+    MAP_ID_TEST_ROOM_11,
+    MAP_ID_TEST_ROOM_12,
+    MAP_ID_TEST_ROOM_13,
+    MAP_ID_TEST_ROOM_14,
+    MAP_ID_TEST_ROOM_15,
+    MAP_ID_TEST_ROOM_16,
+    MAP_ID_UNION_ROOM,
+};
+
+#define MAP_GROUP_SECRET_BASE_RED_CAVE1    25
+#define MAP_GROUP_SECRET_BASE_BROWN_CAVE1  25
+#define MAP_GROUP_SECRET_BASE_BLUE_CAVE1   25
+#define MAP_GROUP_SECRET_BASE_YELLOW_CAVE1 25
+#define MAP_GROUP_SECRET_BASE_TREE1        25
+#define MAP_GROUP_SECRET_BASE_SHRUB1       25
+#define MAP_GROUP_SECRET_BASE_RED_CAVE2    25
+#define MAP_GROUP_SECRET_BASE_BROWN_CAVE2  25
+#define MAP_GROUP_SECRET_BASE_BLUE_CAVE2   25
+#define MAP_GROUP_SECRET_BASE_YELLOW_CAVE2 25
+#define MAP_GROUP_SECRET_BASE_TREE2        25
+#define MAP_GROUP_SECRET_BASE_SHRUB2       25
+#define MAP_GROUP_SECRET_BASE_RED_CAVE3    25
+#define MAP_GROUP_SECRET_BASE_BROWN_CAVE3  25
+#define MAP_GROUP_SECRET_BASE_BLUE_CAVE3   25
+#define MAP_GROUP_SECRET_BASE_YELLOW_CAVE3 25
+#define MAP_GROUP_SECRET_BASE_TREE3        25
+#define MAP_GROUP_SECRET_BASE_SHRUB3       25
+#define MAP_GROUP_SECRET_BASE_RED_CAVE4    25
+#define MAP_GROUP_SECRET_BASE_BROWN_CAVE4  25
+#define MAP_GROUP_SECRET_BASE_BLUE_CAVE4   25
+#define MAP_GROUP_SECRET_BASE_YELLOW_CAVE4 25
+#define MAP_GROUP_SECRET_BASE_TREE4        25
+#define MAP_GROUP_SECRET_BASE_SHRUB4       25
+#define MAP_GROUP_SINGLE_BATTLE_COLOSSEUM  25
+#define MAP_GROUP_TRADE_CENTER             25
+#define MAP_GROUP_RECORD_CORNER            25
+#define MAP_GROUP_DOUBLE_BATTLE_COLOSSEUM  25
+#define MAP_GROUP_LINK_CONTEST_ROOM1       25
+#define MAP_GROUP_UNKNOWN_MAP_25_29        25
+#define MAP_GROUP_UNKNOWN_MAP_25_30        25
+#define MAP_GROUP_UNKNOWN_MAP_25_31        25
+#define MAP_GROUP_UNKNOWN_MAP_25_32        25
+#define MAP_GROUP_UNKNOWN_MAP_25_33        25
+#define MAP_GROUP_UNKNOWN_MAP_25_34        25
+#define MAP_GROUP_LINK_CONTEST_ROOM2       25
+#define MAP_GROUP_LINK_CONTEST_ROOM3       25
+#define MAP_GROUP_LINK_CONTEST_ROOM4       25
+#define MAP_GROUP_LINK_CONTEST_ROOM5       25
+#define MAP_GROUP_LINK_CONTEST_ROOM6       25
+#define MAP_GROUP_INSIDE_OF_TRUCK          25
+#define MAP_GROUP_SS_TIDAL_CORRIDOR        25
+#define MAP_GROUP_SS_TIDAL_LOWER_DECK      25
+#define MAP_GROUP_SS_TIDAL_ROOMS           25
+#define MAP_GROUP_TEST_ROOM_1              25
+#define MAP_GROUP_TEST_ROOM_2              25
+#define MAP_GROUP_TEST_ROOM_3              25
+#define MAP_GROUP_TEST_ROOM_4              25
+#define MAP_GROUP_TEST_ROOM_5              25
+#define MAP_GROUP_TEST_ROOM_6              25
+#define MAP_GROUP_TEST_ROOM_7              25
+#define MAP_GROUP_TEST_ROOM_8              25
+#define MAP_GROUP_TEST_ROOM_9              25
+#define MAP_GROUP_TEST_ROOM_10             25
+#define MAP_GROUP_TEST_ROOM_11             25
+#define MAP_GROUP_TEST_ROOM_12             25
+#define MAP_GROUP_TEST_ROOM_13             25
+#define MAP_GROUP_TEST_ROOM_14             25
+#define MAP_GROUP_TEST_ROOM_15             25
+#define MAP_GROUP_TEST_ROOM_16             25
+#define MAP_GROUP_UNION_ROOM               25
+//--------------------------------------------------
+// Map Group 26
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_SAFARI_ZONE_NORTHWEST,
+    MAP_ID_SAFARI_ZONE_NORTHEAST,
+    MAP_ID_SAFARI_ZONE_SOUTHWEST,
+    MAP_ID_SAFARI_ZONE_SOUTHEAST,
+    MAP_ID_BATTLE_FRONTIER_OUTSIDE_WEST,
+    MAP_ID_BATTLE_TOWER_LOBBY,
+    MAP_ID_BATTLE_TOWER_ELEVATOR,
+    MAP_ID_BATTLE_TOWER_CORRIDOR,
+    MAP_ID_BATTLE_TOWER_BATTLE_ROOM,
+    MAP_ID_SOUTHERN_ISLAND_EXTERIOR,
+    MAP_ID_SOUTHERN_ISLAND_INTERIOR,
+    MAP_ID_SAFARI_ZONE_REST_HOUSE,
+    MAP_ID_SAFARI_ZONE_EM_1,
+    MAP_ID_SAFARI_ZONE_EM_2,
+    MAP_ID_BATTLE_FRONTIER_OUTSIDE_EAST,
+    MAP_ID_BATTLE_FRONTIER_TAG_LINK,
+    MAP_ID_BATTLE_FRONTIER_TAG_LINK_CORRIDOR,
+    MAP_ID_BATTLE_FRONTIER_TAG_LINK_ARENA,
+    MAP_ID_BATTLE_DOME_LOBBY,
+    MAP_ID_BATTLE_DOME_CORRIDOR,
+    MAP_ID_BATTLE_DOME_ROOM,
+    MAP_ID_BATTLE_DOME_ARENA,
+    MAP_ID_BATTLE_PALACE_LOBBY,
+    MAP_ID_BATTLE_PALACE_CORRIDOR,
+    MAP_ID_BATTLE_PALACE_1F,
+    MAP_ID_BATTLE_PYRAMID_LOBBY,
+    MAP_ID_BATTLE_PYRAMID_UNKNOWN,
+    MAP_ID_BATTLE_PYRAMID_PEAK,
+    MAP_ID_BATTLE_ARENA_LOBBY,
+    MAP_ID_BATTLE_ARENA_CORRIDOR,
+    MAP_ID_BATTLE_ARENA_ARENA, 
+    MAP_ID_BATTLE_FACTORY_LOBBY,
+    MAP_ID_BATTLE_FACTORY_CORRIDOR,
+    MAP_ID_BATTLE_FACTORY_ARENA,
+    MAP_ID_BATTLE_PALACE_2F,
+    MAP_ID_BATTLE_PALACE_3F,
+    MAP_ID_BATTLE_PALACE_4F,
+    MAP_ID_BATTLE_PALACE_5F,
+    MAP_ID_BATTLE_PALACE_6F,
+    MAP_ID_BATTLE_PALACE_TEST_ROOM,
+    MAP_ID_RANKING_HALL,
+    MAP_ID_STAT_RATER_HOUSE,
+    MAP_ID_BATTLE_FRONTIER_EXCHANGE,
+    MAP_ID_BATTLE_FRONTIER_MANIAC_HOUSE,
+    MAP_ID_BATTLE_FRONTIER_GAMBLING_HOUSE,
+    MAP_ID_BATTLE_FRONTIER_HOUSE1,
+    MAP_ID_BATTLE_FRONTIER_SCOTTS_HOUSE,
+    MAP_ID_BATTLE_FRONTIER_HOUSE2,
+    MAP_ID_BATTLE_FRONTIER_HOUSE3, 
+    MAP_ID_BATTLE_FRONTIER_HOUSE4,
+    MAP_ID_BATTLE_FRONTIER_ENTRANCE_HALL,
+    MAP_ID_BATTLE_FRONTIER_HOUSE5,
+    MAP_ID_BATTLE_FRONTIER_UNUSED_HOUSE,
+    MAP_ID_BATTLE_FRONTIER_POKEMON_CENTER_1F,
+    MAP_ID_BATTLE_FRONTIER_POKEMON_CENTER_2F,
+    MAP_ID_BATTLE_FRONTIER_MART,
+    MAP_ID_FARAWAY_ISLAND_OUTSIDE,
+    MAP_ID_FARAWAY_ISLAND_FOREST,
+    MAP_ID_BIRTH_ISLAND_OUTSIDE,
+    MAP_ID_BIRTH_ISLAND_DOCKS,
+    MAP_ID_TRAINER_HILL_LOBBY,
+    MAP_ID_TRAINER_HILL_1F,
+    MAP_ID_TRAINER_HILL_2F,
+    MAP_ID_TRAINER_HILL_3F,
+    MAP_ID_TRAINER_HILL_4F,
+    MAP_ID_TRAINER_HILL_5F,
+    MAP_ID_NAVEL_ROCK_OUTSIDE,
+    MAP_ID_NAVEL_ROCK_DOCKS,
+    MAP_ID_NAVEL_ROCK_1F,
+    MAP_ID_NAVEL_ROCK_2F,
+    MAP_ID_NAVEL_ROCK_3F,
+    MAP_ID_NAVEL_ROCK_4F,
+    MAP_ID_NAVEL_ROCK_5F,
+    MAP_ID_NAVEL_ROCK_6F,
+    MAP_ID_NAVEL_ROCK_7F,
+    MAP_ID_NAVEL_ROCK_PEAK,
+    MAP_ID_NAVEL_ROCK_B1F,
+    MAP_ID_NAVEL_ROCK_B2F,
+    MAP_ID_NAVEL_ROCK_B3F,
+    MAP_ID_NAVEL_ROCK_B4F,
+    MAP_ID_NAVEL_ROCK_B5F,
+    MAP_ID_NAVEL_ROCK_B6F,
+    MAP_ID_NAVEL_ROCK_B7F,
+    MAP_ID_NAVEL_ROCK_B8F,
+    MAP_ID_NAVEL_ROCK_B9F,
+    MAP_ID_NAVEL_ROCK_B10F,
+    MAP_ID_NAVEL_ROCK_B11F,
+    MAP_ID_NAVEL_ROCK_INNER,
+    MAP_ID_TRAINER_HILL_ELEVATOR,
+};
+
+#define MAP_GROUP_SAFARI_ZONE_NORTHWEST    26
+#define MAP_GROUP_SAFARI_ZONE_NORTHEAST    26
+#define MAP_GROUP_SAFARI_ZONE_SOUTHWEST    26
+#define MAP_GROUP_SAFARI_ZONE_SOUTHEAST    26
+#define MAP_GROUP_BATTLE_FRONTIER_OUTSIDE_WEST     26
+#define MAP_GROUP_BATTLE_TOWER_LOBBY       26
+#define MAP_GROUP_BATTLE_TOWER_ELEVATOR    26
+#define MAP_GROUP_BATTLE_TOWER_CORRIDOR    26
+#define MAP_GROUP_BATTLE_TOWER_BATTLE_ROOM 26
+#define MAP_GROUP_SOUTHERN_ISLAND_EXTERIOR 26
+#define MAP_GROUP_SOUTHERN_ISLAND_INTERIOR 26
+#define MAP_GROUP_SAFARI_ZONE_REST_HOUSE               26
+#define MAP_GROUP_SAFARI_ZONE_EM_1                    26
+#define MAP_GROUP_SAFARI_ZONE_EM_2                    26
+#define MAP_GROUP_BATTLE_FRONTIER_OUTSIDE_EAST         26
+#define MAP_GROUP_BATTLE_FRONTIER_TAG_LINK             26
+#define MAP_GROUP_BATTLE_FRONTIER_TAG_LINK_CORRIDOR 26
+#define MAP_GROUP_BATTLE_FRONTIER_TAG_LINK_ARENA     26
+#define MAP_GROUP_BATTLE_DOME_LOBBY                    26
+#define MAP_GROUP_BATTLE_DOME_CORRIDOR                26
+#define MAP_GROUP_BATTLE_DOME_ROOM                    26
+#define MAP_GROUP_BATTLE_DOME_ARENA                    26
+#define MAP_GROUP_BATTLE_PALACE_LOBBY                26
+#define MAP_GROUP_BATTLE_PALACE_CORRIDOR            26
+#define MAP_GROUP_BATTLE_PALACE_1F                    26
+#define MAP_GROUP_BATTLE_PYRAMID_LOBBY                26
+#define MAP_GROUP_BATTLE_PYRAMID_UNKNOWN            26
+#define MAP_GROUP_BATTLE_PYRAMID_PEAK                26
+#define MAP_GROUP_BATTLE_ARENA_LOBBY                26
+#define MAP_GROUP_BATTLE_ARENA_CORRIDOR                26
+#define MAP_GROUP_BATTLE_ARENA_ARENA                26 // rename 
+#define MAP_GROUP_BATTLE_FACTORY_LOBBY                26
+#define MAP_GROUP_BATTLE_FACTORY_CORRIDOR            26
+#define MAP_GROUP_BATTLE_FACTORY_ARENA                26
+#define MAP_GROUP_BATTLE_PALACE_2F                    26
+#define MAP_GROUP_BATTLE_PALACE_3F                    26
+#define MAP_GROUP_BATTLE_PALACE_4F                    26
+#define MAP_GROUP_BATTLE_PALACE_5F                    26
+#define MAP_GROUP_BATTLE_PALACE_6F                    26
+#define MAP_GROUP_BATTLE_PALACE_TEST_ROOM            26
+#define MAP_GROUP_RANKING_HALL                    26
+#define MAP_GROUP_STAT_RATER_HOUSE            26
+#define MAP_GROUP_BATTLE_FRONTIER_EXCHANGE            26
+#define MAP_GROUP_BATTLE_FRONTIER_MANIAC_HOUSE            26
+#define MAP_GROUP_BATTLE_FRONTIER_GAMBLING_HOUSE            26
+#define MAP_GROUP_BATTLE_FRONTIER_HOUSE1            26
+#define MAP_GROUP_BATTLE_FRONTIER_SCOTTS_HOUSE            26
+#define MAP_GROUP_BATTLE_FRONTIER_HOUSE2            26
+#define MAP_GROUP_BATTLE_FRONTIER_HOUSE3            26 
+#define MAP_GROUP_BATTLE_FRONTIER_HOUSE4            26
+#define MAP_GROUP_BATTLE_FRONTIER_ENTRANCE_HALL            26
+#define MAP_GROUP_BATTLE_FRONTIER_HOUSE5            26
+#define MAP_GROUP_BATTLE_FRONTIER_UNUSED_HOUSE            26
+#define MAP_GROUP_BATTLE_FRONTIER_POKEMON_CENTER_1F            26
+#define MAP_GROUP_BATTLE_FRONTIER_POKEMON_CENTER_2F            26
+#define MAP_GROUP_BATTLE_FRONTIER_MART            26
+#define MAP_GROUP_FARAWAY_ISLAND_OUTSIDE            26
+#define MAP_GROUP_FARAWAY_ISLAND_FOREST            26
+#define MAP_GROUP_BIRTH_ISLAND_OUTSIDE            26
+#define MAP_GROUP_BIRTH_ISLAND_DOCKS            26
+#define MAP_GROUP_TRAINER_HILL_LOBBY            26
+#define MAP_GROUP_TRAINER_HILL_1F            26
+#define MAP_GROUP_TRAINER_HILL_2F            26
+#define MAP_GROUP_TRAINER_HILL_3F            26
+#define MAP_GROUP_TRAINER_HILL_4F            26
+#define MAP_GROUP_TRAINER_HILL_5F            26
+#define MAP_GROUP_NAVEL_ROCK_OUTSIDE            26
+#define MAP_GROUP_NAVEL_ROCK_DOCKS            26
+#define MAP_GROUP_NAVEL_ROCK_1F            26
+#define MAP_GROUP_NAVEL_ROCK_2F            26
+#define MAP_GROUP_NAVEL_ROCK_3F            26
+#define MAP_GROUP_NAVEL_ROCK_4F            26
+#define MAP_GROUP_NAVEL_ROCK_5F            26
+#define MAP_GROUP_NAVEL_ROCK_6F            26
+#define MAP_GROUP_NAVEL_ROCK_7F            26
+#define MAP_GROUP_NAVEL_ROCK_PEAK            26
+#define MAP_GROUP_NAVEL_ROCK_B1F            26
+#define MAP_GROUP_NAVEL_ROCK_B2F            26
+#define MAP_GROUP_NAVEL_ROCK_B3F            26
+#define MAP_GROUP_NAVEL_ROCK_B4F            26
+#define MAP_GROUP_NAVEL_ROCK_B5F            26
+#define MAP_GROUP_NAVEL_ROCK_B6F            26
+#define MAP_GROUP_NAVEL_ROCK_B7F            26
+#define MAP_GROUP_NAVEL_ROCK_B8F            26
+#define MAP_GROUP_NAVEL_ROCK_B9F            26
+#define MAP_GROUP_NAVEL_ROCK_B10F            26
+#define MAP_GROUP_NAVEL_ROCK_B11F            26
+#define MAP_GROUP_NAVEL_ROCK_INNER            26
+#define MAP_GROUP_TRAINER_HILL_ELEVATOR            26
+//--------------------------------------------------
+// Map Group 27
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE104_PROTOTYPE,
+    MAP_ID_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP,
+};
+
+#define MAP_GROUP_ROUTE104_PROTOTYPE                          27
+#define MAP_GROUP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP 27
+
+//--------------------------------------------------
+// Map Group 28
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE109_SEASHORE_HOUSE,
+};
+
+#define MAP_GROUP_ROUTE109_SEASHORE_HOUSE 28
+
+//--------------------------------------------------
+// Map Group 29
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE110_TRICK_HOUSE_ENTRANCE,
+    MAP_ID_ROUTE110_TRICK_HOUSE_END,
+    MAP_ID_ROUTE110_TRICK_HOUSE_CORRIDOR,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE1,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE2,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE3,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE4,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE5,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE6,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE7,
+    MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE8,
+    MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE,
+    MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE,
+};
+
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_ENTRANCE                29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_END                     29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_CORRIDOR                29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE1                 29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE2                 29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE3                 29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE4                 29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE5                 29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE6                 29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE7                 29
+#define MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE8                 29
+#define MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE 29
+#define MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE 29
+
+//--------------------------------------------------
+// Map Group 30
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE113_GLASS_WORKSHOP,
+};
+
+#define MAP_GROUP_ROUTE113_GLASS_WORKSHOP 30
+
+//--------------------------------------------------
+// Map Group 31
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE123_BERRY_MASTERS_HOUSE,
+};
+
+#define MAP_GROUP_ROUTE123_BERRY_MASTERS_HOUSE 31
+
+//--------------------------------------------------
+// Map Group 32
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE119_WEATHER_INSTITUTE_1F,
+    MAP_ID_ROUTE119_WEATHER_INSTITUTE_2F,
+    MAP_ID_ROUTE119_HOUSE,
+};
+
+#define MAP_GROUP_ROUTE119_WEATHER_INSTITUTE_1F 32
+#define MAP_GROUP_ROUTE119_WEATHER_INSTITUTE_2F 32
+#define MAP_GROUP_ROUTE119_HOUSE                32
+
+//--------------------------------------------------
+// Map Group 33
+//--------------------------------------------------
+
+enum
+{
+    MAP_ID_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE,
+};
+
+#define MAP_GROUP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE 33
+
+#endif // GUARD_MAP_CONSTANTS_H
+\ No newline at end of file
author	DizzyEggg <jajkodizzy@wp.pl>	2017-10-01 18:55:21 +0200
committer	DizzyEggg <jajkodizzy@wp.pl>	2017-10-01 18:55:21 +0200
commit	d4e1c417d37b097bd8e7539e87a75f7026d4dc9a (patch)
tree	dc44f9b404cd3005d74f254207e5913de03b0ce5
parent	1fcafaf35aaf92251e7802e1e3ea36e8d5a6067b (diff)
parent	d9603769f31000bb13ec6c9bd1bd42942651d111 (diff)