move data from asm to pokeblock.c

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

data/pokeblock.s

@@ -1,51 +0,0 @@
-@ the fourth big chunk of data
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gPokeblockFlavorCompatibilityTable:: @ 85B25A0
-	.incbin "baserom.gba", 0x5b25a0, 0x80
-
-gUnknown_085B2620:: @ 85B2620
-	.incbin "baserom.gba", 0x5b2620, 0xc
-
-gPokeblockNames:: @ 85B262C
-	.incbin "baserom.gba", 0x5b262c, 0x3c
-
-gUnknown_085B2668:: @ 85B2668
-	.incbin "baserom.gba", 0x5b2668, 0x30
-
-gUnknown_085B2698:: @ 85B2698
-	.incbin "baserom.gba", 0x5b2698, 0x3
-
-gUnknown_085B269B:: @ 85B269B
-	.incbin "baserom.gba", 0x5b269b, 0x2
-
-gUnknown_085B269D:: @ 85B269D
-	.incbin "baserom.gba", 0x5b269d, 0x2
-
-gUnknown_085B269F:: @ 85B269F
-	.incbin "baserom.gba", 0x5b269f, 0x5
-
-gUnknown_085B26A4:: @ 85B26A4
-	.incbin "baserom.gba", 0x5b26a4, 0x4c
-
-gUnknown_085B26F0:: @ 85B26F0
-	.incbin "baserom.gba", 0x5b26f0, 0x4
-
-gPokeblockCase_SpriteSheet:: @ 85B26F4
-	.incbin "baserom.gba", 0x5b26f4, 0x8
-
-gPokeblockCase_SpritePal:: @ 85B26FC
-	.incbin "baserom.gba", 0x5b26fc, 0x8
-
-gUnknown_085B2704:: @ 85B2704
-	.incbin "baserom.gba", 0x5b2704, 0x18
-
-gUnknown_085B271C:: @ 85B271C
-	.incbin "baserom.gba", 0x5b271c, 0x4
-
-gUnknown_085B2720:: @ 85B2720
-	.incbin "baserom.gba", 0x5b2720, 0x28

data/strings.s

@@ -832,46 +832,46 @@ gText_UnkF908Var1Var2:: @ 85E9263
 gText_BerryTag:: @ 85E926B
 	.string "BERRY TAG$"
 
-gUnknown_085E9275:: @ 85E9275
+gText_RedPokeblock:: @ 85E9275
 	.string "RED {POKEBLOCK}$"
 
-gUnknown_085E927F:: @ 85E927F
+gText_BluePokeblock:: @ 85E927F
 	.string "BLUE {POKEBLOCK}$"
 
-gUnknown_085E928A:: @ 85E928A
+gText_PinkPokeblock:: @ 85E928A
 	.string "PINK {POKEBLOCK}$"
 
-gUnknown_085E9295:: @ 85E9295
+gText_GreenPokeblock:: @ 85E9295
 	.string "GREEN {POKEBLOCK}$"
 
-gUnknown_085E92A1:: @ 85E92A1
+gText_YellowPokeblock:: @ 85E92A1
 	.string "YELLOW {POKEBLOCK}$"
 
-gUnknown_085E92AE:: @ 85E92AE
+gText_PurplePokeblock:: @ 85E92AE
 	.string "PURPLE {POKEBLOCK}$"
 
-gUnknown_085E92BB:: @ 85E92BB
+gText_IndigoPokeblock:: @ 85E92BB
 	.string "INDIGO {POKEBLOCK}$"
 
-gUnknown_085E92C8:: @ 85E92C8
+gText_BrownPokeblock:: @ 85E92C8
 	.string "BROWN {POKEBLOCK}$"
 
-gUnknown_085E92D4:: @ 85E92D4
+gText_LiteBluePokeblock:: @ 85E92D4
 	.string "LITEBLUE {POKEBLOCK}$"
 
-gUnknown_085E92E3:: @ 85E92E3
+gText_OlivePokeblock:: @ 85E92E3
 	.string "OLIVE {POKEBLOCK}$"
 
-gUnknown_085E92EF:: @ 85E92EF
+gText_GrayPokeblock:: @ 85E92EF
 	.string "GRAY {POKEBLOCK}$"
 
-gUnknown_085E92FA:: @ 85E92FA
+gText_BlackPokeblock:: @ 85E92FA
 	.string "BLACK {POKEBLOCK}$"
 
-gUnknown_085E9306:: @ 85E9306
+gText_WhitePokeblock:: @ 85E9306
 	.string "WHITE {POKEBLOCK}$"
 
-gUnknown_085E9312:: @ 85E9312
+gText_GoldPokeblock:: @ 85E9312
 	.string "GOLD {POKEBLOCK}$"
 
 gText_Spicy:: @ 85E931D