Merge remote-tracking branch 'origin/master' into c-tools

gfx/font.asm

@@ -21,14 +21,16 @@ INCBIN "gfx/frames/9.1bpp"
 
 ; TODO: Various misc graphics here.
 
-GFX_f89b0: ; f89b0
+StatsScreenPageTilesGFX: ; f89b0
 INCBIN "gfx/unknown/0f89b0.2bpp"
 ; f8a90
 
 ShinyIcon: ; f8a90
+; also part of StatsScreenPageTilesGFX
 INCBIN "gfx/stats/shiny.2bpp"
 
-GFX_f8aa0: ; f8aa0
+StatsScreenPageTilesGFX_Part2: ; f8aa0
+; not referenced on its own, but part of StatsScreenPageTilesGFX
 INCBIN "gfx/unknown/0f8aa0.2bpp"
 ; f8ac0
 
@@ -48,7 +50,7 @@ TownMapGFX: ; f8ba0
 INCBIN "gfx/misc/town_map.2bpp.lz"
 ; f8ea4
 
-GFX_f8ea4: ; unused
+GFX_f8ea4: ; unused kanji
 INCBIN "gfx/unknown/0f8ea4.2bpp"
 ; f8f24
 
@@ -56,8 +58,8 @@ OverworldPhoneIconGFX: ; f8f24
 INCBIN "gfx/mobile/overworld_phone_icon.2bpp"
 ; f8f34
 
-GFX_f8f34: ; unused
-INCBIN "gfx/unknown/0f8f34.2bpp"
+GFX_f8f34: ; unused bold letters + unown chars
+INCBIN "gfx/unknown/0f8f34.w64.1bpp"
 ; f9204
 
 TextBoxSpaceGFX: ; f9204
@@ -72,7 +74,7 @@ MapEntryFrameGFX: ; f9344
 INCBIN "gfx/frames/map_entry_sign.2bpp"
 ; f9424
 
-GFX_f9424: ; f9424
+FontsExtra2_UpArrowGFX: ; f9424
 INCBIN "gfx/unknown/0f9424.2bpp"
 ; f9434
 
@@ -81,6 +83,7 @@ INCBIN "gfx/misc/footprints.1bpp"
 ; fb434
 
 ; This and the following two functions are unreferenced.
+; Debug, perhaps?
 Unknown_fb434:
 	db 0
 
@@ -143,9 +146,9 @@ _LoadFontsExtra1:: ; fb48a
 ; fb4b0
 
 _LoadFontsExtra2:: ; fb4b0
-	ld de, GFX_f9424
+	ld de, FontsExtra2_UpArrowGFX
 	ld hl, VTiles2 tile $61
-	ld b, BANK(GFX_f9424)
+	ld b, BANK(FontsExtra2_UpArrowGFX)
 	ld c, 1
 	call Get2bpp_2
 	ret
@@ -208,7 +211,7 @@ LoadHPBar: ; fb50d
 	ret
 ; fb53e
 
-Functionfb53e: ; fb53e
+StatsScreen_LoadFont: ; fb53e
 	call _LoadFontsBattleExtra
 	ld de, EnemyHPBarBorderGFX
 	ld hl, VTiles2 tile $6c
@@ -226,11 +229,10 @@ Functionfb53e: ; fb53e
 	ld hl, VTiles2 tile $55
 	lb bc, BANK(ExpBarGFX), 8
 	call Get2bpp_2
-
-Functionfb571: ; fb571
-	ld de, GFX_f89b0
+LoadStatsScreenPageTilesGFX: ; fb571
+	ld de, StatsScreenPageTilesGFX
 	ld hl, VTiles2 tile $31
-	lb bc, BANK(GFX_f89b0), $11
+	lb bc, BANK(StatsScreenPageTilesGFX), $11
 	call Get2bpp_2
 	ret
 ; fb57e

gfx/mail.asm

@@ -32,12 +32,12 @@ ReadAnyMail: ; b9237
 	lb bc, BANK(StandardEnglishFont), $80
 	call Get1bpp
 	pop de
-	call Functionb92b8
+	call .LoadGFX
 	call EnableLCD
 	call WaitBGMap
 	ld a, [Buffer3]
 	ld e, a
-	callba Function8cb4
+	callba LoadMailPalettes
 	call SetPalettes
 	xor a
 	ld [hJoyPressed], a
@@ -65,7 +65,7 @@ ReadAnyMail: ; b9237
 	jr .loop
 ; b92b8
 
-Functionb92b8: ; b92b8
+.LoadGFX: ; b92b8
 	ld h, d
 	ld l, e
 	push hl
@@ -83,17 +83,16 @@ Functionb92b8: ; b92b8
 	call CloseSRAM
 	ld hl, MailGFXPointers
 	ld c, 0
-.loop
+.loop2
 	ld a, [hli]
 	cp b
 	jr z, .got_pointer
 	cp -1
 	jr z, .invalid
 	inc c
-rept 2
 	inc hl
-endr
-	jr .loop
+	inc hl
+	jr .loop2
 
 .invalid
 	ld hl, MailGFXPointers
@@ -727,6 +726,7 @@ MailGFX_PlaceMessage: ; b9803
 ; b984e
 
 Functionb984e: ; b984e
+; XXX
 .loop
 	ld a, [hl]
 	xor $ff
@@ -931,9 +931,8 @@ LoadMailGFX_Color3: ; b991e
 .loop
 	ld a, [de]
 	inc de
-rept 2
 	ld [hli], a
-endr
+	ld [hli], a
 	dec c
 	jr nz, .loop
 	ret

gfx/unknown/16c903.pal

@@ -0,0 +1,39 @@
+	RGB 31, 31, 31
+	RGB 04, 10, 20
+	RGB 16, 19, 25
+	RGB 25, 27, 29
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 31, 31