diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-16 13:03:05 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-16 13:03:05 -0700 |
| commit | 35f2bb90d4a8f8e4dcac3fbab7d89cbc590285e8 (patch) | |
| tree | 22edd68ca5b17147a1733a1781e9eaf78f379e2f /home/overworld.asm | |
| parent | 38ac74f22285974bda6a0ed537958def8415076e (diff) | |
Rename predef functions so they aren't excessive in length.
This is mostly because of an rgbasm bug that prevents macro arguments
from exceeding 16 characters, but the names were bad anyway.
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 84c96f3e..941b50cb 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -332,7 +332,7 @@ OverworldLoopLessDelay:: ld a,[W_CURMAP] cp a,OAKS_LAB jp z,.noFaintCheck - callab AnyPlayerPokemonAliveCheck ; check if all the player's pokemon fainted + callab AnyPartyAlive ; check if all the player's pokemon fainted ld a,d and a jr z,.allPokemonFainted @@ -507,7 +507,7 @@ WarpFound2:: ; 073c (0:073c) ; if it's a Silph Co. teleporter ld hl,wd732 set 3,[hl] - call DoFlyOrTeleportAwayGraphics + call LeaveMapAnim jr .skipMapChangeSound .notTeleporter call PlayMapChangeSound @@ -778,16 +778,16 @@ HandleFlyOrTeleportAway:: ld hl, wd732 set 2, [hl] res 5, [hl] - call DoFlyOrTeleportAwayGraphics + call LeaveMapAnim ld a, Bank(Func_62ce) ld [H_LOADEDROMBANK], a ld [$2000], a call Func_62ce jp Func_5d5f -DoFlyOrTeleportAwayGraphics:: - ld b, BANK(_DoFlyOrTeleportAwayGraphics) - ld hl, _DoFlyOrTeleportAwayGraphics +LeaveMapAnim:: + ld b, BANK(_LeaveMapAnim) + ld hl, _LeaveMapAnim jp Bankswitch LoadPlayerSpriteGraphics:: |