aboutsummaryrefslogtreecommitdiffstats
path: root/wram.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 11:51:28 -0700
committerGitHub <noreply@github.com>2016-06-12 11:51:28 -0700
commita0161ada5d90464e11be2469c6a2ee27533d2557 (patch)
treea93c42f00eec7d9f356c1e9e4b12ec0a46e419d1 /wram.asm
parentMerge pull request #16 from YamaArashi/master (diff)
parentsync home (diff)
downloadpokeyellow-a0161ada5d90464e11be2469c6a2ee27533d2557.tar.gz
pokeyellow-a0161ada5d90464e11be2469c6a2ee27533d2557.tar.xz
pokeyellow-a0161ada5d90464e11be2469c6a2ee27533d2557.zip
Merge pull request #17 from YamaArashi/master
sync tileset WRAM labels
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