diff options
author | xCrystal <rgr.crystal@gmail.com> | 2015-01-31 18:26:05 +0100 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2015-02-04 23:22:25 -0800 |
commit | 97637e7ce7110c9a20e5fa9222e445700857a9cb (patch) | |
tree | a690682f126b8e7e4dd069df6f08fdc6b8cd8e6b /wram.asm | |
parent | 01e314f4f5b7de2f5ad00dd017ad44514ba71e48 (diff) |
More battle commentary/labels/constans and fix some spacing issues
Conflicts:
engine/battle/core.asm
Diffstat (limited to 'wram.asm')
-rwxr-xr-x | wram.asm | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -379,8 +379,8 @@ wcced:: ds 1 wccee:: ds 1 wccef:: ds 1 wccf0:: ds 1 -wccf1:: ds 1 -wccf2:: ds 1 +wPlayerUsedMove:: ds 1 +wEnemyUsedMove:: ds 1 wccf3:: ds 1 wccf4:: ds 1 @@ -935,7 +935,8 @@ wPlayerNumAttacksLeft:: ; when the player is attacking multiple times, the number of attacks left ds 1 -wd06b:: ds 1 +W_PLAYERCONFUSEDCOUNTER:: ; wd06b + ds 1 W_PLAYERTOXICCOUNTER:: ; d06c ds 1 @@ -945,10 +946,11 @@ W_PLAYERDISABLEDMOVE:: ; d06d ds 1 wEnemyNumAttacksLeft:: -; when the player is attacking multiple times, the number of attacks left +; when the enemy is attacking multiple times, the number of attacks left ds 1 -wd070:: ds 1 +W_ENEMYCONFUSEDCOUNTER:: ; wd070 + ds 1 W_ENEMYTOXICCOUNTER:: ; d071 ds 1 |