Several small cleanups, add pics.

13 files changed, 15 insertions, 8 deletions

diff --git a/engine/link/link.asm b/engine/link/link.asm
index 5f88a087..11657f4e 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -82,9 +82,9 @@ Gen2ToGen1LinkComms:
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
-	ld hl, wc508
+	ld hl, wLink_c508
 	ld de, wTrademons
-	ld bc, wTrademons - wc508
+	ld bc, wTrademons - wLink_c508
 	call Serial_ExchangeBytes
 	xor a
 	ldh [rIF], a
@@ -226,9 +226,9 @@ Gen2ToGen2LinkComms:
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
-	ld hl, wc508
+	ld hl, wLink_c508
 	ld de, wTrademons
-	ld bc, wTrademons - wc508
+	ld bc, wTrademons - wLink_c508
 	call Serial_ExchangeBytes
 	ld a, [wLinkMode]
 	cp LINK_TRADECENTER
@@ -514,7 +514,7 @@ FixDataForLinkTransfer:
 	ld [hli], a
 	dec b
 	jr nz, .loop2
-	ld hl, wc508
+	ld hl, wLink_c508
 	ld a, SERIAL_PREAMBLE_BYTE
 	ld [hli], a
 	ld [hli], a
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index 88fb4f39..039766e7 100755
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -2368,7 +2368,7 @@ Pokedex_LoadSelectedMonTiles:
 	ret
 
 .QuestionMark:
-	ld a, 0
+	ld a, BANK(sScratch)
 	call OpenSRAM
 	farcall LoadQuestionMarkPic
 	ld hl, vTiles2
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index dbc1d899..cd7ad782 100755
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -881,7 +881,8 @@ endr
 	ret
 
 .GFX:
-	dr $4273d, $4278d
+INCBIN "gfx/evo/bubble_large.2bpp"
+INCBIN "gfx/evo/bubble.2bpp"
 
 GetPreEvolution:
 ; Find the first mon to evolve into wCurPartySpecies.
diff --git a/gfx/evo/bubble.2bpp b/gfx/evo/bubble.2bpp
new file mode 100644
index 00000000..741ee902
--- /dev/null
+++ b/gfx/evo/bubble.2bpp
diff --git a/gfx/evo/bubble.png b/gfx/evo/bubble.png
new file mode 100644
index 00000000..28fba397
--- /dev/null
+++ b/gfx/evo/bubble.png
diff --git a/gfx/evo/bubble_large.2bpp b/gfx/evo/bubble_large.2bpp
new file mode 100644
index 00000000..a6904441
--- /dev/null
+++ b/gfx/evo/bubble_large.2bpp
diff --git a/gfx/evo/bubble_large.png b/gfx/evo/bubble_large.png
new file mode 100644
index 00000000..34f63004
--- /dev/null
+++ b/gfx/evo/bubble_large.png
diff --git a/gfx/pokedex/pokedex.2bpp b/gfx/pokedex/pokedex.2bpp
new file mode 100644
index 00000000..ace4e25e
--- /dev/null
+++ b/gfx/pokedex/pokedex.2bpp
diff --git a/gfx/pokedex/pokedex.png b/gfx/pokedex/pokedex.png
new file mode 100644
index 00000000..48af514c
--- /dev/null
+++ b/gfx/pokedex/pokedex.png
diff --git a/gfx/pokedex/slowpoke.2bpp b/gfx/pokedex/slowpoke.2bpp
new file mode 100644
index 00000000..959020dc
--- /dev/null
+++ b/gfx/pokedex/slowpoke.2bpp
diff --git a/gfx/pokedex/slowpoke.png b/gfx/pokedex/slowpoke.png
new file mode 100644
index 00000000..5c1909a3
--- /dev/null
+++ b/gfx/pokedex/slowpoke.png
diff --git a/tools/gfx.py b/tools/gfx.py
index 79dd6f61..ff0802c7 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -164,6 +164,10 @@ def filepath_rules(filepath):
         if name == 'chris_back':
             args['pic_dimensions'] = 6, 6
 
+    elif 'gfx/pokedex' in filedir:
+        if name in ['slowpoke', 'pokedex']:
+            args['width'] = 128
+
     elif 'gfx/pokegear' in filedir:
         if name == 'pokegear_sprites':
             args['width'] = 16
diff --git a/wram.asm b/wram.asm
index f00f3115..9c593d4f 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1055,7 +1055,9 @@ wNamingScreenLetterCase::
 wSlotsDelay::
 	db
 wPrinterQueueLength:: db
-wSlotsCE66:: db
+wSlotsCE66::
+wPokedexCE66::
+	db
 ENDU ; ce67
 
 wRequested2bpp::