aboutsummaryrefslogtreecommitdiffstats
path: root/wram.asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2014-05-12 17:41:21 -0500
committerMarcus Huderle <huderlem@gmail.com>2014-05-12 17:41:21 -0500
commit36d588a83c249e2df7a3177eb7aa22e2b09658e0 (patch)
tree5c98d8090ac12e4ac400fd7ceb7631bd8b68caed /wram.asm
parentDocumented/labeled lots of move-effect-related stuff. (diff)
parentMerge remote-tracking branch 'iimarckus/master' (diff)
downloadpokeyellow-36d588a83c249e2df7a3177eb7aa22e2b09658e0.tar.gz
pokeyellow-36d588a83c249e2df7a3177eb7aa22e2b09658e0.tar.xz
pokeyellow-36d588a83c249e2df7a3177eb7aa22e2b09658e0.zip
Merged with yenatch
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm14
1 files changed, 12 insertions, 2 deletions
diff --git a/wram.asm b/wram.asm
index 0ea63121..4999b7e3 100755
--- a/wram.asm
+++ b/wram.asm
@@ -964,7 +964,12 @@ W_YBLOCKCOORD:: ; d363
ds 1
W_XBLOCKCOORD:: ; d364
- ds 3
+ ds 1
+
+wLastMap:: ; d365
+ ds 1
+
+ ds 1
W_CURMAPTILESET:: ; d367
ds 1
@@ -1323,7 +1328,12 @@ W_RIVALSTARTER:: ; d715
W_PLAYERSTARTER:: ; d717
ds 1
- ds 27
+ ds 1
+
+wLastBlackoutMap:: ; d719
+ ds 1
+
+ ds 25
W_FLAGS_D733:: ; d733