From 6561b62986a003e83811abfc85bf07ebc6f3a1ae Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 9 Dec 2017 21:23:40 +0100
Subject: start pokeblock feed

---
 data/graphics.s | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/graphics.s')

diff --git a/data/graphics.s b/data/graphics.s
index 72daf144f..7296ed0cc 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -331,10 +331,10 @@ gUnknown_08D7C154:: @ 8D7C154
 gUnknown_08D7C404:: @ 8D7C404
 	.incbin "baserom.gba", 0xd7c404, 0x3c
 
-gUnknown_08D7C440:: @ 8D7C440
+gBattleTerrainTiles_Building:: @ 8D7C440
 	.incbin "baserom.gba", 0xd7c440, 0x5ac
 
-gUnknown_08D7C9EC:: @ 8D7C9EC
+gBattleTerrainPalette_Frontier:: @ 8D7C9EC
 	.incbin "baserom.gba", 0xd7c9ec, 0x3c
 
 gUnknown_08D7CA28:: @ 8D7CA28
-- 
cgit v1.2.3


From fb30acbc30518469e98a72f4e6df0fb9dd835344 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 10 Dec 2017 15:04:03 +0100
Subject: pokeblock feed is decompiled

---
 data/graphics.s | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'data/graphics.s')

diff --git a/data/graphics.s b/data/graphics.s
index 8ac035046..a68240d64 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -880,13 +880,13 @@ gBuyMenuFrame_Tilemap:: @ 8D9B0F0
 gMenuMoneyGfx:: @ 8D9B230
     .incbin "baserom.gba", 0xd9b230, 0x84
 
-gUnknown_08D9B2B4:: @ 8D9B2B4
+gMenuPokeblock_Gfx:: @ 8D9B2B4
 	.incbin "baserom.gba", 0xd9b2b4, 0x1bc
 
-gUnknown_08D9B470:: @ 8D9B470
+gMenuPokeblock_Pal:: @ 8D9B470
 	.incbin "baserom.gba", 0xd9b470, 0x358
 
-gUnknown_08D9B7C8:: @ 8D9B7C8
+gMenuPokeblockDevice_Gfx:: @ 8D9B7C8
 	.incbin "baserom.gba", 0xd9b7c8, 0x27c
 
 gUnknown_08D9BA44:: @ 8D9BA44
-- 
cgit v1.2.3


From 37ae6a7758d0f16394f31c367f5c1eb86d34327f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 10 Dec 2017 16:38:27 +0100
Subject: move more pokeblock data to C and label

---
 data/graphics.s | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

(limited to 'data/graphics.s')

diff --git a/data/graphics.s b/data/graphics.s
index a68240d64..60787a2c5 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -887,7 +887,67 @@ gMenuPokeblock_Pal:: @ 8D9B470
 	.incbin "baserom.gba", 0xd9b470, 0x358
 
 gMenuPokeblockDevice_Gfx:: @ 8D9B7C8
-	.incbin "baserom.gba", 0xd9b7c8, 0x27c
+	.incbin "baserom.gba", 0xd9b7c8, 0x148
+	
+	.align 2
+gPokeblock_Gfx::
+	.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
+
+	.align 2
+gPokeblockRed_Pal::
+	.incbin "graphics/pokeblock/red.gbapal.lz"
+
+	.align 2
+gPokeblockBlue_Pal::
+	.incbin "graphics/pokeblock/blue.gbapal.lz"
+
+	.align 2
+gPokeblockPink_Pal::
+	.incbin "graphics/pokeblock/pink.gbapal.lz"
+
+	.align 2
+gPokeblockGreen_Pal::
+	.incbin "graphics/pokeblock/green.gbapal.lz"
+
+	.align 2
+gPokeblockYellow_Pal::
+	.incbin "graphics/pokeblock/yellow.gbapal.lz"
+
+	.align 2
+gPokeblockPurple_Pal::
+	.incbin "graphics/pokeblock/purple.gbapal.lz"
+
+	.align 2
+gPokeblockIndigo_Pal::
+	.incbin "graphics/pokeblock/indigo.gbapal.lz"
+
+	.align 2
+gPokeblockBrown_Pal::
+	.incbin "graphics/pokeblock/brown.gbapal.lz"
+
+	.align 2
+gPokeblockLiteBlue_Pal::
+	.incbin "graphics/pokeblock/liteblue.gbapal.lz"
+
+	.align 2
+gPokeblockOlive_Pal::
+	.incbin "graphics/pokeblock/olive.gbapal.lz"
+
+	.align 2
+gPokeblockGray_Pal::
+	.incbin "graphics/pokeblock/gray.gbapal.lz"
+
+	.align 2
+gPokeblockBlack_Pal::
+	.incbin "graphics/pokeblock/black.gbapal.lz"
+
+	.align 2
+gPokeblockWhite_Pal::
+	.incbin "graphics/pokeblock/white.gbapal.lz"
+
+	.align 2
+gPokeblockGold_Pal::
+	.incbin "graphics/pokeblock/gold.gbapal.lz"
 
 gUnknown_08D9BA44:: @ 8D9BA44
 	.incbin "baserom.gba", 0xd9ba44, 0x100
-- 
cgit v1.2.3


From 8ac17e09486006c7d2d066173c8fa907aceb72de Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 11 Dec 2017 16:52:28 +0100
Subject: move data from asm to pokeblock.c

---
 data/graphics.s | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'data/graphics.s')

diff --git a/data/graphics.s b/data/graphics.s
index 60787a2c5..60a56a0ac 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -884,9 +884,15 @@ gMenuPokeblock_Gfx:: @ 8D9B2B4
 	.incbin "baserom.gba", 0xd9b2b4, 0x1bc
 
 gMenuPokeblock_Pal:: @ 8D9B470
-	.incbin "baserom.gba", 0xd9b470, 0x358
+	.incbin "baserom.gba", 0xd9b470, 0x70
+	
+gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
+	.incbin "baserom.gba", 0xd9b4e0, 0x2c0
+	
+gMenuPokeblockDevice_Pal:: @ 8D9B7A0
+	.incbin "baserom.gba", 0xd9b7a0, 0x28
 
-gMenuPokeblockDevice_Gfx:: @ 8D9B7C8
+gMenuPokeblock_Tilemap:: @ 8D9B7C8
 	.incbin "baserom.gba", 0xd9b7c8, 0x148
 	
 	.align 2
-- 
cgit v1.2.3