diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /wram.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -468,7 +468,7 @@ ds 10 wInGameTradeGiveMonSpecies:: ; cd0f -wPlayerMonUnmodifiedLevel:: ; cd0f +wPlayerMonUnmodifiedLevel:: ; cd0f ds 1 wInGameTradeTextPointerTablePointer:: ; cd10 @@ -953,7 +953,7 @@ W_TRAINERCLASS:: ; d031 ds 1 -wTrainerPicPointer:: ; wd033 +wTrainerPicPointer:: ; d033 ds 2 ds 1 wd036:: ds 16 ; used as a temporary buffer to print "XXX learned YYY" @@ -1071,7 +1071,7 @@ wPlayerNumAttacksLeft:: ; when the player is attacking multiple times, the number of attacks left ds 1 -W_PLAYERCONFUSEDCOUNTER:: ; wd06b +W_PLAYERCONFUSEDCOUNTER:: ; d06b ds 1 W_PLAYERTOXICCOUNTER:: ; d06c @@ -1087,7 +1087,7 @@ wEnemyNumAttacksLeft:: ; d06f ; when the enemy is attacking multiple times, the number of attacks left ds 1 -W_ENEMYCONFUSEDCOUNTER:: ; wd070 +W_ENEMYCONFUSEDCOUNTER:: ; d070 ds 1 W_ENEMYTOXICCOUNTER:: ; d071 @@ -1332,10 +1332,10 @@ W_DAMAGE:: ; d0d7 ds 2 -wRepelRemainingSteps:: ; wd0db +wRepelRemainingSteps:: ; d0db ds 1 -wMoves:: ; wd0dc +wMoves:: ; d0dc ; list of moves for FormatMovesString ds 4 |