From 25a4edfe6f71abcbda22fac47f7399bfda4e276b Mon Sep 17 00:00:00 2001
From: Zumi Daxuya <daxuya.zumi+code@protonmail.com>
Date: Thu, 10 Dec 2020 14:23:48 +0700
Subject: Dump intro tilemaps

---
 engine/opening_cutscene.asm  |  16 +++++++---------
 gfx/gfx.asm                  |  12 ++++++++++--
 gfx/gfx.mk                   |   3 +++
 gfx/intro/forest.bin         | Bin 0 -> 96 bytes
 gfx/intro/forest_tilemap.bin | Bin 0 -> 288 bytes
 gfx/intro/water.bin          | Bin 0 -> 272 bytes
 gfx/intro/water_tilemap.bin  |   2 ++
 layout.link                  |   5 +----
 8 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 gfx/intro/forest.bin
 create mode 100644 gfx/intro/forest_tilemap.bin
 create mode 100644 gfx/intro/water.bin
 create mode 100644 gfx/intro/water_tilemap.bin

diff --git a/engine/opening_cutscene.asm b/engine/opening_cutscene.asm
index d049661..d97f3ea 100644
--- a/engine/opening_cutscene.asm
+++ b/engine/opening_cutscene.asm
@@ -89,9 +89,9 @@ IntroScene1:	; 43b8
 	call Intro_Copy128Tiles
 
 ; Load water metatiles
-	ld a, $df
+	ld a, LOW(Intro_WaterMeta)
 	ld [wIntroTilesPointer + 0], a
-	ld a, $54
+	ld a, HIGH(Intro_WaterMeta)
 	ld [wIntroTilesPointer + 1], a
 
 ; Set destination BG map pointer
@@ -101,8 +101,8 @@ IntroScene1:	; 43b8
 	ld a, h
 	ld [wIntroBGMapPointer + 1], a
 
-; Set destination tilemap pointer
-	ld de, $53cf
+; Load water tilemap
+	ld de, Intro_WaterTilemap + 15 tiles
 	ld a, e
 	ld [wIntroTilemapPointer + 0], a
 	ld a, d
@@ -596,16 +596,16 @@ IntroScene6:
 	ld hl, vChars2
 	ld de, IntroForestGFX
 	call Intro_Copy128Tiles
-	ld a, $0f
+	ld a, LOW(Intro_GrassMeta)
 	ld [wIntroTilesPointer + 0], a
-	ld a, $62
+	ld a, HIGH(Intro_GrassMeta)
 	ld [wIntroTilesPointer + 1], a
 	ld hl, vBGMap0
 	ld a, l
 	ld [wIntroBGMapPointer + 0], a
 	ld a, h
 	ld [wIntroBGMapPointer + 1], a
-	ld de, $610f
+	ld de, Intro_GrassTilemap + 2 tiles
 	ld a, e
 	ld [wIntroTilemapPointer + 0], a
 	ld a, d
@@ -1224,5 +1224,3 @@ Intro_ResetLYOverrides:
 	dec c
 	jr nz, .loop
 	ret
-
-;;;;;; GFX goes here ;;;;;;;;;;;;;;;;;;
diff --git a/gfx/gfx.asm b/gfx/gfx.asm
index 44e1c07..9613e8a 100644
--- a/gfx/gfx.asm
+++ b/gfx/gfx.asm
@@ -546,12 +546,20 @@ INCBIN "gfx/splash/game_freak_logo_oam.2bpp"
 SECTION "gfx.asm@Intro Underwater GFX", ROMX
 IntroUnderwaterGFX::
 INCBIN "gfx/intro/underwater.2bpp"
-
-SECTION "gfx.asm@Intro Water Mon and Forest GFX", ROMX
+Intro_WaterTilemap::
+INCBIN "gfx/intro/water_tilemap.bin"
+Intro_WaterMeta::
+INCBIN "gfx/intro/water.bin"
 IntroWaterPokemonGFX::
 INCBIN "gfx/intro/water_pokemon.2bpp"
+
+SECTION "gfx.asm@Intro Forest GFX", ROMX
 IntroForestGFX::
 INCBIN "gfx/intro/forest.2bpp"
+Intro_GrassTilemap::
+INCBIN "gfx/intro/forest_tilemap.bin"
+Intro_GrassMeta::
+INCBIN "gfx/intro/forest.bin"
 
 SECTION "gfx.asm@Intro Mon", ROMX
 IntroJigglypuffPikachuGFX::
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index fe01521..ac19398 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -17,5 +17,8 @@ $(BUILD)/gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace
 
 $(BUILD)/gfx/intro/jigglypuff_pikachu.2bpp: tools/gfx += --trim-whitespace
 
+$(BUILD)/gfx/intro/%.bin: gfx/intro/%.bin
+	cp $< $@
+
 $(BUILD)/gfx/battle_anims/attack_animations_1.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/battle_anims/attack_animations_2.2bpp: tools/gfx += --trim-whitespace
diff --git a/gfx/intro/forest.bin b/gfx/intro/forest.bin
new file mode 100644
index 0000000..cf13546
Binary files /dev/null and b/gfx/intro/forest.bin differ
diff --git a/gfx/intro/forest_tilemap.bin b/gfx/intro/forest_tilemap.bin
new file mode 100644
index 0000000..fb1179d
Binary files /dev/null and b/gfx/intro/forest_tilemap.bin differ
diff --git a/gfx/intro/water.bin b/gfx/intro/water.bin
new file mode 100644
index 0000000..7f8675f
Binary files /dev/null and b/gfx/intro/water.bin differ
diff --git a/gfx/intro/water_tilemap.bin b/gfx/intro/water_tilemap.bin
new file mode 100644
index 0000000..b91bfd7
--- /dev/null
+++ b/gfx/intro/water_tilemap.bin
@@ -0,0 +1,2 @@
+ !"#0123 !"#0123()*+89:;()*+89:;''$%&ABC''$%&ABC'',-.''''',-.'''''''''''''''''''''''''''''''''''																
+
//////
















































































































\ No newline at end of file
diff --git a/layout.link b/layout.link
index b33af85..cce2beb 100644
--- a/layout.link
+++ b/layout.link
@@ -899,11 +899,8 @@ ROMX $39
 	"gfx.asm@Gamefreak Logo GFX"
 	org $432F
 	"engine/opening_cutscene.asm"
-	org $4adf
 	"gfx.asm@Intro Underwater GFX"
-	org $55ef
-	"gfx.asm@Intro Water Mon and Forest GFX"
-	org $626f
+	"gfx.asm@Intro Forest GFX"
 	"gfx.asm@Intro Mon"
 
 ROMX $3a
-- 
cgit v1.2.3