From 3e7c7d5fff8d8e02bff60c37778137b7429c1fbb Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 3 Nov 2019 13:28:53 -0500
Subject: Identify intro tilemaps and attrmaps

---
 engine/movie/crystal_intro.asm               | 164 +++++++++++++--------------
 gfx/intro/001.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/001.tilemap.lz.c2341875            | Bin 16 -> 0 bytes
 gfx/intro/002.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/002.tilemap.lz.54d5b74b            | Bin 64 -> 0 bytes
 gfx/intro/003.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/003.tilemap.lz.9f90366a            | Bin 16 -> 0 bytes
 gfx/intro/004.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/004.tilemap.lz.4c7562ee            | Bin 96 -> 0 bytes
 gfx/intro/005.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/005.tilemap.lz.bed1ff6d            | Bin 32 -> 0 bytes
 gfx/intro/006.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/006.tilemap.lz.c8756972            | Bin 80 -> 0 bytes
 gfx/intro/007.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/007.tilemap.lz.a9cbcbca            | Bin 80 -> 0 bytes
 gfx/intro/008.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/008.tilemap.lz.f12ed6d9            | Bin 192 -> 0 bytes
 gfx/intro/009.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/009.tilemap.lz.911a1ace            | Bin 16 -> 0 bytes
 gfx/intro/010.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/010.tilemap.lz.2717d106            | Bin 96 -> 0 bytes
 gfx/intro/011.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/011.tilemap.lz.bb066632            | Bin 96 -> 0 bytes
 gfx/intro/012.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/012.tilemap.lz.bc182264            | Bin 208 -> 0 bytes
 gfx/intro/013.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/013.tilemap.lz.18e3115f            | Bin 80 -> 0 bytes
 gfx/intro/014.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/014.tilemap.lz.7b59259d            | Bin 208 -> 0 bytes
 gfx/intro/015.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/015.tilemap.lz.1bfc5a89            | Bin 48 -> 0 bytes
 gfx/intro/017.tilemap                        | Bin 1024 -> 0 bytes
 gfx/intro/017.tilemap.lz.e4772015            | Bin 64 -> 0 bytes
 gfx/intro/background.attrmap                 | Bin 0 -> 1024 bytes
 gfx/intro/background.attrmap.lz.9f90366a     | Bin 0 -> 16 bytes
 gfx/intro/background.pal                     |  79 +++++++++++++
 gfx/intro/background.tilemap                 | Bin 0 -> 1024 bytes
 gfx/intro/background.tilemap.lz.4c7562ee     | Bin 0 -> 96 bytes
 gfx/intro/crystal_unowns.attrmap             | Bin 0 -> 1024 bytes
 gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 | Bin 0 -> 48 bytes
 gfx/intro/crystal_unowns.pal                 |  79 +++++++++++++
 gfx/intro/crystal_unowns.tilemap             | Bin 0 -> 1024 bytes
 gfx/intro/crystal_unowns.tilemap.lz.e4772015 | Bin 0 -> 64 bytes
 gfx/intro/intro_1.pal                        |  79 -------------
 gfx/intro/intro_2.pal                        |  79 -------------
 gfx/intro/intro_3.pal                        |  79 -------------
 gfx/intro/intro_4.pal                        |  79 -------------
 gfx/intro/intro_5.pal                        |  79 -------------
 gfx/intro/suicune.pal                        |  79 +++++++++++++
 gfx/intro/suicune_back.attrmap               | Bin 0 -> 1024 bytes
 gfx/intro/suicune_back.attrmap.lz.18e3115f   | Bin 0 -> 80 bytes
 gfx/intro/suicune_back.tilemap               | Bin 0 -> 1024 bytes
 gfx/intro/suicune_back.tilemap.lz.7b59259d   | Bin 0 -> 208 bytes
 gfx/intro/suicune_close.attrmap              | Bin 0 -> 1024 bytes
 gfx/intro/suicune_close.attrmap.lz.bb066632  | Bin 0 -> 96 bytes
 gfx/intro/suicune_close.pal                  |  79 +++++++++++++
 gfx/intro/suicune_close.tilemap              | Bin 0 -> 1024 bytes
 gfx/intro/suicune_close.tilemap.lz.bc182264  | Bin 0 -> 208 bytes
 gfx/intro/suicune_jump.attrmap               | Bin 0 -> 1024 bytes
 gfx/intro/suicune_jump.attrmap.lz.911a1ace   | Bin 0 -> 16 bytes
 gfx/intro/suicune_jump.tilemap               | Bin 0 -> 1024 bytes
 gfx/intro/suicune_jump.tilemap.lz.2717d106   | Bin 0 -> 96 bytes
 gfx/intro/unown_a.attrmap                    | Bin 0 -> 1024 bytes
 gfx/intro/unown_a.attrmap.lz.c2341875        | Bin 0 -> 16 bytes
 gfx/intro/unown_a.tilemap                    | Bin 0 -> 1024 bytes
 gfx/intro/unown_a.tilemap.lz.54d5b74b        | Bin 0 -> 64 bytes
 gfx/intro/unown_hi.attrmap                   | Bin 0 -> 1024 bytes
 gfx/intro/unown_hi.attrmap.lz.bed1ff6d       | Bin 0 -> 32 bytes
 gfx/intro/unown_hi.tilemap                   | Bin 0 -> 1024 bytes
 gfx/intro/unown_hi.tilemap.lz.c8756972       | Bin 0 -> 80 bytes
 gfx/intro/unowns.attrmap                     | Bin 0 -> 1024 bytes
 gfx/intro/unowns.attrmap.lz.a9cbcbca         | Bin 0 -> 80 bytes
 gfx/intro/unowns.pal                         |  79 +++++++++++++
 gfx/intro/unowns.tilemap                     | Bin 0 -> 1024 bytes
 gfx/intro/unowns.tilemap.lz.f12ed6d9         | Bin 0 -> 192 bytes
 75 files changed, 477 insertions(+), 477 deletions(-)
 delete mode 100644 gfx/intro/001.tilemap
 delete mode 100644 gfx/intro/001.tilemap.lz.c2341875
 delete mode 100644 gfx/intro/002.tilemap
 delete mode 100644 gfx/intro/002.tilemap.lz.54d5b74b
 delete mode 100644 gfx/intro/003.tilemap
 delete mode 100644 gfx/intro/003.tilemap.lz.9f90366a
 delete mode 100644 gfx/intro/004.tilemap
 delete mode 100644 gfx/intro/004.tilemap.lz.4c7562ee
 delete mode 100644 gfx/intro/005.tilemap
 delete mode 100644 gfx/intro/005.tilemap.lz.bed1ff6d
 delete mode 100644 gfx/intro/006.tilemap
 delete mode 100644 gfx/intro/006.tilemap.lz.c8756972
 delete mode 100644 gfx/intro/007.tilemap
 delete mode 100644 gfx/intro/007.tilemap.lz.a9cbcbca
 delete mode 100644 gfx/intro/008.tilemap
 delete mode 100644 gfx/intro/008.tilemap.lz.f12ed6d9
 delete mode 100644 gfx/intro/009.tilemap
 delete mode 100644 gfx/intro/009.tilemap.lz.911a1ace
 delete mode 100644 gfx/intro/010.tilemap
 delete mode 100644 gfx/intro/010.tilemap.lz.2717d106
 delete mode 100644 gfx/intro/011.tilemap
 delete mode 100644 gfx/intro/011.tilemap.lz.bb066632
 delete mode 100644 gfx/intro/012.tilemap
 delete mode 100644 gfx/intro/012.tilemap.lz.bc182264
 delete mode 100644 gfx/intro/013.tilemap
 delete mode 100644 gfx/intro/013.tilemap.lz.18e3115f
 delete mode 100644 gfx/intro/014.tilemap
 delete mode 100644 gfx/intro/014.tilemap.lz.7b59259d
 delete mode 100644 gfx/intro/015.tilemap
 delete mode 100644 gfx/intro/015.tilemap.lz.1bfc5a89
 delete mode 100644 gfx/intro/017.tilemap
 delete mode 100644 gfx/intro/017.tilemap.lz.e4772015
 create mode 100644 gfx/intro/background.attrmap
 create mode 100644 gfx/intro/background.attrmap.lz.9f90366a
 create mode 100644 gfx/intro/background.pal
 create mode 100644 gfx/intro/background.tilemap
 create mode 100644 gfx/intro/background.tilemap.lz.4c7562ee
 create mode 100644 gfx/intro/crystal_unowns.attrmap
 create mode 100644 gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89
 create mode 100644 gfx/intro/crystal_unowns.pal
 create mode 100644 gfx/intro/crystal_unowns.tilemap
 create mode 100644 gfx/intro/crystal_unowns.tilemap.lz.e4772015
 delete mode 100644 gfx/intro/intro_1.pal
 delete mode 100644 gfx/intro/intro_2.pal
 delete mode 100644 gfx/intro/intro_3.pal
 delete mode 100644 gfx/intro/intro_4.pal
 delete mode 100644 gfx/intro/intro_5.pal
 create mode 100644 gfx/intro/suicune.pal
 create mode 100644 gfx/intro/suicune_back.attrmap
 create mode 100644 gfx/intro/suicune_back.attrmap.lz.18e3115f
 create mode 100644 gfx/intro/suicune_back.tilemap
 create mode 100644 gfx/intro/suicune_back.tilemap.lz.7b59259d
 create mode 100644 gfx/intro/suicune_close.attrmap
 create mode 100644 gfx/intro/suicune_close.attrmap.lz.bb066632
 create mode 100644 gfx/intro/suicune_close.pal
 create mode 100644 gfx/intro/suicune_close.tilemap
 create mode 100644 gfx/intro/suicune_close.tilemap.lz.bc182264
 create mode 100644 gfx/intro/suicune_jump.attrmap
 create mode 100644 gfx/intro/suicune_jump.attrmap.lz.911a1ace
 create mode 100644 gfx/intro/suicune_jump.tilemap
 create mode 100644 gfx/intro/suicune_jump.tilemap.lz.2717d106
 create mode 100644 gfx/intro/unown_a.attrmap
 create mode 100644 gfx/intro/unown_a.attrmap.lz.c2341875
 create mode 100644 gfx/intro/unown_a.tilemap
 create mode 100644 gfx/intro/unown_a.tilemap.lz.54d5b74b
 create mode 100644 gfx/intro/unown_hi.attrmap
 create mode 100644 gfx/intro/unown_hi.attrmap.lz.bed1ff6d
 create mode 100644 gfx/intro/unown_hi.tilemap
 create mode 100644 gfx/intro/unown_hi.tilemap.lz.c8756972
 create mode 100644 gfx/intro/unowns.attrmap
 create mode 100644 gfx/intro/unowns.attrmap.lz.a9cbcbca
 create mode 100644 gfx/intro/unowns.pal
 create mode 100644 gfx/intro/unowns.tilemap
 create mode 100644 gfx/intro/unowns.tilemap.lz.f12ed6d9

diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm
index 5c4f38151..29808c86b 100644
--- a/engine/movie/crystal_intro.asm
+++ b/engine/movie/crystal_intro.asm
@@ -445,7 +445,7 @@ IntroScene1:
 	ldh [hBGMapMode], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap001
+	ld hl, IntroUnownAAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -456,18 +456,18 @@ IntroScene1:
 	ld hl, IntroPulseGFX
 	ld de, vTiles0 tile $00
 	call Intro_DecompressRequest2bpp_128Tiles
-	ld hl, IntroTilemap002
+	ld hl, IntroUnownATilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette2
+	ld hl, IntroUnownsPalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette2
+	ld hl, IntroUnownsPalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -521,7 +521,7 @@ IntroScene3:
 	ldh [hBGMapMode], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap003
+	ld hl, IntroBackgroundAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -529,18 +529,18 @@ IntroScene3:
 	ld hl, IntroBackgroundGFX
 	ld de, vTiles2 tile $00
 	call Intro_DecompressRequest2bpp_128Tiles
-	ld hl, IntroTilemap004
+	ld hl, IntroBackgroundTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette1
+	ld hl, IntroBackgroundPalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette1
+	ld hl, IntroBackgroundPalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -584,7 +584,7 @@ IntroScene5:
 	ldh [hLCDCPointer], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap005
+	ld hl, IntroUnownHIAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -595,18 +595,18 @@ IntroScene5:
 	ld hl, IntroPulseGFX
 	ld de, vTiles0 tile $00
 	call Intro_DecompressRequest2bpp_128Tiles
-	ld hl, IntroTilemap006
+	ld hl, IntroUnownHITilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette2
+	ld hl, IntroUnownsPalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette2
+	ld hl, IntroUnownsPalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -682,7 +682,7 @@ IntroScene7:
 
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap003
+	ld hl, IntroBackgroundAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 
@@ -700,7 +700,7 @@ IntroScene7:
 	ld de, vTiles2 tile $00
 	call Intro_DecompressRequest2bpp_128Tiles
 
-	ld hl, IntroTilemap004
+	ld hl, IntroBackgroundTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 
@@ -709,12 +709,12 @@ IntroScene7:
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
 
-	ld hl, IntroPalette1
+	ld hl, IntroBackgroundPalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
 
-	ld hl, IntroPalette1
+	ld hl, IntroBackgroundPalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -852,7 +852,7 @@ IntroScene11:
 	ldh [hLCDCPointer], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap007
+	ld hl, IntroUnownsAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -860,18 +860,18 @@ IntroScene11:
 	ld hl, IntroUnownsGFX
 	ld de, vTiles2 tile $00
 	call Intro_DecompressRequest2bpp_128Tiles
-	ld hl, IntroTilemap008
+	ld hl, IntroUnownsTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette2
+	ld hl, IntroUnownsPalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette2
+	ld hl, IntroUnownsPalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -975,7 +975,7 @@ IntroScene13:
 	ldh [hBGMapMode], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap003
+	ld hl, IntroBackgroundAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -986,18 +986,18 @@ IntroScene13:
 	ld hl, IntroBackgroundGFX
 	ld de, vTiles2 tile $00
 	call Intro_DecompressRequest2bpp_128Tiles
-	ld hl, IntroTilemap004
+	ld hl, IntroBackgroundTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette1
+	ld hl, IntroBackgroundPalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette1
+	ld hl, IntroBackgroundPalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1079,7 +1079,7 @@ IntroScene15:
 	ldh [hBGMapMode], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap009
+	ld hl, IntroSuicuneJumpAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -1094,7 +1094,7 @@ IntroScene15:
 	ld hl, vTiles1 tile $00
 	lb bc, BANK(IntroGrass4GFX), 1
 	call Request2bpp
-	ld hl, IntroTilemap010
+	ld hl, IntroSuicuneJumpTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	call Intro_LoadTilemap
@@ -1102,11 +1102,11 @@ IntroScene15:
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette5
+	ld hl, IntroSuicunePalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette5
+	ld hl, IntroSuicunePalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1161,7 +1161,7 @@ IntroScene17:
 	ldh [hBGMapMode], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap011
+	ld hl, IntroSuicuneCloseAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -1169,18 +1169,18 @@ IntroScene17:
 	ld hl, IntroSuicuneCloseGFX
 	ld de, vTiles1 tile $00
 	call Intro_DecompressRequest2bpp_255Tiles
-	ld hl, IntroTilemap012
+	ld hl, IntroSuicuneCloseTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette4
+	ld hl, IntroSuicuneClosePalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette4
+	ld hl, IntroSuicuneClosePalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1227,7 +1227,7 @@ IntroScene19:
 	ldh [hBGMapMode], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap013
+	ld hl, IntroSuicuneBackAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -1242,7 +1242,7 @@ IntroScene19:
 	ld hl, vTiles1 tile $7f
 	lb bc, BANK(IntroGrass4GFX), 1
 	call Request2bpp
-	ld hl, IntroTilemap014
+	ld hl, IntroSuicuneBackTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	call Intro_LoadTilemap
@@ -1250,11 +1250,11 @@ IntroScene19:
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette5
+	ld hl, IntroSuicunePalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette5
+	ld hl, IntroSuicunePalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1404,7 +1404,7 @@ IntroScene26:
 	ldh [hBGMapMode], a
 	ld a, $1
 	ldh [rVBK], a
-	ld hl, IntroTilemap015
+	ld hl, IntroCrystalUnownsAttrmap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ld a, $0
@@ -1412,18 +1412,18 @@ IntroScene26:
 	ld hl, IntroCrystalUnownsGFX
 	ld de, vTiles2 tile $00
 	call Intro_DecompressRequest2bpp_128Tiles
-	ld hl, IntroTilemap017
+	ld hl, IntroCrystalUnownsTilemap
 	debgcoord 0, 0
 	call Intro_DecompressRequest2bpp_64Tiles
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
 	ldh [rSVBK], a
-	ld hl, IntroPalette3
+	ld hl, IntroCrystalUnownsPalette
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, IntroPalette3
+	ld hl, IntroCrystalUnownsPalette
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -2038,14 +2038,14 @@ INCBIN "gfx/intro/pichu_wooper.2bpp.lz"
 IntroBackgroundGFX:
 INCBIN "gfx/intro/background.2bpp.lz"
 
-IntroTilemap004:
-INCBIN "gfx/intro/004.tilemap.lz"
+IntroBackgroundTilemap:
+INCBIN "gfx/intro/background.tilemap.lz"
 
-IntroTilemap003:
-INCBIN "gfx/intro/003.tilemap.lz"
+IntroBackgroundAttrmap:
+INCBIN "gfx/intro/background.attrmap.lz"
 
-IntroPalette1:
-INCLUDE "gfx/intro/intro_1.pal"
+IntroBackgroundPalette:
+INCLUDE "gfx/intro/background.pal"
 
 IntroUnownsGFX:
 INCBIN "gfx/intro/unowns.2bpp.lz"
@@ -2053,50 +2053,50 @@ INCBIN "gfx/intro/unowns.2bpp.lz"
 IntroPulseGFX:
 INCBIN "gfx/intro/pulse.2bpp.lz"
 
-IntroTilemap002:
-INCBIN "gfx/intro/002.tilemap.lz"
+IntroUnownATilemap:
+INCBIN "gfx/intro/unown_a.tilemap.lz"
 
-IntroTilemap001:
-INCBIN "gfx/intro/001.tilemap.lz"
+IntroUnownAAttrmap:
+INCBIN "gfx/intro/unown_a.attrmap.lz"
 
-IntroTilemap006:
-INCBIN "gfx/intro/006.tilemap.lz"
+IntroUnownHITilemap:
+INCBIN "gfx/intro/unown_hi.tilemap.lz"
 
-IntroTilemap005:
-INCBIN "gfx/intro/005.tilemap.lz"
+IntroUnownHIAttrmap:
+INCBIN "gfx/intro/unown_hi.attrmap.lz"
 
-IntroTilemap008:
-INCBIN "gfx/intro/008.tilemap.lz"
+IntroUnownsTilemap:
+INCBIN "gfx/intro/unowns.tilemap.lz"
 
-IntroTilemap007:
-INCBIN "gfx/intro/007.tilemap.lz"
+IntroUnownsAttrmap:
+INCBIN "gfx/intro/unowns.attrmap.lz"
 
-IntroPalette2:
-INCLUDE "gfx/intro/intro_2.pal"
+IntroUnownsPalette:
+INCLUDE "gfx/intro/unowns.pal"
 
 IntroCrystalUnownsGFX:
 INCBIN "gfx/intro/crystal_unowns.2bpp.lz"
 
-IntroTilemap017:
-INCBIN "gfx/intro/017.tilemap.lz"
+IntroCrystalUnownsTilemap:
+INCBIN "gfx/intro/crystal_unowns.tilemap.lz"
 
-IntroTilemap015:
-INCBIN "gfx/intro/015.tilemap.lz"
+IntroCrystalUnownsAttrmap:
+INCBIN "gfx/intro/crystal_unowns.attrmap.lz"
 
-IntroPalette3:
-INCLUDE "gfx/intro/intro_3.pal"
+IntroCrystalUnownsPalette:
+INCLUDE "gfx/intro/crystal_unowns.pal"
 
 IntroSuicuneCloseGFX:
 INCBIN "gfx/intro/suicune_close.2bpp.lz"
 
-IntroTilemap012:
-INCBIN "gfx/intro/012.tilemap.lz"
+IntroSuicuneCloseTilemap:
+INCBIN "gfx/intro/suicune_close.tilemap.lz"
 
-IntroTilemap011:
-INCBIN "gfx/intro/011.tilemap.lz"
+IntroSuicuneCloseAttrmap:
+INCBIN "gfx/intro/suicune_close.attrmap.lz"
 
-IntroPalette4:
-INCLUDE "gfx/intro/intro_4.pal"
+IntroSuicuneClosePalette:
+INCLUDE "gfx/intro/suicune_close.pal"
 
 IntroSuicuneJumpGFX:
 INCBIN "gfx/intro/suicune_jump.2bpp.lz"
@@ -2104,20 +2104,20 @@ INCBIN "gfx/intro/suicune_jump.2bpp.lz"
 IntroSuicuneBackGFX:
 INCBIN "gfx/intro/suicune_back.2bpp.lz"
 
-IntroTilemap010:
-INCBIN "gfx/intro/010.tilemap.lz"
+IntroSuicuneJumpTilemap:
+INCBIN "gfx/intro/suicune_jump.tilemap.lz"
 
-IntroTilemap009:
-INCBIN "gfx/intro/009.tilemap.lz"
+IntroSuicuneJumpAttrmap:
+INCBIN "gfx/intro/suicune_jump.attrmap.lz"
 
-IntroTilemap014:
-INCBIN "gfx/intro/014.tilemap.lz"
+IntroSuicuneBackTilemap:
+INCBIN "gfx/intro/suicune_back.tilemap.lz"
 
-IntroTilemap013:
-INCBIN "gfx/intro/013.tilemap.lz"
+IntroSuicuneBackAttrmap:
+INCBIN "gfx/intro/suicune_back.attrmap.lz"
 
-IntroPalette5:
-INCLUDE "gfx/intro/intro_5.pal"
+IntroSuicunePalette:
+INCLUDE "gfx/intro/suicune.pal"
 
 IntroUnownBackGFX:
 INCBIN "gfx/intro/unown_back.2bpp.lz"
diff --git a/gfx/intro/001.tilemap b/gfx/intro/001.tilemap
deleted file mode 100644
index 8b1b66033..000000000
Binary files a/gfx/intro/001.tilemap and /dev/null differ
diff --git a/gfx/intro/001.tilemap.lz.c2341875 b/gfx/intro/001.tilemap.lz.c2341875
deleted file mode 100644
index 926fb6e8e..000000000
Binary files a/gfx/intro/001.tilemap.lz.c2341875 and /dev/null differ
diff --git a/gfx/intro/002.tilemap b/gfx/intro/002.tilemap
deleted file mode 100644
index 6a035d14a..000000000
Binary files a/gfx/intro/002.tilemap and /dev/null differ
diff --git a/gfx/intro/002.tilemap.lz.54d5b74b b/gfx/intro/002.tilemap.lz.54d5b74b
deleted file mode 100644
index c63f215f2..000000000
Binary files a/gfx/intro/002.tilemap.lz.54d5b74b and /dev/null differ
diff --git a/gfx/intro/003.tilemap b/gfx/intro/003.tilemap
deleted file mode 100644
index 98512513c..000000000
Binary files a/gfx/intro/003.tilemap and /dev/null differ
diff --git a/gfx/intro/003.tilemap.lz.9f90366a b/gfx/intro/003.tilemap.lz.9f90366a
deleted file mode 100644
index 182ffb130..000000000
Binary files a/gfx/intro/003.tilemap.lz.9f90366a and /dev/null differ
diff --git a/gfx/intro/004.tilemap b/gfx/intro/004.tilemap
deleted file mode 100644
index 2dd6b6ea7..000000000
Binary files a/gfx/intro/004.tilemap and /dev/null differ
diff --git a/gfx/intro/004.tilemap.lz.4c7562ee b/gfx/intro/004.tilemap.lz.4c7562ee
deleted file mode 100644
index 5897d176b..000000000
Binary files a/gfx/intro/004.tilemap.lz.4c7562ee and /dev/null differ
diff --git a/gfx/intro/005.tilemap b/gfx/intro/005.tilemap
deleted file mode 100644
index 3f7d23b64..000000000
Binary files a/gfx/intro/005.tilemap and /dev/null differ
diff --git a/gfx/intro/005.tilemap.lz.bed1ff6d b/gfx/intro/005.tilemap.lz.bed1ff6d
deleted file mode 100644
index 0ae96b7f7..000000000
Binary files a/gfx/intro/005.tilemap.lz.bed1ff6d and /dev/null differ
diff --git a/gfx/intro/006.tilemap b/gfx/intro/006.tilemap
deleted file mode 100644
index 4af27a158..000000000
Binary files a/gfx/intro/006.tilemap and /dev/null differ
diff --git a/gfx/intro/006.tilemap.lz.c8756972 b/gfx/intro/006.tilemap.lz.c8756972
deleted file mode 100644
index 46436b607..000000000
Binary files a/gfx/intro/006.tilemap.lz.c8756972 and /dev/null differ
diff --git a/gfx/intro/007.tilemap b/gfx/intro/007.tilemap
deleted file mode 100644
index 2e3fdb41a..000000000
Binary files a/gfx/intro/007.tilemap and /dev/null differ
diff --git a/gfx/intro/007.tilemap.lz.a9cbcbca b/gfx/intro/007.tilemap.lz.a9cbcbca
deleted file mode 100644
index d1694ed3e..000000000
Binary files a/gfx/intro/007.tilemap.lz.a9cbcbca and /dev/null differ
diff --git a/gfx/intro/008.tilemap b/gfx/intro/008.tilemap
deleted file mode 100644
index 903f59ae5..000000000
Binary files a/gfx/intro/008.tilemap and /dev/null differ
diff --git a/gfx/intro/008.tilemap.lz.f12ed6d9 b/gfx/intro/008.tilemap.lz.f12ed6d9
deleted file mode 100644
index 356c6d5e8..000000000
Binary files a/gfx/intro/008.tilemap.lz.f12ed6d9 and /dev/null differ
diff --git a/gfx/intro/009.tilemap b/gfx/intro/009.tilemap
deleted file mode 100644
index 554e919a8..000000000
Binary files a/gfx/intro/009.tilemap and /dev/null differ
diff --git a/gfx/intro/009.tilemap.lz.911a1ace b/gfx/intro/009.tilemap.lz.911a1ace
deleted file mode 100644
index 238d6a60e..000000000
Binary files a/gfx/intro/009.tilemap.lz.911a1ace and /dev/null differ
diff --git a/gfx/intro/010.tilemap b/gfx/intro/010.tilemap
deleted file mode 100644
index 4ddef19c7..000000000
Binary files a/gfx/intro/010.tilemap and /dev/null differ
diff --git a/gfx/intro/010.tilemap.lz.2717d106 b/gfx/intro/010.tilemap.lz.2717d106
deleted file mode 100644
index 6e45c45f7..000000000
Binary files a/gfx/intro/010.tilemap.lz.2717d106 and /dev/null differ
diff --git a/gfx/intro/011.tilemap b/gfx/intro/011.tilemap
deleted file mode 100644
index 59f365a34..000000000
Binary files a/gfx/intro/011.tilemap and /dev/null differ
diff --git a/gfx/intro/011.tilemap.lz.bb066632 b/gfx/intro/011.tilemap.lz.bb066632
deleted file mode 100644
index 68ceb19f8..000000000
Binary files a/gfx/intro/011.tilemap.lz.bb066632 and /dev/null differ
diff --git a/gfx/intro/012.tilemap b/gfx/intro/012.tilemap
deleted file mode 100644
index 3577fc467..000000000
Binary files a/gfx/intro/012.tilemap and /dev/null differ
diff --git a/gfx/intro/012.tilemap.lz.bc182264 b/gfx/intro/012.tilemap.lz.bc182264
deleted file mode 100644
index 0d6af294c..000000000
Binary files a/gfx/intro/012.tilemap.lz.bc182264 and /dev/null differ
diff --git a/gfx/intro/013.tilemap b/gfx/intro/013.tilemap
deleted file mode 100644
index 28e27ad62..000000000
Binary files a/gfx/intro/013.tilemap and /dev/null differ
diff --git a/gfx/intro/013.tilemap.lz.18e3115f b/gfx/intro/013.tilemap.lz.18e3115f
deleted file mode 100644
index 91635527c..000000000
Binary files a/gfx/intro/013.tilemap.lz.18e3115f and /dev/null differ
diff --git a/gfx/intro/014.tilemap b/gfx/intro/014.tilemap
deleted file mode 100644
index 52829cc74..000000000
Binary files a/gfx/intro/014.tilemap and /dev/null differ
diff --git a/gfx/intro/014.tilemap.lz.7b59259d b/gfx/intro/014.tilemap.lz.7b59259d
deleted file mode 100644
index a892ab1b4..000000000
Binary files a/gfx/intro/014.tilemap.lz.7b59259d and /dev/null differ
diff --git a/gfx/intro/015.tilemap b/gfx/intro/015.tilemap
deleted file mode 100644
index f97c9cb93..000000000
Binary files a/gfx/intro/015.tilemap and /dev/null differ
diff --git a/gfx/intro/015.tilemap.lz.1bfc5a89 b/gfx/intro/015.tilemap.lz.1bfc5a89
deleted file mode 100644
index 22a4cc926..000000000
Binary files a/gfx/intro/015.tilemap.lz.1bfc5a89 and /dev/null differ
diff --git a/gfx/intro/017.tilemap b/gfx/intro/017.tilemap
deleted file mode 100644
index 05c37dbf2..000000000
Binary files a/gfx/intro/017.tilemap and /dev/null differ
diff --git a/gfx/intro/017.tilemap.lz.e4772015 b/gfx/intro/017.tilemap.lz.e4772015
deleted file mode 100644
index 90ce59e58..000000000
Binary files a/gfx/intro/017.tilemap.lz.e4772015 and /dev/null differ
diff --git a/gfx/intro/background.attrmap b/gfx/intro/background.attrmap
new file mode 100644
index 000000000..98512513c
Binary files /dev/null and b/gfx/intro/background.attrmap differ
diff --git a/gfx/intro/background.attrmap.lz.9f90366a b/gfx/intro/background.attrmap.lz.9f90366a
new file mode 100644
index 000000000..182ffb130
Binary files /dev/null and b/gfx/intro/background.attrmap.lz.9f90366a differ
diff --git a/gfx/intro/background.pal b/gfx/intro/background.pal
new file mode 100644
index 000000000..ae0faadac
--- /dev/null
+++ b/gfx/intro/background.pal
@@ -0,0 +1,79 @@
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB  0,  4,  5
+	RGB  1,  8,  5
+	RGB  4, 12,  9
+	RGB 24, 12,  9
+
+	RGB  0,  4,  5
+	RGB  9,  6,  8
+	RGB  8, 16,  5
+	RGB  5, 10,  4
+
+	RGB 31, 31, 31
+	RGB  9,  6,  8
+	RGB 18,  9,  9
+	RGB 13,  8,  9
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB  2,  5, 22
+	RGB  1,  5, 12
+
+	RGB 31, 31, 31
+	RGB 31, 10, 25
+	RGB 31, 21,  0
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 21, 31
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
diff --git a/gfx/intro/background.tilemap b/gfx/intro/background.tilemap
new file mode 100644
index 000000000..2dd6b6ea7
Binary files /dev/null and b/gfx/intro/background.tilemap differ
diff --git a/gfx/intro/background.tilemap.lz.4c7562ee b/gfx/intro/background.tilemap.lz.4c7562ee
new file mode 100644
index 000000000..5897d176b
Binary files /dev/null and b/gfx/intro/background.tilemap.lz.4c7562ee differ
diff --git a/gfx/intro/crystal_unowns.attrmap b/gfx/intro/crystal_unowns.attrmap
new file mode 100644
index 000000000..f97c9cb93
Binary files /dev/null and b/gfx/intro/crystal_unowns.attrmap differ
diff --git a/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 b/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89
new file mode 100644
index 000000000..22a4cc926
Binary files /dev/null and b/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 differ
diff --git a/gfx/intro/crystal_unowns.pal b/gfx/intro/crystal_unowns.pal
new file mode 100644
index 000000000..95f3e052a
--- /dev/null
+++ b/gfx/intro/crystal_unowns.pal
@@ -0,0 +1,79 @@
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
diff --git a/gfx/intro/crystal_unowns.tilemap b/gfx/intro/crystal_unowns.tilemap
new file mode 100644
index 000000000..05c37dbf2
Binary files /dev/null and b/gfx/intro/crystal_unowns.tilemap differ
diff --git a/gfx/intro/crystal_unowns.tilemap.lz.e4772015 b/gfx/intro/crystal_unowns.tilemap.lz.e4772015
new file mode 100644
index 000000000..90ce59e58
Binary files /dev/null and b/gfx/intro/crystal_unowns.tilemap.lz.e4772015 differ
diff --git a/gfx/intro/intro_1.pal b/gfx/intro/intro_1.pal
deleted file mode 100644
index ae0faadac..000000000
--- a/gfx/intro/intro_1.pal
+++ /dev/null
@@ -1,79 +0,0 @@
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB  0,  4,  5
-	RGB  1,  8,  5
-	RGB  4, 12,  9
-	RGB 24, 12,  9
-
-	RGB  0,  4,  5
-	RGB  9,  6,  8
-	RGB  8, 16,  5
-	RGB  5, 10,  4
-
-	RGB 31, 31, 31
-	RGB  9,  6,  8
-	RGB 18,  9,  9
-	RGB 13,  8,  9
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB  2,  5, 22
-	RGB  1,  5, 12
-
-	RGB 31, 31, 31
-	RGB 31, 10, 25
-	RGB 31, 21,  0
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 21, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
diff --git a/gfx/intro/intro_2.pal b/gfx/intro/intro_2.pal
deleted file mode 100644
index 5f83df020..000000000
--- a/gfx/intro/intro_2.pal
+++ /dev/null
@@ -1,79 +0,0 @@
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 10,  0, 10
-	RGB 19,  0, 19
-	RGB 31,  0, 31
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
diff --git a/gfx/intro/intro_3.pal b/gfx/intro/intro_3.pal
deleted file mode 100644
index 95f3e052a..000000000
--- a/gfx/intro/intro_3.pal
+++ /dev/null
@@ -1,79 +0,0 @@
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
diff --git a/gfx/intro/intro_4.pal b/gfx/intro/intro_4.pal
deleted file mode 100644
index fdcf058de..000000000
--- a/gfx/intro/intro_4.pal
+++ /dev/null
@@ -1,79 +0,0 @@
-	RGB 24, 12,  9
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 24, 12,  9
-	RGB 31, 31, 31
-	RGB  8,  9, 31
-	RGB  0,  0,  0
-
-	RGB 24, 12,  9
-	RGB 12, 20, 31
-	RGB 19,  8, 31
-	RGB  0,  0,  0
-
-	RGB 12, 20, 31
-	RGB  8,  9, 31
-	RGB 19,  8, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 12, 20, 31
-	RGB  8,  9, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
diff --git a/gfx/intro/intro_5.pal b/gfx/intro/intro_5.pal
deleted file mode 100644
index 5b1be1a5f..000000000
--- a/gfx/intro/intro_5.pal
+++ /dev/null
@@ -1,79 +0,0 @@
-	RGB 24, 12,  9
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 24, 12,  9
-	RGB 31, 31, 31
-	RGB  8,  9, 31
-	RGB  0,  0,  0
-
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-	RGB 24, 12,  9
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 12,  0, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 21,  9,  0
-	RGB 21,  9,  0
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 20, 20, 20
-	RGB 11, 11, 11
-	RGB  0,  0,  0
diff --git a/gfx/intro/suicune.pal b/gfx/intro/suicune.pal
new file mode 100644
index 000000000..5b1be1a5f
--- /dev/null
+++ b/gfx/intro/suicune.pal
@@ -0,0 +1,79 @@
+	RGB 24, 12,  9
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 24, 12,  9
+	RGB 31, 31, 31
+	RGB  8,  9, 31
+	RGB  0,  0,  0
+
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+	RGB 24, 12,  9
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 12,  0, 31
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 21,  9,  0
+	RGB 21,  9,  0
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
diff --git a/gfx/intro/suicune_back.attrmap b/gfx/intro/suicune_back.attrmap
new file mode 100644
index 000000000..28e27ad62
Binary files /dev/null and b/gfx/intro/suicune_back.attrmap differ
diff --git a/gfx/intro/suicune_back.attrmap.lz.18e3115f b/gfx/intro/suicune_back.attrmap.lz.18e3115f
new file mode 100644
index 000000000..91635527c
Binary files /dev/null and b/gfx/intro/suicune_back.attrmap.lz.18e3115f differ
diff --git a/gfx/intro/suicune_back.tilemap b/gfx/intro/suicune_back.tilemap
new file mode 100644
index 000000000..52829cc74
Binary files /dev/null and b/gfx/intro/suicune_back.tilemap differ
diff --git a/gfx/intro/suicune_back.tilemap.lz.7b59259d b/gfx/intro/suicune_back.tilemap.lz.7b59259d
new file mode 100644
index 000000000..a892ab1b4
Binary files /dev/null and b/gfx/intro/suicune_back.tilemap.lz.7b59259d differ
diff --git a/gfx/intro/suicune_close.attrmap b/gfx/intro/suicune_close.attrmap
new file mode 100644
index 000000000..59f365a34
Binary files /dev/null and b/gfx/intro/suicune_close.attrmap differ
diff --git a/gfx/intro/suicune_close.attrmap.lz.bb066632 b/gfx/intro/suicune_close.attrmap.lz.bb066632
new file mode 100644
index 000000000..68ceb19f8
Binary files /dev/null and b/gfx/intro/suicune_close.attrmap.lz.bb066632 differ
diff --git a/gfx/intro/suicune_close.pal b/gfx/intro/suicune_close.pal
new file mode 100644
index 000000000..fdcf058de
--- /dev/null
+++ b/gfx/intro/suicune_close.pal
@@ -0,0 +1,79 @@
+	RGB 24, 12,  9
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 24, 12,  9
+	RGB 31, 31, 31
+	RGB  8,  9, 31
+	RGB  0,  0,  0
+
+	RGB 24, 12,  9
+	RGB 12, 20, 31
+	RGB 19,  8, 31
+	RGB  0,  0,  0
+
+	RGB 12, 20, 31
+	RGB  8,  9, 31
+	RGB 19,  8, 31
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 12, 20, 31
+	RGB  8,  9, 31
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
diff --git a/gfx/intro/suicune_close.tilemap b/gfx/intro/suicune_close.tilemap
new file mode 100644
index 000000000..3577fc467
Binary files /dev/null and b/gfx/intro/suicune_close.tilemap differ
diff --git a/gfx/intro/suicune_close.tilemap.lz.bc182264 b/gfx/intro/suicune_close.tilemap.lz.bc182264
new file mode 100644
index 000000000..0d6af294c
Binary files /dev/null and b/gfx/intro/suicune_close.tilemap.lz.bc182264 differ
diff --git a/gfx/intro/suicune_jump.attrmap b/gfx/intro/suicune_jump.attrmap
new file mode 100644
index 000000000..554e919a8
Binary files /dev/null and b/gfx/intro/suicune_jump.attrmap differ
diff --git a/gfx/intro/suicune_jump.attrmap.lz.911a1ace b/gfx/intro/suicune_jump.attrmap.lz.911a1ace
new file mode 100644
index 000000000..238d6a60e
Binary files /dev/null and b/gfx/intro/suicune_jump.attrmap.lz.911a1ace differ
diff --git a/gfx/intro/suicune_jump.tilemap b/gfx/intro/suicune_jump.tilemap
new file mode 100644
index 000000000..4ddef19c7
Binary files /dev/null and b/gfx/intro/suicune_jump.tilemap differ
diff --git a/gfx/intro/suicune_jump.tilemap.lz.2717d106 b/gfx/intro/suicune_jump.tilemap.lz.2717d106
new file mode 100644
index 000000000..6e45c45f7
Binary files /dev/null and b/gfx/intro/suicune_jump.tilemap.lz.2717d106 differ
diff --git a/gfx/intro/unown_a.attrmap b/gfx/intro/unown_a.attrmap
new file mode 100644
index 000000000..8b1b66033
Binary files /dev/null and b/gfx/intro/unown_a.attrmap differ
diff --git a/gfx/intro/unown_a.attrmap.lz.c2341875 b/gfx/intro/unown_a.attrmap.lz.c2341875
new file mode 100644
index 000000000..926fb6e8e
Binary files /dev/null and b/gfx/intro/unown_a.attrmap.lz.c2341875 differ
diff --git a/gfx/intro/unown_a.tilemap b/gfx/intro/unown_a.tilemap
new file mode 100644
index 000000000..6a035d14a
Binary files /dev/null and b/gfx/intro/unown_a.tilemap differ
diff --git a/gfx/intro/unown_a.tilemap.lz.54d5b74b b/gfx/intro/unown_a.tilemap.lz.54d5b74b
new file mode 100644
index 000000000..c63f215f2
Binary files /dev/null and b/gfx/intro/unown_a.tilemap.lz.54d5b74b differ
diff --git a/gfx/intro/unown_hi.attrmap b/gfx/intro/unown_hi.attrmap
new file mode 100644
index 000000000..3f7d23b64
Binary files /dev/null and b/gfx/intro/unown_hi.attrmap differ
diff --git a/gfx/intro/unown_hi.attrmap.lz.bed1ff6d b/gfx/intro/unown_hi.attrmap.lz.bed1ff6d
new file mode 100644
index 000000000..0ae96b7f7
Binary files /dev/null and b/gfx/intro/unown_hi.attrmap.lz.bed1ff6d differ
diff --git a/gfx/intro/unown_hi.tilemap b/gfx/intro/unown_hi.tilemap
new file mode 100644
index 000000000..4af27a158
Binary files /dev/null and b/gfx/intro/unown_hi.tilemap differ
diff --git a/gfx/intro/unown_hi.tilemap.lz.c8756972 b/gfx/intro/unown_hi.tilemap.lz.c8756972
new file mode 100644
index 000000000..46436b607
Binary files /dev/null and b/gfx/intro/unown_hi.tilemap.lz.c8756972 differ
diff --git a/gfx/intro/unowns.attrmap b/gfx/intro/unowns.attrmap
new file mode 100644
index 000000000..2e3fdb41a
Binary files /dev/null and b/gfx/intro/unowns.attrmap differ
diff --git a/gfx/intro/unowns.attrmap.lz.a9cbcbca b/gfx/intro/unowns.attrmap.lz.a9cbcbca
new file mode 100644
index 000000000..d1694ed3e
Binary files /dev/null and b/gfx/intro/unowns.attrmap.lz.a9cbcbca differ
diff --git a/gfx/intro/unowns.pal b/gfx/intro/unowns.pal
new file mode 100644
index 000000000..5f83df020
--- /dev/null
+++ b/gfx/intro/unowns.pal
@@ -0,0 +1,79 @@
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 10,  0, 10
+	RGB 19,  0, 19
+	RGB 31,  0, 31
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
+
+	RGB 31, 31, 31
+	RGB 20, 20, 20
+	RGB 11, 11, 11
+	RGB  0,  0,  0
diff --git a/gfx/intro/unowns.tilemap b/gfx/intro/unowns.tilemap
new file mode 100644
index 000000000..903f59ae5
Binary files /dev/null and b/gfx/intro/unowns.tilemap differ
diff --git a/gfx/intro/unowns.tilemap.lz.f12ed6d9 b/gfx/intro/unowns.tilemap.lz.f12ed6d9
new file mode 100644
index 000000000..356c6d5e8
Binary files /dev/null and b/gfx/intro/unowns.tilemap.lz.f12ed6d9 differ
-- 
cgit v1.2.3