Identify remaining gfx/unknown files

2020-02-27 14:33:30 -05:00
parent 81eaf83cd7
commit 447da80615
85 changed files with 534 additions and 496 deletions
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -278,9 +278,9 @@ Function170cc6:
 Function170d02:
 	ld a, $1
 	ldh [rVBK], a
-	ld de, GFX_171848
+	ld de, PichuBorderMobileGFX
 	ld hl, vTiles0 tile $c1
-	lb bc, BANK(GFX_171848), 24
+	lb bc, BANK(PichuBorderMobileGFX), 24
 	call Get2bpp
 	xor a
 	ldh [rVBK], a
@@ -292,8 +292,8 @@ INCBIN "gfx/mobile/pichu_animated.2bpp.lz"
 ElectroBallMobileGFX:
 INCBIN "gfx/mobile/electro_ball.2bpp.lz"

-GFX_171848:
-INCBIN "gfx/unknown/171848.2bpp"
+PichuBorderMobileGFX:
+INCBIN "gfx/mobile/pichu_border.2bpp"

 Function1719c8:
 	ldh a, [hInMenu]
@@ -659,19 +659,19 @@ String_171c73:

 Function171c87:
 	call DisableLCD
-	ld hl, GFX_171db1
+	ld hl, AsciiFontGFX
 	ld de, vTiles2 tile $00
 	ld bc, $6e0
 	call CopyBytes
-	ld hl, LZ_172abd
+	ld hl, PasswordSlowpokeLZ
 	ld de, vTiles0 tile $00
 	call Decompress
 	call EnableLCD
-	ld hl, Tilemap_172491
+	ld hl, PasswordTopTilemap
 	decoord 0, 0
 	ld bc, $168
 	call CopyBytes
-	ld hl, Attrmap_1727ed
+	ld hl, MobilePasswordAttrmap
 	decoord 0, 0, wAttrmap
 	ld bc, $168
 	call CopyBytes
@@ -688,7 +688,7 @@ Function171ccd:
 	push af
 	ld a, $5
 	ldh [rSVBK], a
-	ld hl, Palette_171d71
+	ld hl, MobilePasswordPalettes
 	ld de, wBGPals1
 	ld bc, 8 palettes
 	call CopyBytes
@@ -711,8 +711,8 @@ Function171cf0:
 	xor $1
 	ld [wcd4b], a
 	and a
-	jr nz, .asm_171d16
-	ld hl, Tilemap_17251d
+	jr nz, .shifted
+	ld hl, PasswordBottomTilemap
 	decoord 0, 7
 	ld bc, $8c
 	call CopyBytes
@@ -720,8 +720,8 @@ Function171cf0:
 	ld de, String_172e3f
 	jp PlaceString

-.asm_171d16
-	ld hl, Tilemap_1725f9
+.shifted
+	ld hl, PasswordShiftTilemap
 	decoord 0, 7
 	ld bc, $8c
 	call CopyBytes
@@ -731,19 +731,19 @@ Function171cf0:

 Function171d2b:
 	call DisableLCD
-	ld hl, GFX_171db1
+	ld hl, AsciiFontGFX
 	ld de, vTiles2 tile $00
 	ld bc, $6e0
 	call CopyBytes
-	ld hl, LZ_172abd
+	ld hl, PasswordSlowpokeLZ
 	ld de, vTiles0 tile $00
 	call Decompress
 	call EnableLCD
-	ld hl, Tilemap_172685
+	ld hl, ChooseMobileCenterTilemap
 	decoord 0, 0
 	ld bc, $168
 	call CopyBytes
-	ld hl, Attrmap_172955
+	ld hl, ChooseMobileCenterAttrmap
 	decoord 0, 0, wAttrmap
 	ld bc, $168
 	call CopyBytes
@@ -755,57 +755,31 @@ Function171d2b:
 	call PlaceString
 	ret

-Palette_171d71:
-	RGB  0,  0,  0
-	RGB  3,  0,  0
-	RGB  5,  0,  0
-	RGB 31, 31, 29
-	RGB  0,  2, 10
-	RGB  2, 10, 21
-	RGB  0,  0,  0
-	RGB 10, 26, 31
-	RGB  0,  0,  0
-	RGB  0,  7,  8
-	RGB 31,  8,  0
-	RGB  1, 17, 15
-	RGB 31, 16,  0
-	RGB 31, 22,  0
-	RGB 31, 27,  0
-	RGB 31, 31,  0
-	RGB 31, 18,  6
-	RGB  0,  3,  0
-	RGB  0,  9,  0
-	RGB  0, 12,  0
-	RGB  0, 16,  0
-	RGB  0, 22,  0
-	RGB  0, 25,  0
-	RGB  0, 27,  0
-	RGB  5,  5, 16
-	RGB  8, 19, 28
-	RGB  0,  0,  0
-	RGB 31, 31, 31
-	RGB 31, 31, 29
-	RGB 21, 21, 20
-	RGB 11, 11, 10
-	RGB  0,  0,  0
+MobilePasswordPalettes:
+INCLUDE "gfx/mobile/mobile_password.pal"

-GFX_171db1:
+AsciiFontGFX:
 INCBIN "gfx/mobile/ascii_font.2bpp"

-Tilemap_172491:
-INCBIN "gfx/unknown/172491.tilemap"
-Tilemap_17251d:
-INCBIN "gfx/unknown/17251d.tilemap"
-Tilemap_1725f9:
-INCBIN "gfx/unknown/1725f9.tilemap"
-Tilemap_172685:
-INCBIN "gfx/unknown/172685.tilemap"
-Attrmap_1727ed:
-INCBIN "gfx/unknown/1727ed.attrmap"
-Attrmap_172955:
-INCBIN "gfx/unknown/172955.attrmap"
+PasswordTopTilemap:
+INCBIN "gfx/mobile/password_top.tilemap"

-LZ_172abd:
+PasswordBottomTilemap:
+INCBIN "gfx/mobile/password_bottom.tilemap"
+
+PasswordShiftTilemap:
+INCBIN "gfx/mobile/password_shift.tilemap"
+
+ChooseMobileCenterTilemap:
+INCBIN "gfx/mobile/mobile_center.tilemap"
+
+MobilePasswordAttrmap:
+INCBIN "gfx/mobile/password.attrmap"
+
+ChooseMobileCenterAttrmap:
+INCBIN "gfx/mobile/mobile_center.attrmap"
+
+PasswordSlowpokeLZ:
 INCBIN "gfx/pokedex/slowpoke.2bpp.lz"

 String_172e31:
@@ -830,16 +804,16 @@ Function172e78:
 	ld bc, $168
 	call ByteFill
 	call DisableLCD
-	ld hl, GameBoyN64GFX
+	ld hl, Stadium2N64GFX
 	ld de, vTiles2 tile $00
 	ld bc, $610
 	call CopyBytes
 	call EnableLCD
-	ld hl, Tilemap_1733af
+	ld hl, Stadium2N64Tilemap
 	decoord 0, 0
 	ld bc, $168
 	call CopyBytes
-	ld hl, Attrmap_173517
+	ld hl, Stadium2N64Attrmap
 	decoord 0, 0, wAttrmap
 	ld bc, $168
 	call CopyBytes
@@ -897,15 +871,17 @@ Palette_172edf:
 	RGB  0,  0,  0
 	RGB  0,  0,  0

-GameBoyN64GFX:
-INCBIN "gfx/trade/game_boy_n64.2bpp"
+Stadium2N64GFX:
+INCBIN "gfx/mobile/stadium2_n64.2bpp"

-Tilemap_1733af:
+Stadium2N64Tilemap:
 if DEF(_CRYSTAL11)
-INCBIN "gfx/unknown/1733af_corrupt.tilemap"
+; Crystal 1.1 corrupted this tilemap by treating $0a bytes as Unix newlines,
+; and converting them to $0d $0a Windows newlines.
+INCBIN "gfx/mobile/stadium2_n64_corrupt.tilemap"
 else
-INCBIN "gfx/unknown/1733af.tilemap"
+INCBIN "gfx/mobile/stadium2_n64.tilemap"
 endc

-Attrmap_173517:
-INCBIN "gfx/unknown/173517.attrmap"
+Stadium2N64Attrmap:
+INCBIN "gfx/mobile/stadium2_n64.attrmap"