From ed44de4bb4688f6b8c83aeb4f5fd8658d17615fb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Nov 2015 14:41:47 -0500 Subject: More map object work --- gfx/misc/boulderdust.2bpp | Bin 0 -> 32 bytes gfx/misc/fishing1.2bpp | 1 - gfx/misc/fishing3.2bpp | Bin 32 -> 0 bytes gfx/misc/shadow.2bpp | 1 + 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 gfx/misc/boulderdust.2bpp delete mode 100644 gfx/misc/fishing1.2bpp delete mode 100644 gfx/misc/fishing3.2bpp create mode 100644 gfx/misc/shadow.2bpp (limited to 'gfx') diff --git a/gfx/misc/boulderdust.2bpp b/gfx/misc/boulderdust.2bpp new file mode 100644 index 000000000..f8b9f0180 Binary files /dev/null and b/gfx/misc/boulderdust.2bpp differ diff --git a/gfx/misc/fishing1.2bpp b/gfx/misc/fishing1.2bpp deleted file mode 100644 index b62b99ffc..000000000 --- a/gfx/misc/fishing1.2bpp +++ /dev/null @@ -1 +0,0 @@ -???? \ No newline at end of file diff --git a/gfx/misc/fishing3.2bpp b/gfx/misc/fishing3.2bpp deleted file mode 100644 index f8b9f0180..000000000 Binary files a/gfx/misc/fishing3.2bpp and /dev/null differ diff --git a/gfx/misc/shadow.2bpp b/gfx/misc/shadow.2bpp new file mode 100644 index 000000000..b62b99ffc --- /dev/null +++ b/gfx/misc/shadow.2bpp @@ -0,0 +1 @@ +???? \ No newline at end of file -- cgit v1.2.3 From 3f4044cd4628c156e975971ce0655d3d51917b87 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 18 Nov 2015 13:01:55 -0500 Subject: engine/compose_mail.asm; ldpixel --- gfx/icon/mail2.2bpp | Bin 0 -> 128 bytes gfx/unknown/011ef4.2bpp | Bin 128 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/icon/mail2.2bpp delete mode 100644 gfx/unknown/011ef4.2bpp (limited to 'gfx') diff --git a/gfx/icon/mail2.2bpp b/gfx/icon/mail2.2bpp new file mode 100644 index 000000000..188926899 Binary files /dev/null and b/gfx/icon/mail2.2bpp differ diff --git a/gfx/unknown/011ef4.2bpp b/gfx/unknown/011ef4.2bpp deleted file mode 100644 index 188926899..000000000 Binary files a/gfx/unknown/011ef4.2bpp and /dev/null differ -- cgit v1.2.3 From 93a129eb6dc261faccaf2b2d58daf3db204ab3ba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 19 Nov 2015 18:07:20 -0500 Subject: main.asm is now under 30k lines --- gfx/font.asm | 236 +++++++++++++ gfx/mail.asm | 1088 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1324 insertions(+) create mode 100755 gfx/font.asm create mode 100755 gfx/mail.asm (limited to 'gfx') diff --git a/gfx/font.asm b/gfx/font.asm new file mode 100755 index 000000000..12e20e7f0 --- /dev/null +++ b/gfx/font.asm @@ -0,0 +1,236 @@ +FontExtra: +INCBIN "gfx/misc/font_extra.2bpp" + +Font: +INCBIN "gfx/misc/font.1bpp" + +FontBattleExtra: +INCBIN "gfx/misc/font_battle_extra.2bpp" + +Frames: ; f8800 +INCBIN "gfx/frames/1.1bpp" +INCBIN "gfx/frames/2.1bpp" +INCBIN "gfx/frames/3.1bpp" +INCBIN "gfx/frames/4.1bpp" +INCBIN "gfx/frames/5.1bpp" +INCBIN "gfx/frames/6.1bpp" +INCBIN "gfx/frames/7.1bpp" +INCBIN "gfx/frames/8.1bpp" +INCBIN "gfx/frames/9.1bpp" +; f89b0 + +; TODO: Various misc graphics here. + +GFX_f89b0: ; f89b0 +INCBIN "gfx/unknown/0f89b0.2bpp" +; f8a90 + +ShinyIcon: ; f8a90 +INCBIN "gfx/stats/shiny.2bpp" + +GFX_f8aa0: ; f8aa0 +INCBIN "gfx/unknown/0f8aa0.2bpp" +; f8ac0 + +EnemyHPBarBorderGFX: ; f8ac0 +INCBIN "gfx/battle/enemy_hp_bar_border.1bpp" +; f8ae0 + +HPExpBarBorderGFX: ; f8ae0 +INCBIN "gfx/battle/hp_exp_bar_border.1bpp" +; f8b10 + +ExpBarGFX: ; f8b10 +INCBIN "gfx/battle/expbar.2bpp" +; f8ba0 + +TownMapGFX: ; f8ba0 +INCBIN "gfx/misc/town_map.2bpp.lz" +; f8ea4 + +GFX_f8ea4: ; unused +INCBIN "gfx/unknown/0f8ea4.2bpp" +; f8f24 + +OverworldPhoneIconGFX: ; f8f24 +INCBIN "gfx/mobile/overworld_phone_icon.2bpp" +; f8f34 + +GFX_f8f34: ; unused +INCBIN "gfx/unknown/0f8f34.2bpp" +; f9204 + +TextBoxSpaceGFX: ; f9204 +INCBIN "gfx/frames/space.2bpp" +; f9214 + +MobilePhoneTilesGFX: ; f9214 +INCBIN "gfx/mobile/phone_tiles.2bpp" +; f9344 + +MapEntryFrameGFX: ; f9344 +INCBIN "gfx/frames/map_entry_sign.2bpp" +; f9424 + +GFX_f9424: ; f9424 +INCBIN "gfx/unknown/0f9424.2bpp" +; f9434 + +Footprints: ; f9434 +INCBIN "gfx/misc/footprints.1bpp" +; fb434 + +; This and the following two functions are unreferenced. +Unknown_fb434: + db 0 + +Functionfb435: ; 4b435 + ld a, [Unknown_fb434] + and a + jp nz, Get1bpp_2 + jp Get1bpp +; fb43f + +Functionfb43f: ; fb43f + ld a, [Unknown_fb434] + and a + jp nz, Get2bpp_2 + jp Get2bpp +; End unreferenced block +; fb449 + +_LoadStandardFont:: ; fb449 + ld de, Font + ld hl, VTiles1 + lb bc, BANK(Font), $80 + ld a, [rLCDC] + bit 7, a + jp z, Copy1bpp + + ld de, Font + ld hl, VTiles1 + lb bc, BANK(Font), $20 + call Get1bpp_2 + ld de, Font + $20 * LEN_1BPP_TILE + ld hl, VTiles1 tile $20 + lb bc, BANK(Font), $20 + call Get1bpp_2 + ld de, Font + $40 * LEN_1BPP_TILE + ld hl, VTiles1 tile $40 + lb bc, BANK(Font), $20 + call Get1bpp_2 + ld de, Font + $60 * LEN_1BPP_TILE + ld hl, VTiles1 tile $60 + lb bc, BANK(Font), $20 + call Get1bpp_2 + ret +; fb48a + +_LoadFontsExtra1:: ; fb48a + ld de, MobilePhoneTilesGFX + ld hl, VTiles2 tile $60 + lb bc, BANK(MobilePhoneTilesGFX), 1 + call Get1bpp_2 + ld de, OverworldPhoneIconGFX + ld hl, VTiles2 tile $62 + lb bc, BANK(OverworldPhoneIconGFX), 1 + call Get2bpp_2 + ld de, FontExtra + 3 * LEN_2BPP_TILE + ld hl, VTiles2 tile $63 + lb bc, BANK(FontExtra), $16 + call Get2bpp_2 + jr LoadFrame +; fb4b0 + +_LoadFontsExtra2:: ; fb4b0 + ld de, GFX_f9424 + ld hl, VTiles2 tile $61 + ld b, BANK(GFX_f9424) + ld c, 1 + call Get2bpp_2 + ret +; fb4be + +_LoadFontsBattleExtra:: ; fb4be + ld de, FontBattleExtra + ld hl, VTiles2 tile $60 + lb bc, BANK(FontBattleExtra), $19 + call Get2bpp_2 + jr LoadFrame +; fb4cc + +LoadFrame: ; fb4cc + ld a, [TextBoxFrame] + and 7 + ld bc, TILES_PER_FRAME * LEN_1BPP_TILE + ld hl, Frames + call AddNTimes + ld d, h + ld e, l + ld hl, VTiles2 tile $79 + lb bc, BANK(Frames), TILES_PER_FRAME + call Get1bpp_2 + ld hl, VTiles2 tile $7f + ld de, TextBoxSpaceGFX + lb bc, BANK(TextBoxSpaceGFX), 1 + call Get1bpp_2 + ret +; fb4f2 + +LoadBattleFontsHPBar: ; fb4f2 + ld de, FontBattleExtra + ld hl, VTiles2 tile $60 + lb bc, BANK(FontBattleExtra), $c + call Get2bpp_2 + ld hl, VTiles2 tile $70 + ld de, FontBattleExtra + $10 * LEN_2BPP_TILE + lb bc, BANK(FontBattleExtra), 3 + call Get2bpp_2 + call LoadFrame + +LoadHPBar: ; fb50d + ld de, EnemyHPBarBorderGFX + ld hl, VTiles2 tile $6c + lb bc, BANK(EnemyHPBarBorderGFX), 4 + call Get1bpp_2 + ld de, HPExpBarBorderGFX + ld hl, VTiles2 tile $73 + lb bc, BANK(HPExpBarBorderGFX), 6 + call Get1bpp_2 + ld de, ExpBarGFX + ld hl, VTiles2 tile $55 + lb bc, BANK(ExpBarGFX), 9 + call Get2bpp_2 + ld de, MobilePhoneTilesGFX + 9 * LEN_2BPP_TILE + ld hl, VTiles2 tile $5e + lb bc, BANK(MobilePhoneTilesGFX), 2 + call Get2bpp_2 + ret +; fb53e + +Functionfb53e: ; fb53e + call _LoadFontsBattleExtra + ld de, EnemyHPBarBorderGFX + ld hl, VTiles2 tile $6c + lb bc, BANK(EnemyHPBarBorderGFX), 4 + call Get1bpp_2 + ld de, HPExpBarBorderGFX + ld hl, VTiles2 tile $78 + lb bc, BANK(HPExpBarBorderGFX), 1 + call Get1bpp_2 + ld de, HPExpBarBorderGFX + 3 * LEN_1BPP_TILE + ld hl, VTiles2 tile $76 + lb bc, BANK(HPExpBarBorderGFX), 2 + call Get1bpp_2 + ld de, ExpBarGFX + ld hl, VTiles2 tile $55 + lb bc, BANK(ExpBarGFX), 8 + call Get2bpp_2 + +Functionfb571: ; fb571 + ld de, GFX_f89b0 + ld hl, VTiles2 tile $31 + lb bc, BANK(GFX_f89b0), $11 + call Get2bpp_2 + ret +; fb57e diff --git a/gfx/mail.asm b/gfx/mail.asm new file mode 100755 index 000000000..1276f3fa1 --- /dev/null +++ b/gfx/mail.asm @@ -0,0 +1,1088 @@ +ReadPartyMonMail: ; b9229 + ld a, [CurPartyMon] + ld hl, sPartyMail + ld bc, MAIL_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l +ReadAnyMail: ; b9237 + push de + call ClearBGPalettes + call ClearSprites + call ClearTileMap + call DisableLCD + call LoadFontsExtra + pop de + push de + ld a, BANK(sPartyMail) + call GetSRAMBank + callba Function1de5c8 + call CloseSRAM + ld a, c + ld de, GFX_1de5e6 + or a + jr z, .asm_b9268 + ld de, GFX_1de9e6 + sub $3 + jr c, .asm_b9268 + ld de, GFX_1dede6 + +.asm_b9268 + ld hl, VTiles1 + lb bc, BANK(GFX_1de5e6), $80 + call Get1bpp + pop de + call Functionb92b8 + call EnableLCD + call WaitBGMap + ld a, [wd1ec] + ld e, a + callba Function8cb4 + call SetPalettes + xor a + ld [hJoyPressed], a + call Functionb929a + call ClearBGPalettes + call DisableLCD + call LoadStandardFont + jp EnableLCD +; b929a + +Functionb929a: ; b929a +.asm_b929a + call GetJoypad + ld a, [hJoyPressed] + and A_BUTTON | B_BUTTON | START + jr z, .asm_b929a + and START + jr nz, .asm_b92a8 + ret + +.asm_b92a8 + ld a, [wJumptableIndex] + push af + callab Function845d4 + pop af + ld [wJumptableIndex], a + jr .asm_b929a +; b92b8 + +Functionb92b8: ; b92b8 + ld h, d + ld l, e + push hl + ld a, $0 + call GetSRAMBank + ld de, $2b + add hl, de + ld a, [hli] + ld [Buffer1], a + ld a, [hli] + ld [Buffer2], a + ld a, [hli] + ld [CurPartySpecies], a + ld b, [hl] + call CloseSRAM + ld hl, MailGFXPointers + ld c, 0 +.asm_b92d9 + ld a, [hli] + cp b + jr z, .asm_b92ea + cp $ff + jr z, .asm_b92e6 + inc c +rept 2 + inc hl +endr + jr .asm_b92d9 + +.asm_b92e6 + ld hl, MailGFXPointers + inc hl + +.asm_b92ea + ld a, c + ld [wd1ec], a + ld a, [hli] + ld h, [hl] + ld l, a + ld de, .done + pop bc + push de + jp [hl] +.done + ret +; b92f8 + +MailGFXPointers: ; b92f8 + dbw FLOWER_MAIL, LoadFlowerMailGFX + dbw SURF_MAIL, LoadSurfMailGFX + dbw LITEBLUEMAIL, LoadLiteBlueMailGFX + dbw PORTRAITMAIL, LoadPortraitMailGFX + dbw LOVELY_MAIL, LoadLovelyMailGFX + dbw EON_MAIL, LoadEonMailGFX + dbw MORPH_MAIL, LoadMorphMailGFX + dbw BLUESKY_MAIL, LoadBlueSkyMailGFX + dbw MUSIC_MAIL, LoadMusicMailGFX + dbw MIRAGE_MAIL, LoadMirageMailGFX + db $ff +; b9317 + +LoadSurfMailGFX: ; b9317 + push bc + ld hl, VTiles2 tile $31 + ld de, Unknown_b9d46 + ld c, $40 + call Functionb9915 + ld de, MailLaprasGFX + ld c, $30 + call Functionb991e + ld de, Unknown_b994e + ld c, $8 + call Functionb9915 + jr Functionb9351 + +LoadLiteBlueMailGFX: ; b9335 + push bc + ld hl, VTiles2 tile $31 + ld de, Unknown_b9dc6 + ld c, $40 + call Functionb9915 + ld de, MailDratiniGFX + ld c, $30 + call Functionb991e + ld de, Unknown_b995e + ld c, $8 + call Functionb9915 + +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 + hlcoord 2, 15 + ld a, $3f + call Functionb98d4 + ld a, $39 + hlcoord 15, 14 + call Functionb98fc + ld a, $44 + hlcoord 2, 2 + call Functionb98ee + hlcoord 15, 11 + call Functionb98ee + ld a, $4c + hlcoord 3, 12 + call Functionb98ee + hlcoord 15, 2 + call Functionb98ee + ld a, $50 + hlcoord 6, 3 + call Functionb98ee + ld a, $40 + hlcoord 13, 2 + ld [hli], a + hlcoord 6, 14 + ld [hl], a + ld a, $41 + hlcoord 4, 5 + ld [hli], a + hlcoord 17, 5 + ld [hli], a + hlcoord 13, 12 + ld [hl], a + ld a, $42 + hlcoord 9, 2 + ld [hli], a + hlcoord 14, 5 + ld [hli], a + hlcoord 3, 10 + ld [hl], a + ld a, $43 + hlcoord 6, 11 + ld [hli], a + pop hl + jp Functionb9803 +; 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 hl, VTiles2 tile $3d + ld de, Unknown_b9c9e + ld c, $20 + call Functionb990c + ld de, Unknown_b998e + ld c, $8 + call Functionb9915 + ld a, $31 + hlcoord 0, 0 + call Functionb98a8 + hlcoord 1, 17 + call Functionb98a8 + ld a, $33 + hlcoord 0, 1 + call Functionb98ba + hlcoord 19, 0 + call Functionb98ba + hlcoord 2, 15 + ld a, $35 + call Functionb98d4 + inc a + hlcoord 15, 14 + call Functionb98fc + call Functionb9491 + pop hl + jp Functionb9803 +; b944b + +LoadLovelyMailGFX: ; b944b + push bc + ld hl, VTiles2 tile $31 + ld de, Unknown_b9e26 + ld c, $28 + call Functionb9915 + 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 + hlcoord 2, 15 + ld a, $3c + call Functionb98d4 + ld a, $36 + hlcoord 15, 14 + call Functionb98fc + call Functionb9491 + pop hl + jp Functionb9803 +; b9491 + +Functionb9491: ; b9491 + ld a, $3d + hlcoord 2, 2 + call Functionb98ee + hlcoord 16, 2 + call Functionb98ee + hlcoord 9, 4 + call Functionb98ee + hlcoord 2, 11 + call Functionb98ee + hlcoord 6, 12 + call Functionb98ee + hlcoord 12, 11 + call Functionb98ee + ld a, $41 + hlcoord 5, 4 + ld [hl], a + hlcoord 6, 2 + ld [hl], a + hlcoord 12, 4 + ld [hl], a + hlcoord 14, 2 + ld [hl], a + hlcoord 3, 13 + ld [hl], a + hlcoord 9, 11 + ld [hl], a + hlcoord 16, 12 + ld [hl], a + ret +; b94d6 + +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 de, MailDittoGFX + ld c, $30 + call Functionb991e + call Functionb987b + ld a, $31 + hlcoord 1, 1 + call Functionb98ee + hlcoord 17, 15 + call Functionb98ee + hlcoord 1, 3 + ld [hl], a + hlcoord 3, 1 + ld [hl], a + hlcoord 16, 16 + ld [hl], a + hlcoord 18, 14 + ld [hl], a + ld a, $36 + hlcoord 1, 4 + ld [hl], a + hlcoord 2, 3 + ld [hl], a + hlcoord 3, 2 + ld [hl], a + hlcoord 4, 1 + ld [hl], a + inc a + hlcoord 15, 16 + ld [hl], a + hlcoord 16, 15 + ld [hl], a + hlcoord 17, 14 + ld [hl], a + hlcoord 18, 13 + ld [hl], a + inc a + hlcoord 2, 15 + ld b, $e + call Functionb98de + inc a + hlcoord 2, 11 + call Functionb98d4 + hlcoord 2, 5 + call Functionb98d4 + inc a + hlcoord 6, 1 + call Functionb98d0 + hlcoord 1, 16 + call Functionb98d0 + inc a + hlcoord 3, 13 + call Functionb98fc + pop hl + jp Functionb9803 +; b9582 + +LoadBlueSkyMailGFX: ; b9582 + push bc + ld hl, VTiles2 tile $31 + ld de, Unknown_b997e + ld c, $8 + call Functionb9915 + ld a, $ff + ld bc, $10 + call ByteFill + ld de, Unknown_b992e + ld c, $8 + call Functionb991e + ld de, MailDragoniteGFX + ld c, $b8 + call Functionb991e + ld de, MailCloudGFX + ld c, $30 + call Functionb990c + ld de, Unknown_b9db6 + ld c, $8 + call Functionb990c + 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 a, $31 + hlcoord 0, 0 + call Functionb98dc + hlcoord 0, 1 + call Functionb98e3 + hlcoord 19, 1 + call Functionb98e3 + inc a + hlcoord 0, 17 + call Functionb98dc + inc a + hlcoord 0, 16 + call Functionb98dc + inc a + hlcoord 2, 2 + call Functionb9636 + hlcoord 3, 3 + call Functionb9636 + hlcoord 4, 4 + call Functionb9636 + dec hl + ld [hl], $7f + dec a + hlcoord 15, 14 + call Functionb98ee + add $4 + hlcoord 15, 16 + ld [hli], a + inc a + ld [hl], a + inc a + push af + hlcoord 12, 1 + call Functionb98fc + pop af + hlcoord 15, 4 + call Functionb98fc + inc a + hlcoord 2, 11 + call Functionb98d4 + inc a + hlcoord 10, 3 + call Functionb98ee + pop hl + jp Functionb9803 +; b9636 + +Functionb9636: ; b9636 + ld b, $6 +.asm_b9638 + ld [hli], a + inc a + dec b + jr nz, .asm_b9638 + ret +; b963e + +LoadFlowerMailGFX: ; b963e + push bc + ld hl, VTiles2 tile $31 + ld de, Unknown_b9d86 + ld c, $40 + call Functionb990c + 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 + hlcoord 2, 15 + ld a, $3d + call Functionb98d4 + ld a, $39 + hlcoord 16, 13 + call Functionb98ee + hlcoord 2, 13 + call Functionb98ee + ld a, $3e + hlcoord 2, 2 + call Functionb98ee + hlcoord 5, 3 + call Functionb98ee + hlcoord 10, 2 + call Functionb98ee + hlcoord 16, 3 + call Functionb98ee + hlcoord 5, 11 + call Functionb98ee + hlcoord 16, 10 + call Functionb98ee + ld a, $42 + hlcoord 3, 4 + call Functionb98ee + hlcoord 12, 3 + call Functionb98ee + hlcoord 14, 2 + call Functionb98ee + hlcoord 2, 10 + call Functionb98ee + hlcoord 14, 11 + call Functionb98ee + pop hl + jp Functionb9803 +; 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 hl, VTiles2 tile $3d + ld de, Unknown_b9bfe + ld c, $20 + call Functionb990c + ld de, Unknown_b9936 + ld c, $8 + call Functionb9915 + call Functionb987b + hlcoord 8, 15 + ld a, $36 + ld b, $a + call Functionb98de + call Functionb9491 + ld a, $1 + ld [UnownLetter], a + hlcoord 1, 10 + call PrepMonFrontpic + pop hl + jp Functionb9803 +; 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 + xor a + ld bc, $10 + call ByteFill + ld de, Unknown_b9cfe + ld c, $18 + call Functionb990c + ld de, Unknown_b9946 + ld c, $8 + call Functionb990c + ld a, $31 + hlcoord 0, 0 + call Functionb98a8 + hlcoord 1, 17 + call Functionb98a8 + ld a, $33 + hlcoord 0, 1 + call Functionb98ba + hlcoord 19, 0 + call Functionb98ba + ld a, $35 + hlcoord 2, 15 + call Functionb989e + ld a, $37 + hlcoord 15, 14 + call Functionb98fc + call Functionb9491 + pop hl + jp Functionb9803 +; 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 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 a, $36 + hlcoord 1, 16 + call Functionb98d8 + inc a + hlcoord 15, 14 + call Functionb98fc + inc a + hlcoord 15, 16 + ld [hli], a + inc a + ld [hl], a + ld a, $3f + hlcoord 1, 1 + call Functionb98a8 + ld a, $41 + hlcoord 0, 2 + call Functionb98b5 + ld a, $43 + hlcoord 19, 2 + call Functionb98b5 + ld a, $45 + hlcoord 0, 1 + ld [hl], a + inc a + hlcoord 19, 1 + ld [hl], a + inc a + hlcoord 0, 16 + ld [hl], a + inc a + hlcoord 19, 16 + ld [hl], a + inc a + hlcoord 2, 5 + call Functionb98d4 + inc a + hlcoord 2, 11 + call Functionb98d4 + pop hl + jp Functionb9803 +; b97f8 + +Functionb97f8: ; b97f8 +.asm_b97f8 + xor a + ld [hli], a + ld a, $ff + ld [hli], a + dec bc + ld a, b + or c + jr nz, .asm_b97f8 + ret +; b9803 + +Functionb9803: ; b9803 + ld bc, $2f + ld de, wd002 + ld a, $0 + call GetSRAMBank + call CopyBytes + call CloseSRAM + ld hl, wd023 + ld de, wd050 + ld bc, $a + call CopyBytes + ld a, $50 + ld [wd023], a + ld [wd05a], a + ld de, wd002 + hlcoord 2, 7 + call PlaceString + ld de, wd050 + ld a, [de] + and a + ret z + ld a, [wd1ec] + hlcoord 8, 14 + cp $3 + jr z, .asm_b984b + hlcoord 6, 14 + cp $6 + jr z, .asm_b984b + hlcoord 5, 14 + +.asm_b984b + jp PlaceString +; b984e + +Functionb984e: ; b984e +.asm_b984e + ld a, [hl] + xor $ff + ld [hli], a + dec bc + ld a, b + or c + jr nz, .asm_b984e + ret +; b9858 + +Functionb9858: ; b9858 + hlcoord 0, 0 + ld a, $31 + ld [hli], a + inc a + call Functionb98d8 + inc a + ld [hli], a + inc a + call Functionb98e3 + ld a, $36 + ld [hli], a + inc a + call Functionb98d8 + hlcoord 19, 1 + ld a, $35 + call Functionb98e3 + ld a, $38 + ld [hl], a + ret +; b987b + +Functionb987b: ; b987b + hlcoord 0, 0 + ld a, $31 + ld [hli], a + inc a + call Functionb98d8 + ld [hl], $31 + inc hl + inc a + call Functionb98e3 + ld [hl], $31 + inc hl + inc a + call Functionb98d8 + hlcoord 19, 1 + ld a, $35 + call Functionb98e3 + ld [hl], $31 + ret +; b989e + +Functionb989e: ; b989e + push af + ld b, $7 + jr Functionb98ab + +Functionb98a3: ; b98a3 + push af + ld b, $8 + jr Functionb98ab + +Functionb98a8: ; b98a8 + push af + ld b, $9 + +Functionb98ab: ; b98ab + ld [hli], a + inc a + ld [hli], a + dec a + dec b + jr nz, Functionb98ab + ld [hl], a + pop af + ret +; b98b5 + +Functionb98b5: ; b98b5 + push af + ld b, $7 + jr Functionb98bd + +Functionb98ba: ; b98ba + push af + ld b, $8 + +Functionb98bd: ; b98bd + ld [hl], a + ld de, SCREEN_WIDTH + add hl, de + inc a + ld [hl], a + add hl, de + dec a + dec b + jr nz, Functionb98bd + ld [hl], a + pop af + ret +; b98cc + +Functionb98cc: ; b98cc + ld b, $7 + jr Functionb98de + +Functionb98d0: ; b98d0 + ld b, $d + jr Functionb98de + +Functionb98d4: ; b98d4 + ld b, $10 + jr Functionb98de + +Functionb98d8: ; b98d8 + ld b, $12 + jr Functionb98de + +Functionb98dc: ; b98dc + ld b, $14 + +Functionb98de: ; b98de + ld [hli], a + dec b + jr nz, Functionb98de + ret +; b98e3 + +Functionb98e3: ; b98e3 + ld b, $10 + ld de, SCREEN_WIDTH +.asm_b98e8 + ld [hl], a + add hl, de + dec b + jr nz, .asm_b98e8 + ret +; b98ee + +Functionb98ee: ; b98ee + push af + ld [hli], a + inc a + ld [hl], a + ld bc, $13 + add hl, bc + inc a + ld [hli], a + inc a + ld [hl], a + pop af + ret +; b98fc + +Functionb98fc: ; b98fc + ld [hli], a + inc a + ld [hli], a + inc a + ld [hl], a + ld bc, SCREEN_HEIGHT + add hl, bc + inc a + ld [hli], a + inc a + ld [hli], a + inc a + ld [hl], a + ret +; b990c + +Functionb990c: ; b990c +.asm_b990c + ld a, [de] + inc de + ld [hli], a + xor a + ld [hli], a + dec c + jr nz, .asm_b990c + ret +; b9915 + +Functionb9915: ; b9915 +.asm_b9915 + xor a + ld [hli], a + ld a, [de] + inc de + ld [hli], a + dec c + jr nz, .asm_b9915 + ret +; b991e + +Functionb991e: ; b991e +.asm_b991e + ld a, [de] + inc de +rept 2 + ld [hli], a +endr + dec c + jr nz, .asm_b991e + ret +; b9926 + +Unknown_b9926: ; b9926 +INCBIN "gfx/unknown/0b9926.1bpp" + +Unknown_b992e: ; b992e +INCBIN "gfx/unknown/0b992e.1bpp" + +Unknown_b9936: ; b9936 +INCBIN "gfx/unknown/0b9936.1bpp" + +Unknown_b993e: ; b993e +INCBIN "gfx/unknown/0b993e.1bpp" + +Unknown_b9946: ; b9946 +INCBIN "gfx/unknown/0b9946.1bpp" + +Unknown_b994e: ; b994e +INCBIN "gfx/unknown/0b994e.1bpp" + +Unknown_b995e: ; b995e +INCBIN "gfx/unknown/0b995e.1bpp" + +Unknown_b9966: ; b9966 +INCBIN "gfx/unknown/0b9966.1bpp" + +Unknown_b996e: ; b996e +INCBIN "gfx/unknown/0b996e.1bpp" + +Unknown_b9976: ; b9976 +INCBIN "gfx/unknown/0b9976.1bpp" + +Unknown_b997e: ; b997e +INCBIN "gfx/unknown/0b997e.1bpp" + +Unknown_b998e: ; b998e +INCBIN "gfx/unknown/0b998e.1bpp" + +Unknown_b9996: ; b9996 +INCBIN "gfx/unknown/0b9996.1bpp" + +MailDratiniGFX: ; b99c6 +INCBIN "gfx/unknown/0b99c6.1bpp" + +MailPoliwagGFX: ; b99f6 +INCBIN "gfx/unknown/0b99f6.1bpp" + +MailLaprasGFX: ; b9a26 +INCBIN "gfx/unknown/0b9a26.1bpp" + +MailPikaGFX: ; b9a56 +INCBIN "gfx/unknown/0b9a56.1bpp" + +MailDittoGFX: ; b9a86 +INCBIN "gfx/unknown/0b9a86.1bpp" + +MailMewGFX: ; b9ab6 +INCBIN "gfx/unknown/0b9ab6.1bpp" + +MailDragoniteGFX: ; b9b46 +INCBIN "gfx/unknown/0b9b46.1bpp" + +MailSentretGFX: ; b9bce +INCBIN "gfx/unknown/0b9bce.1bpp" + +Unknown_b9bee: ; b9bee +INCBIN "gfx/unknown/0b9bee.1bpp" + +Unknown_b9bfe: ; b9bfe +INCBIN "gfx/unknown/0b9bfe.1bpp" + +MailOddishGFX: ; b9c1e +INCBIN "gfx/unknown/0b9c1e.1bpp" + +Unknown_b9c3e: ; b9c3e +INCBIN "gfx/unknown/0b9c3e.1bpp" + +Unknown_b9c5e: ; b9c5e +INCBIN "gfx/unknown/0b9c5e.1bpp" + +Unknown_b9c7e: ; b9c7e +INCBIN "gfx/unknown/0b9c7e.1bpp" + +Unknown_b9c96: ; b9c96 +INCBIN "gfx/unknown/0b9c96.1bpp" + +Unknown_b9c9e: ; b9c9e +INCBIN "gfx/unknown/0b9c9e.1bpp" + +Unknown_b9cbe: ; b9cbe +INCBIN "gfx/unknown/0b9cbe.1bpp" + +Unknown_b9cde: ; b9cde +INCBIN "gfx/unknown/0b9cde.1bpp" + +Unknown_b9cfe: ; b9cfe +INCBIN "gfx/unknown/0b9cfe.1bpp" + +MailCloudGFX: ; b9d16 +INCBIN "gfx/unknown/0b9d16.1bpp" + +Unknown_b9d26: ; b9d26 +INCBIN "gfx/unknown/0b9d26.1bpp" + +Unknown_b9d3e: ; b9d3e +INCBIN "gfx/unknown/0b9d3e.1bpp" + +Unknown_b9d46: ; b9d46 +INCBIN "gfx/unknown/0b9d46.1bpp" + +Unknown_b9d76: ; b9d76 +INCBIN "gfx/unknown/0b9d76.1bpp" + +Unknown_b9d86: ; b9d86 +INCBIN "gfx/unknown/0b9d86.1bpp" + +Unknown_b9db6: ; b9db6 +INCBIN "gfx/unknown/0b9db6.1bpp" + +Unknown_b9dc6: ; b9dc6 +INCBIN "gfx/unknown/0b9dc6.1bpp" + +Unknown_b9dce: ; b9dce +INCBIN "gfx/unknown/0b9dce.1bpp" + +Unknown_b9df6: ; b9df6 +INCBIN "gfx/unknown/0b9df6.1bpp" + +Unknown_b9e06: ; b9e06 +INCBIN "gfx/unknown/0b9e06.1bpp" + +Unknown_b9e26: ; b9e26 +INCBIN "gfx/unknown/0b9e26.1bpp" + +Unknown_b9e4e: ; b9e4e +INCBIN "gfx/unknown/0b9e4e.1bpp" + + +ItemIsMail: ; b9e76 + ld a, d + ld hl, .items + ld de, 1 + jp IsInArray +; b9e80 + +.items + db FLOWER_MAIL + db SURF_MAIL + db LITEBLUEMAIL + db PORTRAITMAIL + db LOVELY_MAIL + db EON_MAIL + db MORPH_MAIL + db BLUESKY_MAIL + db MUSIC_MAIL + db MIRAGE_MAIL + db $ff +; b9e8b -- cgit v1.2.3 From 7b3090e22aefffa464570ac34665ee8e43df873d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Nov 2015 15:15:32 -0500 Subject: Annotate battle tower text bug --- gfx/pics/animation.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx') diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index fd37b0497..ea87f97e5 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -1113,7 +1113,7 @@ Functiond066e: ; d066e push bc push hl ld de, VTiles2 - predef Function5108b + predef FrontpicPredef pop hl pop bc ld d, 0 -- cgit v1.2.3 From 24b7b2c1cf4a83967c441f1d23c28760e0dadcc1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Nov 2015 12:01:58 -0500 Subject: Foreign language font handling in mail --- gfx/font/english.1bpp | Bin 0 -> 1024 bytes gfx/font/french_german.1bpp | Bin 0 -> 1024 bytes gfx/font/spanish_italian.1bpp | Bin 0 -> 1024 bytes gfx/mail.asm | 10 +++++----- gfx/unknown/1de5e6.2bpp | Bin 1024 -> 0 bytes gfx/unknown/1de9e6.2bpp | Bin 1024 -> 0 bytes gfx/unknown/1dede6.2bpp | Bin 1024 -> 0 bytes 7 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 gfx/font/english.1bpp create mode 100644 gfx/font/french_german.1bpp create mode 100644 gfx/font/spanish_italian.1bpp delete mode 100644 gfx/unknown/1de5e6.2bpp delete mode 100644 gfx/unknown/1de9e6.2bpp delete mode 100644 gfx/unknown/1dede6.2bpp (limited to 'gfx') diff --git a/gfx/font/english.1bpp b/gfx/font/english.1bpp new file mode 100644 index 000000000..ff8d2d4fe Binary files /dev/null and b/gfx/font/english.1bpp differ diff --git a/gfx/font/french_german.1bpp b/gfx/font/french_german.1bpp new file mode 100644 index 000000000..84d542986 Binary files /dev/null and b/gfx/font/french_german.1bpp differ diff --git a/gfx/font/spanish_italian.1bpp b/gfx/font/spanish_italian.1bpp new file mode 100644 index 000000000..8f316db4e Binary files /dev/null and b/gfx/font/spanish_italian.1bpp differ diff --git a/gfx/mail.asm b/gfx/mail.asm index 1276f3fa1..50124d6f9 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -16,20 +16,20 @@ ReadAnyMail: ; b9237 push de ld a, BANK(sPartyMail) call GetSRAMBank - callba Function1de5c8 + callba IsMailEuropean call CloseSRAM ld a, c - ld de, GFX_1de5e6 + ld de, StandardEnglishFont or a jr z, .asm_b9268 - ld de, GFX_1de9e6 + ld de, FrenchGermanFont sub $3 jr c, .asm_b9268 - ld de, GFX_1dede6 + ld de, SpanishItalianFont .asm_b9268 ld hl, VTiles1 - lb bc, BANK(GFX_1de5e6), $80 + lb bc, BANK(StandardEnglishFont), $80 call Get1bpp pop de call Functionb92b8 diff --git a/gfx/unknown/1de5e6.2bpp b/gfx/unknown/1de5e6.2bpp deleted file mode 100644 index ff8d2d4fe..000000000 Binary files a/gfx/unknown/1de5e6.2bpp and /dev/null differ diff --git a/gfx/unknown/1de9e6.2bpp b/gfx/unknown/1de9e6.2bpp deleted file mode 100644 index 84d542986..000000000 Binary files a/gfx/unknown/1de9e6.2bpp and /dev/null differ diff --git a/gfx/unknown/1dede6.2bpp b/gfx/unknown/1dede6.2bpp deleted file mode 100644 index 8f316db4e..000000000 Binary files a/gfx/unknown/1dede6.2bpp and /dev/null differ -- cgit v1.2.3 From 8740fc6e87f3d0c1099e5755488e61ff3c75ea8c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Nov 2015 13:50:19 -0500 Subject: Annotate gfx/mail.asm --- gfx/mail.asm | 878 ++++++++++++++++++++++++------------------------ gfx/mail/0b9926.1bpp | Bin 0 -> 8 bytes gfx/mail/0b992e.1bpp | 1 + gfx/mail/0b9936.1bpp | 1 + gfx/mail/0b993e.1bpp | Bin 0 -> 8 bytes gfx/mail/0b9946.1bpp | 1 + gfx/mail/0b994e.1bpp | Bin 0 -> 16 bytes gfx/mail/0b995e.1bpp | Bin 0 -> 8 bytes gfx/mail/0b9966.1bpp | Bin 0 -> 8 bytes gfx/mail/0b996e.1bpp | Bin 0 -> 8 bytes gfx/mail/0b9976.1bpp | Bin 0 -> 8 bytes gfx/mail/0b997e.1bpp | Bin 0 -> 16 bytes gfx/mail/0b998e.1bpp | 1 + gfx/mail/0b9996.1bpp | Bin 0 -> 48 bytes gfx/mail/0b99c6.1bpp | Bin 0 -> 48 bytes gfx/mail/0b99f6.1bpp | Bin 0 -> 48 bytes gfx/mail/0b9a26.1bpp | Bin 0 -> 48 bytes gfx/mail/0b9a56.1bpp | Bin 0 -> 48 bytes gfx/mail/0b9a86.1bpp | Bin 0 -> 48 bytes gfx/mail/0b9ab6.1bpp | Bin 0 -> 144 bytes gfx/mail/0b9b46.1bpp | Bin 0 -> 136 bytes gfx/mail/0b9bce.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9bee.1bpp | 1 + gfx/mail/0b9bfe.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9c1e.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9c3e.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9c5e.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9c7e.1bpp | Bin 0 -> 24 bytes gfx/mail/0b9c96.1bpp | Bin 0 -> 8 bytes gfx/mail/0b9c9e.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9cbe.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9cde.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9cfe.1bpp | Bin 0 -> 24 bytes gfx/mail/0b9d16.1bpp | Bin 0 -> 16 bytes gfx/mail/0b9d26.1bpp | Bin 0 -> 24 bytes gfx/mail/0b9d3e.1bpp | Bin 0 -> 8 bytes gfx/mail/0b9d46.1bpp | Bin 0 -> 48 bytes gfx/mail/0b9d76.1bpp | Bin 0 -> 16 bytes gfx/mail/0b9d86.1bpp | Bin 0 -> 48 bytes gfx/mail/0b9db6.1bpp | Bin 0 -> 16 bytes gfx/mail/0b9dc6.1bpp | 1 + gfx/mail/0b9dce.1bpp | Bin 0 -> 40 bytes gfx/mail/0b9df6.1bpp | Bin 0 -> 16 bytes gfx/mail/0b9e06.1bpp | Bin 0 -> 32 bytes gfx/mail/0b9e26.1bpp | 1 + gfx/mail/0b9e4e.1bpp | Bin 0 -> 40 bytes gfx/unknown/0b9926.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b992e.1bpp | 1 - gfx/unknown/0b9936.1bpp | 1 - gfx/unknown/0b993e.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b9946.1bpp | 1 - gfx/unknown/0b994e.1bpp | Bin 16 -> 0 bytes gfx/unknown/0b995e.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b9966.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b996e.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b9976.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b997e.1bpp | Bin 16 -> 0 bytes gfx/unknown/0b998e.1bpp | 1 - gfx/unknown/0b9996.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b99c6.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b99f6.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b9a26.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b9a56.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b9a86.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b9ab6.1bpp | Bin 144 -> 0 bytes gfx/unknown/0b9b46.1bpp | Bin 136 -> 0 bytes gfx/unknown/0b9bce.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9bee.1bpp | 1 - gfx/unknown/0b9bfe.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9c1e.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9c3e.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9c5e.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9c7e.1bpp | Bin 24 -> 0 bytes gfx/unknown/0b9c96.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b9c9e.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9cbe.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9cde.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9cfe.1bpp | Bin 24 -> 0 bytes gfx/unknown/0b9d16.1bpp | Bin 16 -> 0 bytes gfx/unknown/0b9d26.1bpp | Bin 24 -> 0 bytes gfx/unknown/0b9d3e.1bpp | Bin 8 -> 0 bytes gfx/unknown/0b9d46.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b9d76.1bpp | Bin 16 -> 0 bytes gfx/unknown/0b9d86.1bpp | Bin 48 -> 0 bytes gfx/unknown/0b9db6.1bpp | Bin 16 -> 0 bytes gfx/unknown/0b9dc6.1bpp | 1 - gfx/unknown/0b9dce.1bpp | Bin 40 -> 0 bytes gfx/unknown/0b9df6.1bpp | Bin 16 -> 0 bytes gfx/unknown/0b9e06.1bpp | Bin 32 -> 0 bytes gfx/unknown/0b9e26.1bpp | 1 - gfx/unknown/0b9e4e.1bpp | Bin 40 -> 0 bytes 91 files changed, 452 insertions(+), 440 deletions(-) create mode 100644 gfx/mail/0b9926.1bpp create mode 100644 gfx/mail/0b992e.1bpp create mode 100644 gfx/mail/0b9936.1bpp create mode 100644 gfx/mail/0b993e.1bpp create mode 100644 gfx/mail/0b9946.1bpp create mode 100644 gfx/mail/0b994e.1bpp create mode 100644 gfx/mail/0b995e.1bpp create mode 100644 gfx/mail/0b9966.1bpp create mode 100644 gfx/mail/0b996e.1bpp create mode 100644 gfx/mail/0b9976.1bpp create mode 100644 gfx/mail/0b997e.1bpp create mode 100644 gfx/mail/0b998e.1bpp create mode 100644 gfx/mail/0b9996.1bpp create mode 100644 gfx/mail/0b99c6.1bpp create mode 100644 gfx/mail/0b99f6.1bpp create mode 100644 gfx/mail/0b9a26.1bpp create mode 100644 gfx/mail/0b9a56.1bpp create mode 100644 gfx/mail/0b9a86.1bpp create mode 100644 gfx/mail/0b9ab6.1bpp create mode 100644 gfx/mail/0b9b46.1bpp create mode 100644 gfx/mail/0b9bce.1bpp create mode 100644 gfx/mail/0b9bee.1bpp create mode 100644 gfx/mail/0b9bfe.1bpp create mode 100644 gfx/mail/0b9c1e.1bpp create mode 100644 gfx/mail/0b9c3e.1bpp create mode 100644 gfx/mail/0b9c5e.1bpp create mode 100644 gfx/mail/0b9c7e.1bpp create mode 100644 gfx/mail/0b9c96.1bpp create mode 100644 gfx/mail/0b9c9e.1bpp create mode 100644 gfx/mail/0b9cbe.1bpp create mode 100644 gfx/mail/0b9cde.1bpp create mode 100644 gfx/mail/0b9cfe.1bpp create mode 100644 gfx/mail/0b9d16.1bpp create mode 100644 gfx/mail/0b9d26.1bpp create mode 100644 gfx/mail/0b9d3e.1bpp create mode 100644 gfx/mail/0b9d46.1bpp create mode 100644 gfx/mail/0b9d76.1bpp create mode 100644 gfx/mail/0b9d86.1bpp create mode 100644 gfx/mail/0b9db6.1bpp create mode 100644 gfx/mail/0b9dc6.1bpp create mode 100644 gfx/mail/0b9dce.1bpp create mode 100644 gfx/mail/0b9df6.1bpp create mode 100644 gfx/mail/0b9e06.1bpp create mode 100644 gfx/mail/0b9e26.1bpp create mode 100644 gfx/mail/0b9e4e.1bpp delete mode 100644 gfx/unknown/0b9926.1bpp delete mode 100644 gfx/unknown/0b992e.1bpp delete mode 100644 gfx/unknown/0b9936.1bpp delete mode 100644 gfx/unknown/0b993e.1bpp delete mode 100644 gfx/unknown/0b9946.1bpp delete mode 100644 gfx/unknown/0b994e.1bpp delete mode 100644 gfx/unknown/0b995e.1bpp delete mode 100644 gfx/unknown/0b9966.1bpp delete mode 100644 gfx/unknown/0b996e.1bpp delete mode 100644 gfx/unknown/0b9976.1bpp delete mode 100644 gfx/unknown/0b997e.1bpp delete mode 100644 gfx/unknown/0b998e.1bpp delete mode 100644 gfx/unknown/0b9996.1bpp delete mode 100644 gfx/unknown/0b99c6.1bpp delete mode 100644 gfx/unknown/0b99f6.1bpp delete mode 100644 gfx/unknown/0b9a26.1bpp delete mode 100644 gfx/unknown/0b9a56.1bpp delete mode 100644 gfx/unknown/0b9a86.1bpp delete mode 100644 gfx/unknown/0b9ab6.1bpp delete mode 100644 gfx/unknown/0b9b46.1bpp delete mode 100644 gfx/unknown/0b9bce.1bpp delete mode 100644 gfx/unknown/0b9bee.1bpp delete mode 100644 gfx/unknown/0b9bfe.1bpp delete mode 100644 gfx/unknown/0b9c1e.1bpp delete mode 100644 gfx/unknown/0b9c3e.1bpp delete mode 100644 gfx/unknown/0b9c5e.1bpp delete mode 100644 gfx/unknown/0b9c7e.1bpp delete mode 100644 gfx/unknown/0b9c96.1bpp delete mode 100644 gfx/unknown/0b9c9e.1bpp delete mode 100644 gfx/unknown/0b9cbe.1bpp delete mode 100644 gfx/unknown/0b9cde.1bpp delete mode 100644 gfx/unknown/0b9cfe.1bpp delete mode 100644 gfx/unknown/0b9d16.1bpp delete mode 100644 gfx/unknown/0b9d26.1bpp delete mode 100644 gfx/unknown/0b9d3e.1bpp delete mode 100644 gfx/unknown/0b9d46.1bpp delete mode 100644 gfx/unknown/0b9d76.1bpp delete mode 100644 gfx/unknown/0b9d86.1bpp delete mode 100644 gfx/unknown/0b9db6.1bpp delete mode 100644 gfx/unknown/0b9dc6.1bpp delete mode 100644 gfx/unknown/0b9dce.1bpp delete mode 100644 gfx/unknown/0b9df6.1bpp delete mode 100644 gfx/unknown/0b9e06.1bpp delete mode 100644 gfx/unknown/0b9e26.1bpp delete mode 100644 gfx/unknown/0b9e4e.1bpp (limited to 'gfx') 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 - -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 + ld c, 6 * 8 + call LoadMailGFX_Color3 + ld de, PortraitMailUnderlineGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 + +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/mail/0b9926.1bpp b/gfx/mail/0b9926.1bpp new file mode 100644 index 000000000..07411676c Binary files /dev/null and b/gfx/mail/0b9926.1bpp differ diff --git a/gfx/mail/0b992e.1bpp b/gfx/mail/0b992e.1bpp new file mode 100644 index 000000000..4efb35675 --- /dev/null +++ b/gfx/mail/0b992e.1bpp @@ -0,0 +1 @@ +ˆHLm}ÿÿ \ No newline at end of file diff --git a/gfx/mail/0b9936.1bpp b/gfx/mail/0b9936.1bpp new file mode 100644 index 000000000..3db4de269 --- /dev/null +++ b/gfx/mail/0b9936.1bpp @@ -0,0 +1 @@ +<~çÛç~< \ No newline at end of file diff --git a/gfx/mail/0b993e.1bpp b/gfx/mail/0b993e.1bpp new file mode 100644 index 000000000..28cda20bf Binary files /dev/null and b/gfx/mail/0b993e.1bpp differ diff --git a/gfx/mail/0b9946.1bpp b/gfx/mail/0b9946.1bpp new file mode 100644 index 000000000..4352e1061 --- /dev/null +++ b/gfx/mail/0b9946.1bpp @@ -0,0 +1 @@ +pð` \ No newline at end of file diff --git a/gfx/mail/0b994e.1bpp b/gfx/mail/0b994e.1bpp new file mode 100644 index 000000000..88ddd73f9 Binary files /dev/null and b/gfx/mail/0b994e.1bpp differ diff --git a/gfx/mail/0b995e.1bpp b/gfx/mail/0b995e.1bpp new file mode 100644 index 000000000..af75f645a Binary files /dev/null and b/gfx/mail/0b995e.1bpp differ diff --git a/gfx/mail/0b9966.1bpp b/gfx/mail/0b9966.1bpp new file mode 100644 index 000000000..bbf05317b Binary files /dev/null and b/gfx/mail/0b9966.1bpp differ diff --git a/gfx/mail/0b996e.1bpp b/gfx/mail/0b996e.1bpp new file mode 100644 index 000000000..266c91964 Binary files /dev/null and b/gfx/mail/0b996e.1bpp differ diff --git a/gfx/mail/0b9976.1bpp b/gfx/mail/0b9976.1bpp new file mode 100644 index 000000000..1c2e21946 Binary files /dev/null and b/gfx/mail/0b9976.1bpp differ diff --git a/gfx/mail/0b997e.1bpp b/gfx/mail/0b997e.1bpp new file mode 100644 index 000000000..4957ff4c2 Binary files /dev/null and b/gfx/mail/0b997e.1bpp differ diff --git a/gfx/mail/0b998e.1bpp b/gfx/mail/0b998e.1bpp new file mode 100644 index 000000000..8d6a0e319 --- /dev/null +++ b/gfx/mail/0b998e.1bpp @@ -0,0 +1 @@ +<~ÿÿÿÿ~< \ No newline at end of file diff --git a/gfx/mail/0b9996.1bpp b/gfx/mail/0b9996.1bpp new file mode 100644 index 000000000..62814ccbb Binary files /dev/null and b/gfx/mail/0b9996.1bpp differ diff --git a/gfx/mail/0b99c6.1bpp b/gfx/mail/0b99c6.1bpp new file mode 100644 index 000000000..77d1e45ba Binary files /dev/null and b/gfx/mail/0b99c6.1bpp differ diff --git a/gfx/mail/0b99f6.1bpp b/gfx/mail/0b99f6.1bpp new file mode 100644 index 000000000..3d9dcac5b Binary files /dev/null and b/gfx/mail/0b99f6.1bpp differ diff --git a/gfx/mail/0b9a26.1bpp b/gfx/mail/0b9a26.1bpp new file mode 100644 index 000000000..295dec49d Binary files /dev/null and b/gfx/mail/0b9a26.1bpp differ diff --git a/gfx/mail/0b9a56.1bpp b/gfx/mail/0b9a56.1bpp new file mode 100644 index 000000000..7ade46c6c Binary files /dev/null and b/gfx/mail/0b9a56.1bpp differ diff --git a/gfx/mail/0b9a86.1bpp b/gfx/mail/0b9a86.1bpp new file mode 100644 index 000000000..34fa18d29 Binary files /dev/null and b/gfx/mail/0b9a86.1bpp differ diff --git a/gfx/mail/0b9ab6.1bpp b/gfx/mail/0b9ab6.1bpp new file mode 100644 index 000000000..f37262f7e Binary files /dev/null and b/gfx/mail/0b9ab6.1bpp differ diff --git a/gfx/mail/0b9b46.1bpp b/gfx/mail/0b9b46.1bpp new file mode 100644 index 000000000..6a3ae927d Binary files /dev/null and b/gfx/mail/0b9b46.1bpp differ diff --git a/gfx/mail/0b9bce.1bpp b/gfx/mail/0b9bce.1bpp new file mode 100644 index 000000000..208e14fcb Binary files /dev/null and b/gfx/mail/0b9bce.1bpp differ diff --git a/gfx/mail/0b9bee.1bpp b/gfx/mail/0b9bee.1bpp new file mode 100644 index 000000000..33c93f017 --- /dev/null +++ b/gfx/mail/0b9bee.1bpp @@ -0,0 +1 @@ +ƒKKm}ÿÿÈøüýýÿÿ \ No newline at end of file diff --git a/gfx/mail/0b9bfe.1bpp b/gfx/mail/0b9bfe.1bpp new file mode 100644 index 000000000..ac8385990 Binary files /dev/null and b/gfx/mail/0b9bfe.1bpp differ diff --git a/gfx/mail/0b9c1e.1bpp b/gfx/mail/0b9c1e.1bpp new file mode 100644 index 000000000..205a60248 Binary files /dev/null and b/gfx/mail/0b9c1e.1bpp differ diff --git a/gfx/mail/0b9c3e.1bpp b/gfx/mail/0b9c3e.1bpp new file mode 100644 index 000000000..faa0439c8 Binary files /dev/null and b/gfx/mail/0b9c3e.1bpp differ diff --git a/gfx/mail/0b9c5e.1bpp b/gfx/mail/0b9c5e.1bpp new file mode 100644 index 000000000..6587f4505 Binary files /dev/null and b/gfx/mail/0b9c5e.1bpp differ diff --git a/gfx/mail/0b9c7e.1bpp b/gfx/mail/0b9c7e.1bpp new file mode 100644 index 000000000..0057e120d Binary files /dev/null and b/gfx/mail/0b9c7e.1bpp differ diff --git a/gfx/mail/0b9c96.1bpp b/gfx/mail/0b9c96.1bpp new file mode 100644 index 000000000..8798f0fec Binary files /dev/null and b/gfx/mail/0b9c96.1bpp differ diff --git a/gfx/mail/0b9c9e.1bpp b/gfx/mail/0b9c9e.1bpp new file mode 100644 index 000000000..d1f0f6b7e Binary files /dev/null and b/gfx/mail/0b9c9e.1bpp differ diff --git a/gfx/mail/0b9cbe.1bpp b/gfx/mail/0b9cbe.1bpp new file mode 100644 index 000000000..503b8da3c Binary files /dev/null and b/gfx/mail/0b9cbe.1bpp differ diff --git a/gfx/mail/0b9cde.1bpp b/gfx/mail/0b9cde.1bpp new file mode 100644 index 000000000..d6d1b99c2 Binary files /dev/null and b/gfx/mail/0b9cde.1bpp differ diff --git a/gfx/mail/0b9cfe.1bpp b/gfx/mail/0b9cfe.1bpp new file mode 100644 index 000000000..09e552df6 Binary files /dev/null and b/gfx/mail/0b9cfe.1bpp differ diff --git a/gfx/mail/0b9d16.1bpp b/gfx/mail/0b9d16.1bpp new file mode 100644 index 000000000..61e9e3034 Binary files /dev/null and b/gfx/mail/0b9d16.1bpp differ diff --git a/gfx/mail/0b9d26.1bpp b/gfx/mail/0b9d26.1bpp new file mode 100644 index 000000000..2f7129dab Binary files /dev/null and b/gfx/mail/0b9d26.1bpp differ diff --git a/gfx/mail/0b9d3e.1bpp b/gfx/mail/0b9d3e.1bpp new file mode 100644 index 000000000..e8417d211 Binary files /dev/null and b/gfx/mail/0b9d3e.1bpp differ diff --git a/gfx/mail/0b9d46.1bpp b/gfx/mail/0b9d46.1bpp new file mode 100644 index 000000000..e3e1dc2e7 Binary files /dev/null and b/gfx/mail/0b9d46.1bpp differ diff --git a/gfx/mail/0b9d76.1bpp b/gfx/mail/0b9d76.1bpp new file mode 100644 index 000000000..cd7cd4e76 Binary files /dev/null and b/gfx/mail/0b9d76.1bpp differ diff --git a/gfx/mail/0b9d86.1bpp b/gfx/mail/0b9d86.1bpp new file mode 100644 index 000000000..b048e2bfd Binary files /dev/null and b/gfx/mail/0b9d86.1bpp differ diff --git a/gfx/mail/0b9db6.1bpp b/gfx/mail/0b9db6.1bpp new file mode 100644 index 000000000..e894196d7 Binary files /dev/null and b/gfx/mail/0b9db6.1bpp differ diff --git a/gfx/mail/0b9dc6.1bpp b/gfx/mail/0b9dc6.1bpp new file mode 100644 index 000000000..9c56c6746 --- /dev/null +++ b/gfx/mail/0b9dc6.1bpp @@ -0,0 +1 @@ +ÿÿÀßÐÐÐÐ \ No newline at end of file diff --git a/gfx/mail/0b9dce.1bpp b/gfx/mail/0b9dce.1bpp new file mode 100644 index 000000000..3afe8b303 Binary files /dev/null and b/gfx/mail/0b9dce.1bpp differ diff --git a/gfx/mail/0b9df6.1bpp b/gfx/mail/0b9df6.1bpp new file mode 100644 index 000000000..d74a3ff4a Binary files /dev/null and b/gfx/mail/0b9df6.1bpp differ diff --git a/gfx/mail/0b9e06.1bpp b/gfx/mail/0b9e06.1bpp new file mode 100644 index 000000000..8f082c642 Binary files /dev/null and b/gfx/mail/0b9e06.1bpp differ diff --git a/gfx/mail/0b9e26.1bpp b/gfx/mail/0b9e26.1bpp new file mode 100644 index 000000000..efe2887cf --- /dev/null +++ b/gfx/mail/0b9e26.1bpp @@ -0,0 +1 @@ +ÿÙ¥¥™ÃÿÿÿÿçÃÃç<þþóááóþþ<çÃÃçÿÿÿχ‡Ï \ No newline at end of file diff --git a/gfx/mail/0b9e4e.1bpp b/gfx/mail/0b9e4e.1bpp new file mode 100644 index 000000000..9207cfc8b Binary files /dev/null and b/gfx/mail/0b9e4e.1bpp differ diff --git a/gfx/unknown/0b9926.1bpp b/gfx/unknown/0b9926.1bpp deleted file mode 100644 index 07411676c..000000000 Binary files a/gfx/unknown/0b9926.1bpp and /dev/null differ diff --git a/gfx/unknown/0b992e.1bpp b/gfx/unknown/0b992e.1bpp deleted file mode 100644 index 4efb35675..000000000 --- a/gfx/unknown/0b992e.1bpp +++ /dev/null @@ -1 +0,0 @@ -ˆHLm}ÿÿ \ No newline at end of file diff --git a/gfx/unknown/0b9936.1bpp b/gfx/unknown/0b9936.1bpp deleted file mode 100644 index 3db4de269..000000000 --- a/gfx/unknown/0b9936.1bpp +++ /dev/null @@ -1 +0,0 @@ -<~çÛç~< \ No newline at end of file diff --git a/gfx/unknown/0b993e.1bpp b/gfx/unknown/0b993e.1bpp deleted file mode 100644 index 28cda20bf..000000000 Binary files a/gfx/unknown/0b993e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9946.1bpp b/gfx/unknown/0b9946.1bpp deleted file mode 100644 index 4352e1061..000000000 --- a/gfx/unknown/0b9946.1bpp +++ /dev/null @@ -1 +0,0 @@ -pð` \ No newline at end of file diff --git a/gfx/unknown/0b994e.1bpp b/gfx/unknown/0b994e.1bpp deleted file mode 100644 index 88ddd73f9..000000000 Binary files a/gfx/unknown/0b994e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b995e.1bpp b/gfx/unknown/0b995e.1bpp deleted file mode 100644 index af75f645a..000000000 Binary files a/gfx/unknown/0b995e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9966.1bpp b/gfx/unknown/0b9966.1bpp deleted file mode 100644 index bbf05317b..000000000 Binary files a/gfx/unknown/0b9966.1bpp and /dev/null differ diff --git a/gfx/unknown/0b996e.1bpp b/gfx/unknown/0b996e.1bpp deleted file mode 100644 index 266c91964..000000000 Binary files a/gfx/unknown/0b996e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9976.1bpp b/gfx/unknown/0b9976.1bpp deleted file mode 100644 index 1c2e21946..000000000 Binary files a/gfx/unknown/0b9976.1bpp and /dev/null differ diff --git a/gfx/unknown/0b997e.1bpp b/gfx/unknown/0b997e.1bpp deleted file mode 100644 index 4957ff4c2..000000000 Binary files a/gfx/unknown/0b997e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b998e.1bpp b/gfx/unknown/0b998e.1bpp deleted file mode 100644 index 8d6a0e319..000000000 --- a/gfx/unknown/0b998e.1bpp +++ /dev/null @@ -1 +0,0 @@ -<~ÿÿÿÿ~< \ No newline at end of file diff --git a/gfx/unknown/0b9996.1bpp b/gfx/unknown/0b9996.1bpp deleted file mode 100644 index 62814ccbb..000000000 Binary files a/gfx/unknown/0b9996.1bpp and /dev/null differ diff --git a/gfx/unknown/0b99c6.1bpp b/gfx/unknown/0b99c6.1bpp deleted file mode 100644 index 77d1e45ba..000000000 Binary files a/gfx/unknown/0b99c6.1bpp and /dev/null differ diff --git a/gfx/unknown/0b99f6.1bpp b/gfx/unknown/0b99f6.1bpp deleted file mode 100644 index 3d9dcac5b..000000000 Binary files a/gfx/unknown/0b99f6.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9a26.1bpp b/gfx/unknown/0b9a26.1bpp deleted file mode 100644 index 295dec49d..000000000 Binary files a/gfx/unknown/0b9a26.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9a56.1bpp b/gfx/unknown/0b9a56.1bpp deleted file mode 100644 index 7ade46c6c..000000000 Binary files a/gfx/unknown/0b9a56.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9a86.1bpp b/gfx/unknown/0b9a86.1bpp deleted file mode 100644 index 34fa18d29..000000000 Binary files a/gfx/unknown/0b9a86.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9ab6.1bpp b/gfx/unknown/0b9ab6.1bpp deleted file mode 100644 index f37262f7e..000000000 Binary files a/gfx/unknown/0b9ab6.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9b46.1bpp b/gfx/unknown/0b9b46.1bpp deleted file mode 100644 index 6a3ae927d..000000000 Binary files a/gfx/unknown/0b9b46.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9bce.1bpp b/gfx/unknown/0b9bce.1bpp deleted file mode 100644 index 208e14fcb..000000000 Binary files a/gfx/unknown/0b9bce.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9bee.1bpp b/gfx/unknown/0b9bee.1bpp deleted file mode 100644 index 33c93f017..000000000 --- a/gfx/unknown/0b9bee.1bpp +++ /dev/null @@ -1 +0,0 @@ -ƒKKm}ÿÿÈøüýýÿÿ \ No newline at end of file diff --git a/gfx/unknown/0b9bfe.1bpp b/gfx/unknown/0b9bfe.1bpp deleted file mode 100644 index ac8385990..000000000 Binary files a/gfx/unknown/0b9bfe.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9c1e.1bpp b/gfx/unknown/0b9c1e.1bpp deleted file mode 100644 index 205a60248..000000000 Binary files a/gfx/unknown/0b9c1e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9c3e.1bpp b/gfx/unknown/0b9c3e.1bpp deleted file mode 100644 index faa0439c8..000000000 Binary files a/gfx/unknown/0b9c3e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9c5e.1bpp b/gfx/unknown/0b9c5e.1bpp deleted file mode 100644 index 6587f4505..000000000 Binary files a/gfx/unknown/0b9c5e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9c7e.1bpp b/gfx/unknown/0b9c7e.1bpp deleted file mode 100644 index 0057e120d..000000000 Binary files a/gfx/unknown/0b9c7e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9c96.1bpp b/gfx/unknown/0b9c96.1bpp deleted file mode 100644 index 8798f0fec..000000000 Binary files a/gfx/unknown/0b9c96.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9c9e.1bpp b/gfx/unknown/0b9c9e.1bpp deleted file mode 100644 index d1f0f6b7e..000000000 Binary files a/gfx/unknown/0b9c9e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9cbe.1bpp b/gfx/unknown/0b9cbe.1bpp deleted file mode 100644 index 503b8da3c..000000000 Binary files a/gfx/unknown/0b9cbe.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9cde.1bpp b/gfx/unknown/0b9cde.1bpp deleted file mode 100644 index d6d1b99c2..000000000 Binary files a/gfx/unknown/0b9cde.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9cfe.1bpp b/gfx/unknown/0b9cfe.1bpp deleted file mode 100644 index 09e552df6..000000000 Binary files a/gfx/unknown/0b9cfe.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9d16.1bpp b/gfx/unknown/0b9d16.1bpp deleted file mode 100644 index 61e9e3034..000000000 Binary files a/gfx/unknown/0b9d16.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9d26.1bpp b/gfx/unknown/0b9d26.1bpp deleted file mode 100644 index 2f7129dab..000000000 Binary files a/gfx/unknown/0b9d26.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9d3e.1bpp b/gfx/unknown/0b9d3e.1bpp deleted file mode 100644 index e8417d211..000000000 Binary files a/gfx/unknown/0b9d3e.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9d46.1bpp b/gfx/unknown/0b9d46.1bpp deleted file mode 100644 index e3e1dc2e7..000000000 Binary files a/gfx/unknown/0b9d46.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9d76.1bpp b/gfx/unknown/0b9d76.1bpp deleted file mode 100644 index cd7cd4e76..000000000 Binary files a/gfx/unknown/0b9d76.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9d86.1bpp b/gfx/unknown/0b9d86.1bpp deleted file mode 100644 index b048e2bfd..000000000 Binary files a/gfx/unknown/0b9d86.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9db6.1bpp b/gfx/unknown/0b9db6.1bpp deleted file mode 100644 index e894196d7..000000000 Binary files a/gfx/unknown/0b9db6.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9dc6.1bpp b/gfx/unknown/0b9dc6.1bpp deleted file mode 100644 index 9c56c6746..000000000 --- a/gfx/unknown/0b9dc6.1bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÀßÐÐÐÐ \ No newline at end of file diff --git a/gfx/unknown/0b9dce.1bpp b/gfx/unknown/0b9dce.1bpp deleted file mode 100644 index 3afe8b303..000000000 Binary files a/gfx/unknown/0b9dce.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9df6.1bpp b/gfx/unknown/0b9df6.1bpp deleted file mode 100644 index d74a3ff4a..000000000 Binary files a/gfx/unknown/0b9df6.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9e06.1bpp b/gfx/unknown/0b9e06.1bpp deleted file mode 100644 index 8f082c642..000000000 Binary files a/gfx/unknown/0b9e06.1bpp and /dev/null differ diff --git a/gfx/unknown/0b9e26.1bpp b/gfx/unknown/0b9e26.1bpp deleted file mode 100644 index efe2887cf..000000000 --- a/gfx/unknown/0b9e26.1bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÙ¥¥™ÃÿÿÿÿçÃÃç<þþóááóþþ<çÃÃçÿÿÿχ‡Ï \ No newline at end of file diff --git a/gfx/unknown/0b9e4e.1bpp b/gfx/unknown/0b9e4e.1bpp deleted file mode 100644 index 9207cfc8b..000000000 Binary files a/gfx/unknown/0b9e4e.1bpp and /dev/null differ -- cgit v1.2.3 From 58020fb5f629693e3f90c0a3c6b417f61330802c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Nov 2015 00:21:21 -0500 Subject: trade animation --- gfx/mail.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gfx') diff --git a/gfx/mail.asm b/gfx/mail.asm index 38b329946..9ab6fa0d4 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -41,14 +41,12 @@ ReadAnyMail: ; b9237 call SetPalettes xor a ld [hJoyPressed], a - call Functionb929a + call .loop call ClearBGPalettes call DisableLCD call LoadStandardFont jp EnableLCD -; b929a -Functionb929a: ; b929a .loop call GetJoypad ld a, [hJoyPressed] @@ -61,7 +59,7 @@ Functionb929a: ; b929a .pressed_start ld a, [wJumptableIndex] push af - callab Function845d4 + callab PrintMail ; printer pop af ld [wJumptableIndex], a jr .loop -- cgit v1.2.3