Label and dump pokedex billboard gfx

3 files changed, 30 insertions, 23 deletions

diff --git a/gfx/pokedex/uncaught_pokemon.png b/gfx/pokedex/uncaught_pokemon.png
new file mode 100644
index 0000000..d258f4e
--- /dev/null
+++ b/gfx/pokedex/uncaught_pokemon.png
diff --git a/home.asm b/home.asm
index f65cf96..94ff987 100755
--- a/home.asm
+++ b/home.asm
@@ -1298,7 +1298,8 @@ Func_858: ; 0x858
 	ld [rVBK], a
 	ret
 
-Func_86f: ; 0x86f
+LoadBillboardPaletteMap: ; 0x86f
+; Loads the background palette map for a 6x4-tile billboard picture.
 	ld [hROMBankBuffer], a
 	ld a, [hLoadedROMBank]
 	push af
@@ -1311,7 +1312,7 @@ Func_86f: ; 0x86f
 	ld a, $1
 	ld [rVBK], a
 	ld b, $4
-.asm_887
+.loop
 	push bc
 	ld a, [de]
 	ld [hli], a
@@ -1335,7 +1336,7 @@ Func_86f: ; 0x86f
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, .asm_887
+	jr nz, .loop
 	xor a
 	ld [rVBK], a
 	pop af
diff --git a/main.asm b/main.asm
index 8599a03..078d21d 100755
--- a/main.asm
+++ b/main.asm
@@ -8944,7 +8944,7 @@ LoadGreyBillboardPaletteData: ; 0xf269
 	ld a, BANK(GreyBillboardPaletteMap)
 	ld de, GreyBillboardPaletteMap
 	hlCoord 7, 4, vBGMap
-	call Func_86f
+	call LoadBillboardPaletteMap
 	ret
 
 GreyBillboardPaletteMap:
@@ -26266,7 +26266,7 @@ Func_20b02: ; 0x20b02
 	ld a, Bank(MonBillboardPaletteMapPointers)
 	call ReadByteFromBank
 	hlCoord 7, 4, vBGMap
-	call Func_86f
+	call LoadBillboardPaletteMap
 	pop bc
 	ld hl, MonBillboardPalettePointers
 	add hl, bc
@@ -26996,7 +26996,7 @@ Func_2112a: ; 0x2112a
 	ld a, Bank(MonBillboardPaletteMapPointers)
 	call ReadByteFromBank
 	hlCoord 7, 4, vBGMap
-	call Func_86f
+	call LoadBillboardPaletteMap
 	pop bc
 	ld hl, MonBillboardPalettePointers
 	add hl, bc
@@ -32075,9 +32075,9 @@ Func_28add: ; 0x28add
 	add hl, bc
 	ld a, [hl]
 	and a
-	jp z, Func_28b76
+	jp z, LoadUncaughtPokemonBackgroundGfx
 	dec a
-	jp z, Func_28baf
+	jp z, LoadSeenPokemonGfx
 	ld a, [wd960]
 	and a
 	jr z, .asm_28afc
@@ -32131,7 +32131,7 @@ Func_28add: ; 0x28add
 	ld a, Bank(MonBillboardPaletteMapPointers)
 	call ReadByteFromBank
 	hlCoord 1, 3, vBGMap
-	call Func_86f
+	call LoadBillboardPaletteMap
 	pop bc
 	ld hl, MonBillboardPalettePointers
 	add hl, bc
@@ -32150,9 +32150,9 @@ Func_28add: ; 0x28add
 	call Func_8e1
 	ret
 
-Func_28b76: ; 0x28b76
-	ld a, BANK(Data_71500)
-	ld hl, Data_71500
+LoadUncaughtPokemonBackgroundGfx: ; 0x28b76
+	ld a, BANK(UncaughtPokemonBackgroundPic)
+	ld hl, UncaughtPokemonBackgroundPic
 	ld de, vTilesBG tile $00
 	ld bc, $0180
 	call LoadOrCopyVRAMData
@@ -32160,16 +32160,19 @@ Func_28b76: ; 0x28b76
 	ld a, [hGameBoyColorFlag]
 	and a
 	ret z
-	ld a, BANK(Data_28b97)
-	ld de, Data_28b97
+	ld a, BANK(UncaughtPokemonPaletteMap)
+	ld de, UncaughtPokemonPaletteMap
 	hlCoord 1, 3, vBGMap
-	call Func_86f
+	call LoadBillboardPaletteMap
 	ret
 
-Data_28b97:
-	dr $28b97, $28baf
+UncaughtPokemonPaletteMap:
+	db $05, $05, $05, $05, $05, $05
+	db $05, $05, $05, $05, $05, $05
+	db $05, $05, $05, $05, $05, $05
+	db $05, $05, $05, $05, $05, $05
 
-Func_28baf: ; 0x28baf
+LoadSeenPokemonGfx: ; 0x28baf
 	ld a, [wCurPokedexIndex]
 	ld c, a
 	ld b, $0
@@ -32201,10 +32204,10 @@ Func_28baf: ; 0x28baf
 	ld a, [hGameBoyColorFlag]
 	and a
 	ret z
-	ld a, BANK(Data_28b97)
-	ld de, Data_28b97
+	ld a, BANK(UncaughtPokemonPaletteMap)
+	ld de, UncaughtPokemonPaletteMap
 	hlCoord 1, 3, vBGMap
-	call Func_86f
+	call LoadBillboardPaletteMap
 	ret
 
 Func_28bf5: ; 0x28bf5
@@ -34528,8 +34531,11 @@ SECTION "bank1c", ROMX, BANK[$1c]
 
 INCLUDE "data/mon_gfx/mon_billboard_pics_5.asm"
 
-Data_71500:
-	dr $71500, $73000
+UncaughtPokemonBackgroundPic:
+	INCBIN "gfx/pokedex/uncaught_pokemon.2bpp"
+	INCBIN "gfx/pokedex/uncaught_pokemon.2bpp" ; This pic is unnecessarily duplicated.
+
+	ds $1800 ; free space
 
 GengarBonusBaseGameBoyGfx: ; 0x73000
 	INCBIN "gfx/stage/gengar_bonus/gengar_bonus_base_gameboy.2bpp"