diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
| commit | 7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch) | |
| tree | 89b4000a56c9e3d942666639c83416100f360f88 /wram.asm | |
| parent | Clean up text commands (diff) | |
| parent | Use pattern variables in the makefile. (diff) | |
| download | pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.gz pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.xz pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1778,7 +1778,7 @@ wEnemyNumAttacksLeft:: ; d06f wEnemyConfusedCounter:: ; d070 ds 1 -wEnemyToxcCounter:: ; d071 +wEnemyToxicCounter:: ; d071 ds 1 wEnemyDisabledMove:: ; d072 @@ -2637,21 +2637,21 @@ wPlayerDirection:: ; d52a ; if the player is not moving, the last the direction in which the player moved ds 1 -wTileSetBank:: ; d52b +wTilesetBank:: ; d52b ds 1 -wTileSetBlocksPtr:: ; d52c +wTilesetBlocksPtr:: ; d52c ; maps blocks (4x4 tiles) to tiles ds 2 -wTileSetGFXPtr:: ; d52e +wTilesetGfxPtr:: ; d52e ds 2 -wTileSetCollisionPtr:: ; d530 +wTilesetCollisionPtr:: ; d530 ; list of all walkable tiles ds 2 -wTileSetTalkingOverTiles:: ; d532 +wTilesetTalkingOverTiles:: ; d532 ds 3 wGrassTile:: ; d535 |