More graphics and straggling static refs.

9 files changed, 28 insertions, 39 deletions

diff --git a/engine/color.asm b/engine/color.asm
index d3ec8cdd3..70ffaaeac 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -899,7 +899,7 @@ Function97ee: ; 97ee
 	add hl, hl
 	add hl, hl
 	add hl, hl
-	ld bc, $68ce
+	ld bc, PokemonPalettes
 	add hl, bc
 	ret
 ; 97f9
diff --git a/engine/credits.asm b/engine/credits.asm
index 7504898ca..8fc8ad627 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -444,7 +444,7 @@ ParseCredits: ; 1099aa
 	xor a
 	ld [$cf64], a ; frame
 	call GetCreditsPalette
-	call $32f9 ; update hw pal registers
+	call Function32f9 ; update hw pal registers
 	jr .loop
 	
 .clear
@@ -481,7 +481,7 @@ ParseCredits: ; 1099aa
 	ld [$ffd4], a
 	
 .done
-	jp $5951
+	jp Function109951
 	
 .end
 ; Stop execution.
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm
index d73a28362..48863eeb3 100644
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -1226,11 +1226,11 @@ UnknownScript_0xbd8dd:
 	trainertotext SCHOOLBOY, 3, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_ALAN
-	iftrue $5915
+	iftrue UnknownScript_0xbd915
 	checkflag ENGINE_95
-	iftrue $5915
+	iftrue UnknownScript_0xbd915
 	checkflag ENGINE_ALAN_HAS_FIRE_STONE
-	iftrue $5915
+	iftrue UnknownScript_0xbd915
 	farscall UnknownScript_0xbde42
 	if_equal $0, UnknownScript_0xbd91c
 	checkevent $0101
@@ -1287,11 +1287,11 @@ UnknownScript_0xbd967:
 	trainertotext LASS, 10, $0
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_DANA
-	iftrue $599f
+	iftrue UnknownScript_0xbd99f
 	checkflag ENGINE_96
-	iftrue $599f
+	iftrue UnknownScript_0xbd99f
 	checkflag ENGINE_LIZ_HAS_THUNDERSTONE
-	iftrue $599f
+	iftrue UnknownScript_0xbd99f
 	farscall UnknownScript_0xbde42
 	if_equal $0, UnknownScript_0xbd9ae
 	checkevent $0102
@@ -1452,11 +1452,11 @@ UnknownScript_0xbdae3:
 	trainertotext FISHER, 7, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_TULLY
-	iftrue $5b1b
+	iftrue UnknownScript_0xbdb1b
 	checkflag ENGINE_98
-	iftrue $5b1b
+	iftrue UnknownScript_0xbdb1b
 	checkflag ENGINE_TULLY_HAS_WATER_STONE
-	iftrue $5b1b
+	iftrue UnknownScript_0xbdb1b
 	farscall UnknownScript_0xbde42
 	if_equal $0, UnknownScript_0xbdb22
 	checkevent $0103
@@ -1560,11 +1560,11 @@ UnknownScript_0xbdbd0:
 	if_equal $0, UnknownScript_0xbdc21
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_TIFFANY
-	iftrue $5c10
+	iftrue UnknownScript_0xbdc10
 	checkflag ENGINE_9A
-	iftrue $5c10
+	iftrue UnknownScript_0xbdc10
 	checkflag ENGINE_TIFFANY_HAS_PINK_BOW
-	iftrue $5c10
+	iftrue UnknownScript_0xbdc10
 	farscall UnknownScript_0xbde42
 	if_equal $0, UnknownScript_0xbdc17
 	checkevent $0104
diff --git a/gfx/unknown/016d9c.1bpp b/gfx/unknown/016d9c.1bpp
new file mode 100644
index 000000000..e24d140c4
--- /dev/null
+++ b/gfx/unknown/016d9c.1bpp
diff --git a/gfx/unknown/016da4.1bpp b/gfx/unknown/016da4.1bpp
new file mode 100644
index 000000000..fc6de6973
--- /dev/null
+++ b/gfx/unknown/016da4.1bpp
diff --git a/gfx/unknown/1032a2.2bpp b/gfx/unknown/1032a2.2bpp
new file mode 100644
index 000000000..36d29b975
--- /dev/null
+++ b/gfx/unknown/1032a2.2bpp
diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm
index 5b4840876..6b6e3eacc 100644
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -81,7 +81,7 @@ Function110030:: ; 110030 (44:4030)
 	ld [$c988], a
 	ld a, [hl]
 	pop de
-	ld hl, $3e60
+	ld hl, Function3e60
 	push hl
 	ld h, a
 	ld a, [$c988]
diff --git a/main.asm b/main.asm
index c4ffc4c08..7533539f0 100644
--- a/main.asm
+++ b/main.asm
@@ -29559,9 +29559,9 @@ UnownDexVacantString:
 ; 16d9c
 
 UnownDexATile: ; 16d9c
-	INCBIN "baserom.gbc", $16d9c, $16da4 - $16d9c
+INCBIN "gfx/unknown/016d9c.1bpp"
 UnownDexBTile: ; 16da4
-	INCBIN "baserom.gbc", $16da4, $16dac - $16da4
+INCBIN "gfx/unknown/016da4.1bpp"
 ; 16dac
 
 Function16dac: ; 16dac
@@ -63039,7 +63039,7 @@ Function81f1d: ; 81f1d
 	ld [rJOYP], a
 	ld a, $30
 	ld [rJOYP], a
-	ld de, $1b58
+	ld de, 7000
 .asm_81f51
 	nop
 	nop
@@ -107224,9 +107224,9 @@ Function102dc3: ; 102dc3
 
 Function102dd3: ; 102dd3
 	call DisableLCD
-	ld de, $72a2
+	ld de, GFX_1032a2
 	ld hl, VTiles0
-	ld bc, $4004
+	lb bc, BANK(GFX_1032a2), 4
 	call Get2bpp
 	callba Function16d421
 	call EnableLCD
@@ -107234,7 +107234,7 @@ Function102dd3: ; 102dd3
 ; 102dec
 
 Function102dec: ; 102dec
-	ld hl, $72e2
+	ld hl, Unknown_1032e2
 	ld de, Unkn2Pals
 	ld bc, $0020
 	ld a, $5
@@ -107708,22 +107708,11 @@ Unknown_10327a: ; 10327a
 	db $00, $00, $02, $02
 	db $00, $00, $03, $02
 	db $00, $00, $01, $03
-	db $00, $00, $00, $00
-	db $00, $00, $00, $00
-	db $00, $00, $00, $00
-	db $00, $00, $00, $00
-	db $00, $00, $40, $00
-	db $e0, $00, $e0, $00
-	db $e0, $00, $e0, $00
-	db $e0, $00, $40, $00
-	db $00, $00, $00, $40
-	db $00, $e0, $00, $e0
-	db $00, $e0, $00, $e0
-	db $00, $e0, $00, $40
-	db $00, $00, $40, $40
-	db $e0, $e0, $e0, $e0
-	db $e0, $e0, $e0, $e0
-	db $e0, $e0, $40, $40
+
+GFX_1032a2:
+INCBIN "gfx/unknown/1032a2.2bpp"
+
+Unknown_1032e2:
 	db $00, $00, $ff, $1f
 	db $f4, $1b, $8d, $42
 	db $00, $00, $67, $45
diff --git a/predef/sgb.asm b/predef/sgb.asm
index 382c1c666..6459da271 100644
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -91,7 +91,7 @@ Function86b4: ; 86b4
 	ld h, $0
 	add hl, hl
 	add hl, hl
-	ld de, $68be
+	ld de, Palettes_a8be
 	add hl, de
 	ld a, [hli]
 	ld [$cdb2], a