diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /gfx/mail.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'gfx/mail.asm')
| -rwxr-xr-x | gfx/mail.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gfx/mail.asm b/gfx/mail.asm index cb3c25bc8..fa0736ca6 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -32,12 +32,12 @@ ReadAnyMail: ; b9237 lb bc, BANK(StandardEnglishFont), $80 call Get1bpp pop de - call Functionb92b8 + call .LoadGFX call EnableLCD call WaitBGMap ld a, [Buffer3] ld e, a - callba Function8cb4 + callba LoadMailPalettes call SetPalettes xor a ld [hJoyPressed], a @@ -65,7 +65,7 @@ ReadAnyMail: ; b9237 jr .loop ; b92b8 -Functionb92b8: ; b92b8 +.LoadGFX: ; b92b8 ld h, d ld l, e push hl @@ -83,17 +83,16 @@ Functionb92b8: ; b92b8 call CloseSRAM ld hl, MailGFXPointers ld c, 0 -.loop +.loop2 ld a, [hli] cp b jr z, .got_pointer cp -1 jr z, .invalid inc c -rept 2 inc hl -endr - jr .loop + inc hl + jr .loop2 .invalid ld hl, MailGFXPointers @@ -727,6 +726,7 @@ MailGFX_PlaceMessage: ; b9803 ; b984e Functionb984e: ; b984e +; XXX .loop ld a, [hl] xor $ff @@ -931,9 +931,8 @@ LoadMailGFX_Color3: ; b991e .loop ld a, [de] inc de -rept 2 ld [hli], a -endr + ld [hli], a dec c jr nz, .loop ret |