diff --git a/gfx/mail.asm b/gfx/mail.asm index 50124d6f9..38b329946 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -21,13 +21,13 @@ ReadAnyMail: ; b9237 ld a, c ld de, StandardEnglishFont or a - jr z, .asm_b9268 + jr z, .got_font ld de, FrenchGermanFont sub $3 - jr c, .asm_b9268 + jr c, .got_font ld de, SpanishItalianFont -.asm_b9268 +.got_font ld hl, VTiles1 lb bc, BANK(StandardEnglishFont), $80 call Get1bpp @@ -35,7 +35,7 @@ ReadAnyMail: ; b9237 call Functionb92b8 call EnableLCD call WaitBGMap - ld a, [wd1ec] + ld a, [Buffer3] ld e, a callba Function8cb4 call SetPalettes @@ -49,22 +49,22 @@ ReadAnyMail: ; b9237 ; b929a Functionb929a: ; b929a -.asm_b929a +.loop call GetJoypad ld a, [hJoyPressed] and A_BUTTON | B_BUTTON | START - jr z, .asm_b929a + jr z, .loop and START - jr nz, .asm_b92a8 + jr nz, .pressed_start ret -.asm_b92a8 +.pressed_start ld a, [wJumptableIndex] push af callab Function845d4 pop af ld [wJumptableIndex], a - jr .asm_b929a + jr .loop ; b92b8 Functionb92b8: ; b92b8 @@ -73,7 +73,7 @@ Functionb92b8: ; b92b8 push hl ld a, $0 call GetSRAMBank - ld de, $2b + ld de, sPartyMon1MailAuthorID - sPartyMon1Mail add hl, de ld a, [hli] ld [Buffer1], a @@ -85,25 +85,25 @@ Functionb92b8: ; b92b8 call CloseSRAM ld hl, MailGFXPointers ld c, 0 -.asm_b92d9 +.loop ld a, [hli] cp b - jr z, .asm_b92ea - cp $ff - jr z, .asm_b92e6 + jr z, .got_pointer + cp -1 + jr z, .invalid inc c rept 2 inc hl endr - jr .asm_b92d9 + jr .loop -.asm_b92e6 +.invalid ld hl, MailGFXPointers inc hl -.asm_b92ea +.got_pointer ld a, c - ld [wd1ec], a + ld [Buffer3], a ld a, [hli] ld h, [hl] ld l, a @@ -126,67 +126,68 @@ MailGFXPointers: ; b92f8 dbw BLUESKY_MAIL, LoadBlueSkyMailGFX dbw MUSIC_MAIL, LoadMusicMailGFX dbw MIRAGE_MAIL, LoadMirageMailGFX - db $ff + db -1 ; b9317 LoadSurfMailGFX: ; b9317 push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b9d46 - ld c, $40 - call Functionb9915 + ld de, SurfMailBorderGFX + ld c, 8 * 8 + call LoadMailGFX_Color2 ld de, MailLaprasGFX - ld c, $30 - call Functionb991e - ld de, Unknown_b994e - ld c, $8 - call Functionb9915 - jr Functionb9351 + ld c, 6 * 8 + call LoadMailGFX_Color3 + ld de, SurfMailWaveGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + jr FinishLoadingSurfLiteBlueMailGFX LoadLiteBlueMailGFX: ; b9335 push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b9dc6 - ld c, $40 - call Functionb9915 + ld de, LiteBlueMailBorderGFX + ld c, 8 * 8 + call LoadMailGFX_Color2 ld de, MailDratiniGFX - ld c, $30 - call Functionb991e - ld de, Unknown_b995e - ld c, $8 - call Functionb9915 + ld c, 6 * 8 + call LoadMailGFX_Color3 + ld de, PortraitMailUnderlineGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 -Functionb9351: ; b9351 - ld de, Unknown_b9976 - ld c, $10 - call Functionb9915 - ld c, $10 - call Functionb990c - ld de, Unknown_b9c3e - ld c, $40 - call Functionb990c - ld c, $40 - call Functionb9915 - call Functionb9858 +FinishLoadingSurfLiteBlueMailGFX: ; b9351 + ld de, SurfLiteBlueMailSmallShapesGFX + ld c, 2 * 8 + call LoadMailGFX_Color2 + ld c, 2 * 8 + call LoadMailGFX_Color1 + ld de, SurfLiteBlueMailLargeShapesGFX + ld c, 8 * 8 + call LoadMailGFX_Color1 + ld c, 8 * 8 + call LoadMailGFX_Color2 + + call DrawMailBorder hlcoord 2, 15 ld a, $3f - call Functionb98d4 + call Mail_Draw16TileRow ld a, $39 hlcoord 15, 14 - call Functionb98fc + call Mail_Draw3x2Graphic ld a, $44 hlcoord 2, 2 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 15, 11 - call Functionb98ee + call Mail_Draw2x2Graphic ld a, $4c hlcoord 3, 12 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 15, 2 - call Functionb98ee + call Mail_Draw2x2Graphic ld a, $50 hlcoord 6, 3 - call Functionb98ee + call Mail_Draw2x2Graphic ld a, $40 hlcoord 13, 2 ld [hli], a @@ -210,102 +211,104 @@ Functionb9351: ; b9351 hlcoord 6, 11 ld [hli], a pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b93d2 LoadEonMailGFX: ; b93d2 push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b997e - ld c, $8 - call Functionb9915 - ld de, Unknown_b998e - ld c, $8 - call Functionb990c - ld de, Unknown_b998e - ld c, $8 - call Functionb990c - ld de, Unknown_b997e - ld c, $8 - call Functionb9915 - ld de, Unknown_b9d76 - ld c, $8 - call Functionb9915 - ld de, MailPikaGFX - ld c, $30 - call Functionb991e + ld de, EonMailBorder1GFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, EonMailBorder2GFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + ld de, EonMailBorder2GFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + ld de, EonMailBorder1GFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, EonMailBorder3GFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, MailEeveeGFX + ld c, 6 * 8 + call LoadMailGFX_Color3 ld hl, VTiles2 tile $3d - ld de, Unknown_b9c9e - ld c, $20 - call Functionb990c - ld de, Unknown_b998e - ld c, $8 - call Functionb9915 + ld de, MailLargeCircleGFX + ld c, 4 * 8 + call LoadMailGFX_Color1 + ld de, EonMailBorder2GFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld a, $31 hlcoord 0, 0 - call Functionb98a8 + call Mail_Place18TileAlternatingRow hlcoord 1, 17 - call Functionb98a8 + call Mail_Place18TileAlternatingRow ld a, $33 hlcoord 0, 1 - call Functionb98ba + call Mail_Place16TileAlternatingColumn hlcoord 19, 0 - call Functionb98ba + call Mail_Place16TileAlternatingColumn hlcoord 2, 15 ld a, $35 - call Functionb98d4 + call Mail_Draw16TileRow inc a hlcoord 15, 14 - call Functionb98fc - call Functionb9491 + call Mail_Draw3x2Graphic + call LovelyEonMail_PlaceIcons pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b944b LoadLovelyMailGFX: ; b944b push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b9e26 - ld c, $28 - call Functionb9915 + ld de, LovelyMailBorderGFX + ld c, 5 * 8 + call LoadMailGFX_Color2 ld de, MailPoliwagGFX - ld c, $30 - call Functionb991e - ld de, Unknown_b9966 - ld c, $8 - call Functionb9915 - ld de, Unknown_b9c5e - ld c, $20 - call Functionb9915 - ld de, Unknown_b996e - ld c, $8 - call Functionb990c - call Functionb987b + ld c, 6 * 8 + call LoadMailGFX_Color3 + ld de, LovelyMailUnderlineGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, LovelyMailLargeHeartGFX + ld c, 4 * 8 + call LoadMailGFX_Color2 + ld de, LovelyMailSmallHeartGFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + + call DrawMailBorder2 hlcoord 2, 15 ld a, $3c - call Functionb98d4 + call Mail_Draw16TileRow ld a, $36 hlcoord 15, 14 - call Functionb98fc - call Functionb9491 + call Mail_Draw3x2Graphic + call LovelyEonMail_PlaceIcons pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b9491 -Functionb9491: ; b9491 +LovelyEonMail_PlaceIcons: ; b9491 ld a, $3d hlcoord 2, 2 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 16, 2 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 9, 4 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 2, 11 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 6, 12 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 12, 11 - call Functionb98ee + call Mail_Draw2x2Graphic ld a, $41 hlcoord 5, 4 ld [hl], a @@ -327,32 +330,32 @@ Functionb9491: ; b9491 LoadMorphMailGFX: ; b94d6 push bc ld hl, VTiles2 tile $31 - ld bc, $28 - call Functionb97f8 - ld de, Unknown_b9c96 - ld c, 8 - call Functionb9915 - ld de, Unknown_b9c7e - ld c, 8 - call Functionb9915 - ld de, Unknown_b993e - ld c, 8 - call Functionb9915 - ld de, Unknown_b997e - ld c, 8 - call Functionb990c - ld de, Unknown_b9926 - ld c, 8 - call Functionb9915 + ld bc, 5 * 8 + call MailGFX_GenerateMonochromeTilesColor2 + ld de, MorphMailBorderGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, MorphMailBorderCorner1GFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, MorphMailBorderCorner2GFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, EonMailBorder1GFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + ld de, MorphMailDividerGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 ld de, MailDittoGFX - ld c, $30 - call Functionb991e - call Functionb987b + ld c, 6 * 8 + call LoadMailGFX_Color3 + call DrawMailBorder2 ld a, $31 hlcoord 1, 1 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 17, 15 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 1, 3 ld [hl], a hlcoord 3, 1 @@ -382,79 +385,80 @@ LoadMorphMailGFX: ; b94d6 inc a hlcoord 2, 15 ld b, $e - call Functionb98de + call Mail_DrawRowLoop inc a hlcoord 2, 11 - call Functionb98d4 + call Mail_Draw16TileRow hlcoord 2, 5 - call Functionb98d4 + call Mail_Draw16TileRow inc a hlcoord 6, 1 - call Functionb98d0 + call Mail_Draw13TileRow hlcoord 1, 16 - call Functionb98d0 + call Mail_Draw13TileRow inc a hlcoord 3, 13 - call Functionb98fc + call Mail_Draw3x2Graphic pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b9582 LoadBlueSkyMailGFX: ; b9582 push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b997e - ld c, $8 - call Functionb9915 + ld de, EonMailBorder1GFX + ld c, 1 * 8 + call LoadMailGFX_Color2 ld a, $ff - ld bc, $10 + ld bc, 1 tiles call ByteFill - ld de, Unknown_b992e - ld c, $8 - call Functionb991e + ld de, BlueSkyMailGrassGFX + ld c, 1 * 8 + call LoadMailGFX_Color3 ld de, MailDragoniteGFX - ld c, $b8 - call Functionb991e + ld c, 23 * 8 + call LoadMailGFX_Color3 ld de, MailCloudGFX - ld c, $30 - call Functionb990c - ld de, Unknown_b9db6 - ld c, $8 - call Functionb990c + ld c, 6 * 8 + call LoadMailGFX_Color1 + ld de, FlowerMailSenderUnderlineGFX + ld c, 1 * 8 + call LoadMailGFX_Color1 ld de, MailCloudGFX - ld c, $8 - call Functionb990c - ld de, Unknown_b9d26 - ld c, $10 - call Functionb990c - ld de, Unknown_b9d3e - ld c, $8 - call Functionb990c + ld c, 1 * 8 + call LoadMailGFX_Color1 + ld de, MailCloud2GFX + ld c, 2 * 8 + call LoadMailGFX_Color1 + ld de, MailCloud3GFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + ld a, $31 hlcoord 0, 0 - call Functionb98dc + call Mail_DrawFullWidthBorder hlcoord 0, 1 - call Functionb98e3 + call Mail_DrawLeftRightBorder hlcoord 19, 1 - call Functionb98e3 + call Mail_DrawLeftRightBorder inc a hlcoord 0, 17 - call Functionb98dc + call Mail_DrawFullWidthBorder inc a hlcoord 0, 16 - call Functionb98dc + call Mail_DrawFullWidthBorder inc a hlcoord 2, 2 - call Functionb9636 + call Mail_Place6TileRow hlcoord 3, 3 - call Functionb9636 + call Mail_Place6TileRow hlcoord 4, 4 - call Functionb9636 + call Mail_Place6TileRow dec hl ld [hl], $7f dec a hlcoord 15, 14 - call Functionb98ee + call Mail_Draw2x2Graphic add $4 hlcoord 15, 16 ld [hli], a @@ -463,180 +467,184 @@ LoadBlueSkyMailGFX: ; b9582 inc a push af hlcoord 12, 1 - call Functionb98fc + call Mail_Draw3x2Graphic pop af hlcoord 15, 4 - call Functionb98fc + call Mail_Draw3x2Graphic inc a hlcoord 2, 11 - call Functionb98d4 + call Mail_Draw16TileRow inc a hlcoord 10, 3 - call Functionb98ee + call Mail_Draw2x2Graphic pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b9636 -Functionb9636: ; b9636 +Mail_Place6TileRow: ; b9636 ld b, $6 -.asm_b9638 +.loop ld [hli], a inc a dec b - jr nz, .asm_b9638 + jr nz, .loop ret ; b963e LoadFlowerMailGFX: ; b963e push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b9d86 - ld c, $40 - call Functionb990c + ld de, FlowerMailBorderGFX + ld c, 8 * 8 + call LoadMailGFX_Color1 ld de, MailOddishGFX - ld c, $20 - call Functionb991e - ld de, Unknown_b9db6 - ld c, $8 - call Functionb9915 - ld de, Unknown_b9cbe - ld c, $20 - call Functionb990c - ld c, $20 - call Functionb9915 - call Functionb9858 + ld c, 4 * 8 + call LoadMailGFX_Color3 + ld de, FlowerMailSenderUnderlineGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, FlowerMailLargeFlowerGFX + ld c, 4 * 8 + call LoadMailGFX_Color1 + ld c, 4 * 8 + call LoadMailGFX_Color2 + + call DrawMailBorder hlcoord 2, 15 - ld a, $3d - call Functionb98d4 - ld a, $39 + ld a, $3d ; underline + call Mail_Draw16TileRow + ld a, $39 ; oddish hlcoord 16, 13 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 2, 13 - call Functionb98ee + call Mail_Draw2x2Graphic ld a, $3e hlcoord 2, 2 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 5, 3 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 10, 2 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 16, 3 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 5, 11 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 16, 10 - call Functionb98ee + call Mail_Draw2x2Graphic ld a, $42 hlcoord 3, 4 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 12, 3 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 14, 2 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 2, 10 - call Functionb98ee + call Mail_Draw2x2Graphic hlcoord 14, 11 - call Functionb98ee + call Mail_Draw2x2Graphic pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b96ca LoadPortraitMailGFX: ; b96ca push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b9e4e - ld c, $28 - call Functionb9915 - ld de, Unknown_b995e - ld c, $8 - call Functionb9915 + ld de, PortraitMailBorderGFX + ld c, 5 * 8 + call LoadMailGFX_Color2 + ld de, PortraitMailUnderlineGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 ld hl, VTiles2 tile $3d - ld de, Unknown_b9bfe - ld c, $20 - call Functionb990c - ld de, Unknown_b9936 - ld c, $8 - call Functionb9915 - call Functionb987b + ld de, PortraitMailLargePokeballGFX + ld c, 4 * 8 + call LoadMailGFX_Color1 + ld de, PortraitMailSmallPokeballGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + + call DrawMailBorder2 hlcoord 8, 15 ld a, $36 ld b, $a - call Functionb98de - call Functionb9491 + call Mail_DrawRowLoop + call LovelyEonMail_PlaceIcons ld a, $1 ld [UnownLetter], a hlcoord 1, 10 call PrepMonFrontpic pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b9710 LoadMusicMailGFX: ; b9710 push bc ld hl, VTiles2 tile $31 - ld de, Unknown_b9e06 - ld c, $20 - call Functionb9915 - ld de, Unknown_b993e - ld c, $10 - call Functionb9915 - ld de, Unknown_b9996 - ld c, $30 - call Functionb991e + ld de, MusicMailBorderGFX + ld c, 4 * 8 + call LoadMailGFX_Color2 + ld de, MorphMailBorderCorner2GFX + ld c, 2 * 8 + call LoadMailGFX_Color2 + ld de, MailNatuGFX + ld c, 6 * 8 + call LoadMailGFX_Color3 xor a - ld bc, $10 + ld bc, 1 tiles call ByteFill - ld de, Unknown_b9cfe - ld c, $18 - call Functionb990c - ld de, Unknown_b9946 - ld c, $8 - call Functionb990c + ld de, MusicMailLargeNoteGFX + ld c, 3 * 8 + call LoadMailGFX_Color1 + ld de, MusicMailSmallNoteGFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + ld a, $31 hlcoord 0, 0 - call Functionb98a8 + call Mail_Place18TileAlternatingRow hlcoord 1, 17 - call Functionb98a8 + call Mail_Place18TileAlternatingRow ld a, $33 hlcoord 0, 1 - call Functionb98ba + call Mail_Place16TileAlternatingColumn hlcoord 19, 0 - call Functionb98ba + call Mail_Place16TileAlternatingColumn ld a, $35 hlcoord 2, 15 - call Functionb989e + call Mail_Place14TileAlternatingRow ld a, $37 hlcoord 15, 14 - call Functionb98fc - call Functionb9491 + call Mail_Draw3x2Graphic + call LovelyEonMail_PlaceIcons pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b9776 LoadMirageMailGFX: ; b9776 push bc ld hl, VTiles2 tile $31 - ld bc, $28 - call Functionb97f8 - ld de, Unknown_b992e - ld c, $8 - call Functionb9915 + ld bc, 5 * 8 + call MailGFX_GenerateMonochromeTilesColor2 + ld de, BlueSkyMailGrassGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 ld de, MailMewGFX - ld c, $90 - call Functionb9915 - ld de, Unknown_b9dce - ld c, $8 - call Functionb990c - ld de, Unknown_b9df6 - ld c, $8 - call Functionb990c - call Functionb987b + ld c, 18 * 8 + call LoadMailGFX_Color2 + ld de, MirageMailTopDividerGFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + ld de, MirageMailBottomDividerGFX + ld c, 1 * 8 + call LoadMailGFX_Color1 + + call DrawMailBorder2 ld a, $36 hlcoord 1, 16 - call Functionb98d8 + call Mail_DrawTopBottomBorder inc a hlcoord 15, 14 - call Functionb98fc + call Mail_Draw3x2Graphic inc a hlcoord 15, 16 ld [hli], a @@ -644,13 +652,13 @@ LoadMirageMailGFX: ; b9776 ld [hl], a ld a, $3f hlcoord 1, 1 - call Functionb98a8 + call Mail_Place18TileAlternatingRow ld a, $41 hlcoord 0, 2 - call Functionb98b5 + call Mail_Place14TileAlternatingColumn ld a, $43 hlcoord 19, 2 - call Functionb98b5 + call Mail_Place14TileAlternatingColumn ld a, $45 hlcoord 0, 1 ld [hl], a @@ -665,16 +673,16 @@ LoadMirageMailGFX: ; b9776 ld [hl], a inc a hlcoord 2, 5 - call Functionb98d4 + call Mail_Draw16TileRow inc a hlcoord 2, 11 - call Functionb98d4 + call Mail_Draw16TileRow pop hl - jp Functionb9803 + jp MailGFX_PlaceMessage ; b97f8 -Functionb97f8: ; b97f8 -.asm_b97f8 +MailGFX_GenerateMonochromeTilesColor2: ; b97f8 +.loop xor a ld [hli], a ld a, $ff @@ -682,24 +690,24 @@ Functionb97f8: ; b97f8 dec bc ld a, b or c - jr nz, .asm_b97f8 + jr nz, .loop ret ; b9803 -Functionb9803: ; b9803 - ld bc, $2f +MailGFX_PlaceMessage: ; b9803 + ld bc, MAIL_STRUCT_LENGTH ld de, wd002 ld a, $0 call GetSRAMBank call CopyBytes call CloseSRAM - ld hl, wd023 + ld hl, wd002 + sPartyMon1MailAuthor - sPartyMon1Mail ld de, wd050 - ld bc, $a + ld bc, NAME_LENGTH - 1 call CopyBytes - ld a, $50 - ld [wd023], a - ld [wd05a], a + ld a, "@" + ld [wd002 + sPartyMon1MailAuthor - sPartyMon1Mail], a + ld [wd050 + NAME_LENGTH - 1], a ld de, wd002 hlcoord 2, 7 call PlaceString @@ -707,110 +715,112 @@ Functionb9803: ; b9803 ld a, [de] and a ret z - ld a, [wd1ec] + ld a, [Buffer3] hlcoord 8, 14 - cp $3 - jr z, .asm_b984b + cp $3 ; PORTRAITMAIL + jr z, .place_author hlcoord 6, 14 - cp $6 - jr z, .asm_b984b + cp $6 ; MORPH_MAIL + jr z, .place_author hlcoord 5, 14 -.asm_b984b +.place_author jp PlaceString ; b984e Functionb984e: ; b984e -.asm_b984e +.loop ld a, [hl] xor $ff ld [hli], a dec bc ld a, b or c - jr nz, .asm_b984e + jr nz, .loop ret ; b9858 -Functionb9858: ; b9858 +DrawMailBorder: ; b9858 hlcoord 0, 0 ld a, $31 ld [hli], a inc a - call Functionb98d8 + call Mail_DrawTopBottomBorder inc a ld [hli], a inc a - call Functionb98e3 + call Mail_DrawLeftRightBorder ld a, $36 ld [hli], a inc a - call Functionb98d8 + call Mail_DrawTopBottomBorder hlcoord 19, 1 ld a, $35 - call Functionb98e3 + call Mail_DrawLeftRightBorder ld a, $38 ld [hl], a ret ; b987b -Functionb987b: ; b987b +DrawMailBorder2: ; b987b hlcoord 0, 0 ld a, $31 ld [hli], a inc a - call Functionb98d8 + call Mail_DrawTopBottomBorder ld [hl], $31 inc hl inc a - call Functionb98e3 + call Mail_DrawLeftRightBorder ld [hl], $31 inc hl inc a - call Functionb98d8 + call Mail_DrawTopBottomBorder hlcoord 19, 1 ld a, $35 - call Functionb98e3 + call Mail_DrawLeftRightBorder ld [hl], $31 ret ; b989e -Functionb989e: ; b989e +Mail_Place14TileAlternatingRow: ; b989e push af - ld b, $7 - jr Functionb98ab + ld b, 14 / 2 + jr Mail_PlaceAlternatingRow -Functionb98a3: ; b98a3 +Mail_Place16TileAlternatingRow: ; b98a3 push af - ld b, $8 - jr Functionb98ab + ld b, 16 / 2 + jr Mail_PlaceAlternatingRow -Functionb98a8: ; b98a8 +Mail_Place18TileAlternatingRow: ; b98a8 push af - ld b, $9 + ld b, 18 / 2 -Functionb98ab: ; b98ab +Mail_PlaceAlternatingRow: ; b98ab +.loop ld [hli], a inc a ld [hli], a dec a dec b - jr nz, Functionb98ab + jr nz, .loop ld [hl], a pop af ret ; b98b5 -Functionb98b5: ; b98b5 +Mail_Place14TileAlternatingColumn: ; b98b5 push af - ld b, $7 - jr Functionb98bd + ld b, 14 / 2 + jr Mail_PlaceAlternatingColumn -Functionb98ba: ; b98ba +Mail_Place16TileAlternatingColumn: ; b98ba push af - ld b, $8 + ld b, 16 / 2 -Functionb98bd: ; b98bd +Mail_PlaceAlternatingColumn: ; b98bd +.loop ld [hl], a ld de, SCREEN_WIDTH add hl, de @@ -819,55 +829,56 @@ Functionb98bd: ; b98bd add hl, de dec a dec b - jr nz, Functionb98bd + jr nz, .loop ld [hl], a pop af ret ; b98cc -Functionb98cc: ; b98cc +Mail_Draw7TileRow: ; b98cc ld b, $7 - jr Functionb98de + jr Mail_DrawRowLoop -Functionb98d0: ; b98d0 +Mail_Draw13TileRow: ; b98d0 ld b, $d - jr Functionb98de + jr Mail_DrawRowLoop -Functionb98d4: ; b98d4 +Mail_Draw16TileRow: ; b98d4 ld b, $10 - jr Functionb98de + jr Mail_DrawRowLoop -Functionb98d8: ; b98d8 - ld b, $12 - jr Functionb98de +Mail_DrawTopBottomBorder: ; b98d8 + ld b, SCREEN_WIDTH - 2 + jr Mail_DrawRowLoop -Functionb98dc: ; b98dc - ld b, $14 +Mail_DrawFullWidthBorder: ; b98dc + ld b, SCREEN_WIDTH -Functionb98de: ; b98de +Mail_DrawRowLoop: ; b98de +.loop ld [hli], a dec b - jr nz, Functionb98de + jr nz, .loop ret ; b98e3 -Functionb98e3: ; b98e3 - ld b, $10 +Mail_DrawLeftRightBorder: ; b98e3 + ld b, SCREEN_HEIGHT - 2 ld de, SCREEN_WIDTH -.asm_b98e8 +.loop ld [hl], a add hl, de dec b - jr nz, .asm_b98e8 + jr nz, .loop ret ; b98ee -Functionb98ee: ; b98ee +Mail_Draw2x2Graphic: ; b98ee push af ld [hli], a inc a ld [hl], a - ld bc, $13 + ld bc, SCREEN_WIDTH - 1 add hl, bc inc a ld [hli], a @@ -877,13 +888,13 @@ Functionb98ee: ; b98ee ret ; b98fc -Functionb98fc: ; b98fc +Mail_Draw3x2Graphic: ; b98fc ld [hli], a inc a ld [hli], a inc a ld [hl], a - ld bc, SCREEN_HEIGHT + ld bc, SCREEN_WIDTH - 2 add hl, bc inc a ld [hli], a @@ -894,176 +905,177 @@ Functionb98fc: ; b98fc ret ; b990c -Functionb990c: ; b990c -.asm_b990c +LoadMailGFX_Color1: ; b990c +.loop ld a, [de] inc de ld [hli], a xor a ld [hli], a dec c - jr nz, .asm_b990c + jr nz, .loop ret ; b9915 -Functionb9915: ; b9915 -.asm_b9915 +LoadMailGFX_Color2: ; b9915 +.loop xor a ld [hli], a ld a, [de] inc de ld [hli], a dec c - jr nz, .asm_b9915 + jr nz, .loop ret ; b991e -Functionb991e: ; b991e -.asm_b991e +LoadMailGFX_Color3: ; b991e +.loop ld a, [de] inc de rept 2 ld [hli], a endr dec c - jr nz, .asm_b991e + jr nz, .loop ret ; b9926 -Unknown_b9926: ; b9926 -INCBIN "gfx/unknown/0b9926.1bpp" +MorphMailDividerGFX: ; b9926 +INCBIN "gfx/mail/0b9926.1bpp" -Unknown_b992e: ; b992e -INCBIN "gfx/unknown/0b992e.1bpp" +BlueSkyMailGrassGFX: ; b992e +INCBIN "gfx/mail/0b992e.1bpp" -Unknown_b9936: ; b9936 -INCBIN "gfx/unknown/0b9936.1bpp" +PortraitMailSmallPokeballGFX: ; b9936 +INCBIN "gfx/mail/0b9936.1bpp" -Unknown_b993e: ; b993e -INCBIN "gfx/unknown/0b993e.1bpp" +MorphMailBorderCorner2GFX: ; b993e +INCBIN "gfx/mail/0b993e.1bpp" -Unknown_b9946: ; b9946 -INCBIN "gfx/unknown/0b9946.1bpp" +MusicMailSmallNoteGFX: ; b9946 +INCBIN "gfx/mail/0b9946.1bpp" -Unknown_b994e: ; b994e -INCBIN "gfx/unknown/0b994e.1bpp" +SurfMailWaveGFX: ; b994e +INCBIN "gfx/mail/0b994e.1bpp" -Unknown_b995e: ; b995e -INCBIN "gfx/unknown/0b995e.1bpp" +PortraitMailUnderlineGFX: ; b995e +INCBIN "gfx/mail/0b995e.1bpp" -Unknown_b9966: ; b9966 -INCBIN "gfx/unknown/0b9966.1bpp" +LovelyMailUnderlineGFX: ; b9966 +INCBIN "gfx/mail/0b9966.1bpp" -Unknown_b996e: ; b996e -INCBIN "gfx/unknown/0b996e.1bpp" +LovelyMailSmallHeartGFX: ; b996e +INCBIN "gfx/mail/0b996e.1bpp" -Unknown_b9976: ; b9976 -INCBIN "gfx/unknown/0b9976.1bpp" +SurfLiteBlueMailSmallShapesGFX: ; b9976 +INCBIN "gfx/mail/0b9976.1bpp" -Unknown_b997e: ; b997e -INCBIN "gfx/unknown/0b997e.1bpp" +EonMailBorder1GFX: ; b997e +INCBIN "gfx/mail/0b997e.1bpp" -Unknown_b998e: ; b998e -INCBIN "gfx/unknown/0b998e.1bpp" +EonMailBorder2GFX: ; b998e +INCBIN "gfx/mail/0b998e.1bpp" -Unknown_b9996: ; b9996 -INCBIN "gfx/unknown/0b9996.1bpp" +MailNatuGFX: ; b9996 +INCBIN "gfx/mail/0b9996.1bpp" MailDratiniGFX: ; b99c6 -INCBIN "gfx/unknown/0b99c6.1bpp" +INCBIN "gfx/mail/0b99c6.1bpp" MailPoliwagGFX: ; b99f6 -INCBIN "gfx/unknown/0b99f6.1bpp" +INCBIN "gfx/mail/0b99f6.1bpp" MailLaprasGFX: ; b9a26 -INCBIN "gfx/unknown/0b9a26.1bpp" +INCBIN "gfx/mail/0b9a26.1bpp" -MailPikaGFX: ; b9a56 -INCBIN "gfx/unknown/0b9a56.1bpp" +MailEeveeGFX: ; b9a56 +INCBIN "gfx/mail/0b9a56.1bpp" MailDittoGFX: ; b9a86 -INCBIN "gfx/unknown/0b9a86.1bpp" +INCBIN "gfx/mail/0b9a86.1bpp" MailMewGFX: ; b9ab6 -INCBIN "gfx/unknown/0b9ab6.1bpp" +INCBIN "gfx/mail/0b9ab6.1bpp" MailDragoniteGFX: ; b9b46 -INCBIN "gfx/unknown/0b9b46.1bpp" +INCBIN "gfx/mail/0b9b46.1bpp" MailSentretGFX: ; b9bce -INCBIN "gfx/unknown/0b9bce.1bpp" +INCBIN "gfx/mail/0b9bce.1bpp" -Unknown_b9bee: ; b9bee -INCBIN "gfx/unknown/0b9bee.1bpp" +MailUnusedGrassGFX: ; b9bee +INCBIN "gfx/mail/0b9bee.1bpp" -Unknown_b9bfe: ; b9bfe -INCBIN "gfx/unknown/0b9bfe.1bpp" +PortraitMailLargePokeballGFX: ; b9bfe +INCBIN "gfx/mail/0b9bfe.1bpp" MailOddishGFX: ; b9c1e -INCBIN "gfx/unknown/0b9c1e.1bpp" +INCBIN "gfx/mail/0b9c1e.1bpp" -Unknown_b9c3e: ; b9c3e -INCBIN "gfx/unknown/0b9c3e.1bpp" +SurfLiteBlueMailLargeShapesGFX: ; b9c3e +INCBIN "gfx/mail/0b9c3e.1bpp" -Unknown_b9c5e: ; b9c5e -INCBIN "gfx/unknown/0b9c5e.1bpp" +LovelyMailLargeHeartGFX: ; b9c5e +INCBIN "gfx/mail/0b9c5e.1bpp" -Unknown_b9c7e: ; b9c7e -INCBIN "gfx/unknown/0b9c7e.1bpp" +MorphMailBorderCorner1GFX: ; b9c7e +INCBIN "gfx/mail/0b9c7e.1bpp" -Unknown_b9c96: ; b9c96 -INCBIN "gfx/unknown/0b9c96.1bpp" +MorphMailBorderGFX: ; b9c96 +INCBIN "gfx/mail/0b9c96.1bpp" -Unknown_b9c9e: ; b9c9e -INCBIN "gfx/unknown/0b9c9e.1bpp" +MailLargeCircleGFX: ; b9c9e +INCBIN "gfx/mail/0b9c9e.1bpp" -Unknown_b9cbe: ; b9cbe -INCBIN "gfx/unknown/0b9cbe.1bpp" +FlowerMailLargeFlowerGFX: ; b9cbe +INCBIN "gfx/mail/0b9cbe.1bpp" -Unknown_b9cde: ; b9cde -INCBIN "gfx/unknown/0b9cde.1bpp" +FlowerMailSmallFlowerGFX: ; b9cde +; indirectly referenced +INCBIN "gfx/mail/0b9cde.1bpp" -Unknown_b9cfe: ; b9cfe -INCBIN "gfx/unknown/0b9cfe.1bpp" +MusicMailLargeNoteGFX: ; b9cfe +INCBIN "gfx/mail/0b9cfe.1bpp" MailCloudGFX: ; b9d16 -INCBIN "gfx/unknown/0b9d16.1bpp" +INCBIN "gfx/mail/0b9d16.1bpp" -Unknown_b9d26: ; b9d26 -INCBIN "gfx/unknown/0b9d26.1bpp" +MailCloud2GFX: ; b9d26 +INCBIN "gfx/mail/0b9d26.1bpp" -Unknown_b9d3e: ; b9d3e -INCBIN "gfx/unknown/0b9d3e.1bpp" +MailCloud3GFX: ; b9d3e +INCBIN "gfx/mail/0b9d3e.1bpp" -Unknown_b9d46: ; b9d46 -INCBIN "gfx/unknown/0b9d46.1bpp" +SurfMailBorderGFX: ; b9d46 +INCBIN "gfx/mail/0b9d46.1bpp" -Unknown_b9d76: ; b9d76 -INCBIN "gfx/unknown/0b9d76.1bpp" +EonMailBorder3GFX: ; b9d76 +INCBIN "gfx/mail/0b9d76.1bpp" -Unknown_b9d86: ; b9d86 -INCBIN "gfx/unknown/0b9d86.1bpp" +FlowerMailBorderGFX: ; b9d86 +INCBIN "gfx/mail/0b9d86.1bpp" -Unknown_b9db6: ; b9db6 -INCBIN "gfx/unknown/0b9db6.1bpp" +FlowerMailSenderUnderlineGFX: ; b9db6 +INCBIN "gfx/mail/0b9db6.1bpp" -Unknown_b9dc6: ; b9dc6 -INCBIN "gfx/unknown/0b9dc6.1bpp" +LiteBlueMailBorderGFX: ; b9dc6 +INCBIN "gfx/mail/0b9dc6.1bpp" -Unknown_b9dce: ; b9dce -INCBIN "gfx/unknown/0b9dce.1bpp" +MirageMailTopDividerGFX: ; b9dce +INCBIN "gfx/mail/0b9dce.1bpp" -Unknown_b9df6: ; b9df6 -INCBIN "gfx/unknown/0b9df6.1bpp" +MirageMailBottomDividerGFX: ; b9df6 +INCBIN "gfx/mail/0b9df6.1bpp" -Unknown_b9e06: ; b9e06 -INCBIN "gfx/unknown/0b9e06.1bpp" +MusicMailBorderGFX: ; b9e06 +INCBIN "gfx/mail/0b9e06.1bpp" -Unknown_b9e26: ; b9e26 -INCBIN "gfx/unknown/0b9e26.1bpp" +LovelyMailBorderGFX: ; b9e26 +INCBIN "gfx/mail/0b9e26.1bpp" -Unknown_b9e4e: ; b9e4e -INCBIN "gfx/unknown/0b9e4e.1bpp" +PortraitMailBorderGFX: ; b9e4e +INCBIN "gfx/mail/0b9e4e.1bpp" ItemIsMail: ; b9e76 @@ -1084,5 +1096,5 @@ ItemIsMail: ; b9e76 db BLUESKY_MAIL db MUSIC_MAIL db MIRAGE_MAIL - db $ff + db -1 ; b9e8b diff --git a/gfx/unknown/0b9926.1bpp b/gfx/mail/0b9926.1bpp similarity index 100% rename from gfx/unknown/0b9926.1bpp rename to gfx/mail/0b9926.1bpp diff --git a/gfx/unknown/0b992e.1bpp b/gfx/mail/0b992e.1bpp similarity index 100% rename from gfx/unknown/0b992e.1bpp rename to gfx/mail/0b992e.1bpp diff --git a/gfx/unknown/0b9936.1bpp b/gfx/mail/0b9936.1bpp similarity index 100% rename from gfx/unknown/0b9936.1bpp rename to gfx/mail/0b9936.1bpp diff --git a/gfx/unknown/0b993e.1bpp b/gfx/mail/0b993e.1bpp similarity index 100% rename from gfx/unknown/0b993e.1bpp rename to gfx/mail/0b993e.1bpp diff --git a/gfx/unknown/0b9946.1bpp b/gfx/mail/0b9946.1bpp similarity index 100% rename from gfx/unknown/0b9946.1bpp rename to gfx/mail/0b9946.1bpp diff --git a/gfx/unknown/0b994e.1bpp b/gfx/mail/0b994e.1bpp similarity index 100% rename from gfx/unknown/0b994e.1bpp rename to gfx/mail/0b994e.1bpp diff --git a/gfx/unknown/0b995e.1bpp b/gfx/mail/0b995e.1bpp similarity index 100% rename from gfx/unknown/0b995e.1bpp rename to gfx/mail/0b995e.1bpp diff --git a/gfx/unknown/0b9966.1bpp b/gfx/mail/0b9966.1bpp similarity index 100% rename from gfx/unknown/0b9966.1bpp rename to gfx/mail/0b9966.1bpp diff --git a/gfx/unknown/0b996e.1bpp b/gfx/mail/0b996e.1bpp similarity index 100% rename from gfx/unknown/0b996e.1bpp rename to gfx/mail/0b996e.1bpp diff --git a/gfx/unknown/0b9976.1bpp b/gfx/mail/0b9976.1bpp similarity index 100% rename from gfx/unknown/0b9976.1bpp rename to gfx/mail/0b9976.1bpp diff --git a/gfx/unknown/0b997e.1bpp b/gfx/mail/0b997e.1bpp similarity index 100% rename from gfx/unknown/0b997e.1bpp rename to gfx/mail/0b997e.1bpp diff --git a/gfx/unknown/0b998e.1bpp b/gfx/mail/0b998e.1bpp similarity index 100% rename from gfx/unknown/0b998e.1bpp rename to gfx/mail/0b998e.1bpp diff --git a/gfx/unknown/0b9996.1bpp b/gfx/mail/0b9996.1bpp similarity index 100% rename from gfx/unknown/0b9996.1bpp rename to gfx/mail/0b9996.1bpp diff --git a/gfx/unknown/0b99c6.1bpp b/gfx/mail/0b99c6.1bpp similarity index 100% rename from gfx/unknown/0b99c6.1bpp rename to gfx/mail/0b99c6.1bpp diff --git a/gfx/unknown/0b99f6.1bpp b/gfx/mail/0b99f6.1bpp similarity index 100% rename from gfx/unknown/0b99f6.1bpp rename to gfx/mail/0b99f6.1bpp diff --git a/gfx/unknown/0b9a26.1bpp b/gfx/mail/0b9a26.1bpp similarity index 100% rename from gfx/unknown/0b9a26.1bpp rename to gfx/mail/0b9a26.1bpp diff --git a/gfx/unknown/0b9a56.1bpp b/gfx/mail/0b9a56.1bpp similarity index 100% rename from gfx/unknown/0b9a56.1bpp rename to gfx/mail/0b9a56.1bpp diff --git a/gfx/unknown/0b9a86.1bpp b/gfx/mail/0b9a86.1bpp similarity index 100% rename from gfx/unknown/0b9a86.1bpp rename to gfx/mail/0b9a86.1bpp diff --git a/gfx/unknown/0b9ab6.1bpp b/gfx/mail/0b9ab6.1bpp similarity index 100% rename from gfx/unknown/0b9ab6.1bpp rename to gfx/mail/0b9ab6.1bpp diff --git a/gfx/unknown/0b9b46.1bpp b/gfx/mail/0b9b46.1bpp similarity index 100% rename from gfx/unknown/0b9b46.1bpp rename to gfx/mail/0b9b46.1bpp diff --git a/gfx/unknown/0b9bce.1bpp b/gfx/mail/0b9bce.1bpp similarity index 100% rename from gfx/unknown/0b9bce.1bpp rename to gfx/mail/0b9bce.1bpp diff --git a/gfx/unknown/0b9bee.1bpp b/gfx/mail/0b9bee.1bpp similarity index 100% rename from gfx/unknown/0b9bee.1bpp rename to gfx/mail/0b9bee.1bpp diff --git a/gfx/unknown/0b9bfe.1bpp b/gfx/mail/0b9bfe.1bpp similarity index 100% rename from gfx/unknown/0b9bfe.1bpp rename to gfx/mail/0b9bfe.1bpp diff --git a/gfx/unknown/0b9c1e.1bpp b/gfx/mail/0b9c1e.1bpp similarity index 100% rename from gfx/unknown/0b9c1e.1bpp rename to gfx/mail/0b9c1e.1bpp diff --git a/gfx/unknown/0b9c3e.1bpp b/gfx/mail/0b9c3e.1bpp similarity index 100% rename from gfx/unknown/0b9c3e.1bpp rename to gfx/mail/0b9c3e.1bpp diff --git a/gfx/unknown/0b9c5e.1bpp b/gfx/mail/0b9c5e.1bpp similarity index 100% rename from gfx/unknown/0b9c5e.1bpp rename to gfx/mail/0b9c5e.1bpp diff --git a/gfx/unknown/0b9c7e.1bpp b/gfx/mail/0b9c7e.1bpp similarity index 100% rename from gfx/unknown/0b9c7e.1bpp rename to gfx/mail/0b9c7e.1bpp diff --git a/gfx/unknown/0b9c96.1bpp b/gfx/mail/0b9c96.1bpp similarity index 100% rename from gfx/unknown/0b9c96.1bpp rename to gfx/mail/0b9c96.1bpp diff --git a/gfx/unknown/0b9c9e.1bpp b/gfx/mail/0b9c9e.1bpp similarity index 100% rename from gfx/unknown/0b9c9e.1bpp rename to gfx/mail/0b9c9e.1bpp diff --git a/gfx/unknown/0b9cbe.1bpp b/gfx/mail/0b9cbe.1bpp similarity index 100% rename from gfx/unknown/0b9cbe.1bpp rename to gfx/mail/0b9cbe.1bpp diff --git a/gfx/unknown/0b9cde.1bpp b/gfx/mail/0b9cde.1bpp similarity index 100% rename from gfx/unknown/0b9cde.1bpp rename to gfx/mail/0b9cde.1bpp diff --git a/gfx/unknown/0b9cfe.1bpp b/gfx/mail/0b9cfe.1bpp similarity index 100% rename from gfx/unknown/0b9cfe.1bpp rename to gfx/mail/0b9cfe.1bpp diff --git a/gfx/unknown/0b9d16.1bpp b/gfx/mail/0b9d16.1bpp similarity index 100% rename from gfx/unknown/0b9d16.1bpp rename to gfx/mail/0b9d16.1bpp diff --git a/gfx/unknown/0b9d26.1bpp b/gfx/mail/0b9d26.1bpp similarity index 100% rename from gfx/unknown/0b9d26.1bpp rename to gfx/mail/0b9d26.1bpp diff --git a/gfx/unknown/0b9d3e.1bpp b/gfx/mail/0b9d3e.1bpp similarity index 100% rename from gfx/unknown/0b9d3e.1bpp rename to gfx/mail/0b9d3e.1bpp diff --git a/gfx/unknown/0b9d46.1bpp b/gfx/mail/0b9d46.1bpp similarity index 100% rename from gfx/unknown/0b9d46.1bpp rename to gfx/mail/0b9d46.1bpp diff --git a/gfx/unknown/0b9d76.1bpp b/gfx/mail/0b9d76.1bpp similarity index 100% rename from gfx/unknown/0b9d76.1bpp rename to gfx/mail/0b9d76.1bpp diff --git a/gfx/unknown/0b9d86.1bpp b/gfx/mail/0b9d86.1bpp similarity index 100% rename from gfx/unknown/0b9d86.1bpp rename to gfx/mail/0b9d86.1bpp diff --git a/gfx/unknown/0b9db6.1bpp b/gfx/mail/0b9db6.1bpp similarity index 100% rename from gfx/unknown/0b9db6.1bpp rename to gfx/mail/0b9db6.1bpp diff --git a/gfx/unknown/0b9dc6.1bpp b/gfx/mail/0b9dc6.1bpp similarity index 100% rename from gfx/unknown/0b9dc6.1bpp rename to gfx/mail/0b9dc6.1bpp diff --git a/gfx/unknown/0b9dce.1bpp b/gfx/mail/0b9dce.1bpp similarity index 100% rename from gfx/unknown/0b9dce.1bpp rename to gfx/mail/0b9dce.1bpp diff --git a/gfx/unknown/0b9df6.1bpp b/gfx/mail/0b9df6.1bpp similarity index 100% rename from gfx/unknown/0b9df6.1bpp rename to gfx/mail/0b9df6.1bpp diff --git a/gfx/unknown/0b9e06.1bpp b/gfx/mail/0b9e06.1bpp similarity index 100% rename from gfx/unknown/0b9e06.1bpp rename to gfx/mail/0b9e06.1bpp diff --git a/gfx/unknown/0b9e26.1bpp b/gfx/mail/0b9e26.1bpp similarity index 100% rename from gfx/unknown/0b9e26.1bpp rename to gfx/mail/0b9e26.1bpp diff --git a/gfx/unknown/0b9e4e.1bpp b/gfx/mail/0b9e4e.1bpp similarity index 100% rename from gfx/unknown/0b9e4e.1bpp rename to gfx/mail/0b9e4e.1bpp