summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-12-06 16:08:20 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-12-06 16:08:20 -0500
commit6ddc025942a03802acf6a2731d7b46f2672ae74f (patch)
tree97cf0f4bca92254f5e6d32bd78505bca9f6cda94 /wram.asm
parentc3911c80cf8400f81518532c13912c647b81b880 (diff)
engine/battle/trainer_ai.asm
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/wram.asm b/wram.asm
index b203bcb2..4b57f70b 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1484,13 +1484,13 @@ wUpdateSpritesEnabled:: ; cfcb
; other values aren't used
ds 1
-W_ENEMYMOVENUM:: ; cfcc
+wEnemyMoveNum:: ; cfcc
ds 1
-W_ENEMYMOVEEFFECT:: ; cfcd
+wEnemyMoveEffect:: ; cfcd
ds 1
W_ENEMYMOVEPOWER:: ; cfce
ds 1
-W_ENEMYMOVETYPE:: ; cfcf
+wEnemyMoveType:: ; cfcf
ds 1
W_ENEMYMOVEACCURACY:: ; cfd0
ds 1
@@ -1557,7 +1557,7 @@ wBattleMonNick:: ds NAME_LENGTH ; d009
wBattleMon:: battle_struct wBattleMon ; d014
-W_TRAINERCLASS:: ; d031
+wTrainerClass:: ; d031
ds 1
ds 1
@@ -1624,7 +1624,7 @@ wLoneAttackNo:: ; d05c
wGymLeaderNo:: ; d05c
; it's actually the same thing as ^
ds 1
-W_TRAINERNO:: ; d05d
+wTrainerNo:: ; d05d
; which instance of [youngster, lass, etc] is this?
ds 1
@@ -1714,7 +1714,7 @@ W_ENEMYCONFUSEDCOUNTER:: ; d070
W_ENEMYTOXICCOUNTER:: ; d071
ds 1
-W_ENEMYDISABLEDMOVE:: ; d072
+wEnemyDisabledMove:: ; d072
; high nibble: which move is disabled (1-4)
; low nibble: disable turns left
ds 1