summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-07-16 11:11:50 -0500
committerdannye <corrnondacqb@yahoo.com>2016-07-16 11:11:50 -0500
commit707ba908f780d42e1f26af85bef0bf0eb478b877 (patch)
tree88fba78e2d9c590c4860a2e63eed00a2e29d4005 /wram.asm
parentce3ec76762d9e2f0c560e2ea7868678418883143 (diff)
parent28de20b9f6e1db97ec69643a907f78562f90ec74 (diff)
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/wram.asm b/wram.asm
index db658ec9..0d6c3251 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2981,18 +2981,18 @@ wPlayerDirection:: ; d529
wTilesetBank:: ; d52a
ds 1
-wTileSetBlocksPtr:: ; d52b
+wTilesetBlocksPtr:: ; d52b
; maps blocks (4x4 tiles) to tiles
ds 2
-wTilesetGFXPtr:: ; d52d
+wTilesetGfxPtr:: ; d52d
ds 2
wTilesetCollisionPtr:: ; d52f
; list of all walkable tiles
ds 2
-wTileSetTalkingOverTiles:: ; d531
+wTilesetTalkingOverTiles:: ; d531
ds 3
wGrassTile:: ; d534