summaryrefslogtreecommitdiff
path: root/src/wram.asm
diff options
context:
space:
mode:
authorAndrew Martinek <andrewrmartinek@gmail.com>2019-10-13 19:39:13 -0400
committerAndrew Martinek <andrewrmartinek@gmail.com>2019-10-13 19:39:13 -0400
commit299f013b8b14184b9f06da3b89ba87ce2ba9e0f3 (patch)
tree00b6eb70e75d1cbbdc49954dc9881ff1976ebce6 /src/wram.asm
parent2eeccacdf95c1de66fc6933b9e886b570b5cea02 (diff)
More scripts, start to figure out mapscripts
Diffstat (limited to 'src/wram.asm')
-rw-r--r--src/wram.asm13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/wram.asm b/src/wram.asm
index c3fb738..eea0f04 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -1999,10 +1999,11 @@ wd333:: ; d333
wPlayerDirection:: ; d334
ds $1
-wd335:: ; d335
+; seems to be 1 if moving 0 otherwise
+wPlayerCurrentlyMoving:: ; d335
ds $1
-wd336:: ; d336
+wPlayerSpriteIndex:: ; d336
ds $1
wd337:: ; d337
@@ -2100,7 +2101,8 @@ wd3b3:: ; d3b3
ds $2
-wd3b6:: ; d3b6
+; ID of the NPC being interacted with in OWScript
+wScriptNPC:: ; d3b6
ds $1
wc3b7:: ; d3b7
@@ -2125,10 +2127,7 @@ wLoadedFlagBits:: ; d3d1
ds $1
wEventFlags::
- ds $3f
-
-wd411:: ; d411
- ds $1
+ ds $40
; 0 keeps looping, other values break the loop in RST20
wBreakOWScriptLoop:: ; d412