diff options
Diffstat (limited to 'gfx')
| -rwxr-xr-x | gfx/load_pics.asm | 6 | ||||
| -rwxr-xr-x | gfx/mail.asm | 6 | ||||
| -rw-r--r-- | gfx/pics/animation.asm | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index 040a1d644..838fc5656 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -48,7 +48,7 @@ GetUnownLetter: ; 51040 ld [UnownLetter], a ret -GetFrontpic: ; 51077 +GetMonFrontpic: ; 51077 ld a, [CurPartySpecies] ld [CurSpecies], a call IsAPokemon @@ -60,7 +60,7 @@ GetFrontpic: ; 51077 ld [rSVBK], a ret -FrontpicPredef: ; 5108b +GetAnimatedFrontpicPredef: ; 5108b ld a, [CurPartySpecies] ld [CurSpecies], a call IsAPokemon @@ -195,7 +195,7 @@ LoadFrontpicTiles: ; 5114f jr nz, .loop ret -GetBackpic: ; 5116c +GetMonBackpic: ; 5116c ld a, [CurPartySpecies] call IsAPokemon ret c diff --git a/gfx/mail.asm b/gfx/mail.asm index d4fde366e..c8770468d 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -16,7 +16,7 @@ ReadAnyMail: ; b9237 push de ld a, BANK(sPartyMail) call GetSRAMBank - callba IsMailEuropean + farcall IsMailEuropean call CloseSRAM ld a, c ld de, StandardEnglishFont @@ -37,7 +37,7 @@ ReadAnyMail: ; b9237 call WaitBGMap ld a, [Buffer3] ld e, a - callba LoadMailPalettes + farcall LoadMailPalettes call SetPalettes xor a ld [hJoyPressed], a @@ -59,7 +59,7 @@ ReadAnyMail: ; b9237 .pressed_start ld a, [wJumptableIndex] push af - callab PrintMail ; printer + callfar PrintMail ; printer pop af ld [wJumptableIndex], a jr .loop diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index 2f348fbfb..2b93ef749 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -93,7 +93,7 @@ AnimateFrontpic: ; d008e .loop call SetUpPokeAnim push af - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 pop af jr nc, .loop ret @@ -282,9 +282,9 @@ PokeAnim_DeinitFrames: ; d01a9 ld a, $2 ld [rSVBK], a call PokeAnim_PlaceGraphic - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call PokeAnim_SetVBank0 - callba HDMATransferAttrMapToWRAMBank3 + farcall HDMATransferAttrMapToWRAMBank3 pop af ld [rSVBK], a ret @@ -881,7 +881,7 @@ PokeAnim_SetVBank1: ; d0504 xor a ld [hBGMapMode], a call .SetFlag - callba HDMATransferAttrMapToWRAMBank3 + farcall HDMATransferAttrMapToWRAMBank3 pop af ld [rSVBK], a ret @@ -1121,7 +1121,7 @@ HOF_AnimateFrontpic: ; d066e Predef 49 push bc push hl ld de, VTiles2 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef pop hl pop bc ld d, 0 |