aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/player_animations.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
commit38065a744de1065cc021a4cafe22476f8425448d (patch)
treea37a103d7c22f3cc5f62689e5062877961493caa /engine/overworld/player_animations.asm
parentMerge pull request #116 from YamaArashi/master (diff)
downloadpokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.gz
pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.xz
pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.zip
No more W_
Diffstat (limited to 'engine/overworld/player_animations.asm')
-rwxr-xr-xengine/overworld/player_animations.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 74762b00..de36eeaf 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -5,7 +5,7 @@ EnterMapAnim: ; 70510 (1c:4510)
call Delay3
push hl
call GBFadeInFromWhite
- ld hl, W_FLAGS_D733
+ ld hl, wFlags_D733
bit 7, [hl] ; used fly out of battle?
res 7, [hl]
jr nz, .flyAnimation
@@ -350,7 +350,7 @@ GetPlayerTeleportAnimFrameDelay: ; 7077f (1c:477f)
IsPlayerStandingOnWarpPadOrHole: ; 70787 (1c:4787)
ld b, 0
ld hl, .warpPadAndHoleData
- ld a, [W_CURMAPTILESET]
+ ld a, [wCurMapTileset]
ld c, a
.loop
ld a, [hli]