summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-07-08 17:48:39 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-07-08 17:48:39 -0700
commit7c97dcbc6c8fc8aeeabb9629bc98af05a4d8e8de (patch)
treeba29ae51782379261fc7329fa7c5c8499be90c35 /wram.asm
parent519111415056983f3955bc8847283e675dc61280 (diff)
parent75f8a8fdeb7b85c649d954aee6d0ed6bb3e90232 (diff)
Merge branch 'chaos_requests'
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm23
1 files changed, 16 insertions, 7 deletions
diff --git a/wram.asm b/wram.asm
index 615bbc3..845a24b 100644
--- a/wram.asm
+++ b/wram.asm
@@ -681,7 +681,7 @@ wTimerDigits:: ; 0xd582
wd586:: ; 0xd586
ds $30
-wd5b6:: ; 0xd5b6
+wd5b6:: ; 0xd5b6 a 24 wide block starts here and is filled before catch mode
ds $5
wWildMonIsHittable:: ; 0xd5bb
@@ -728,16 +728,25 @@ wWildMonCollision:: ; 0xd5c7
ds $1
-wd5ca:: ; 0xd5ca
+wd5ca:: ; 0xd5ca set to 1 by a commonly called text function that is called at the start of catch and raises the score bar
ds $1
-wd5cb:: ; 0xd5cb
+wd5cb:: ; 0xd5cb set to 0 if the above is 0 during Func_33e3
ds $1
-wd5cc:: ; 0xd5cc
+wScrollingTextStruct1:: ; 0xd5cc Start of a scrolling message struct that contains 8 1-byte vars.
+; Byte 1: Toggles if enabled. 0 is off, non-0 is on
+; Byte 2: is how many frames until the next scroll
+; Byte 3: holds how long, in frames, it should take for the scroll to move 1 tile
+; Byte 4: is the current position to place the start of the text
+; Byte 5: is where in the scroll the message should stop for an extended period
+; Byte 6: is how many frames the extended stop from Byte 5 has left
+; Byte 7: is a pointer to the source text's position in the buffer
+; Byte 8: is decremented each scroll and scroll denied by the stop
+; Scrolling text relies on byte allignment for the text buffer and display area
ds $8
-wd5d4:: ; 0xd5d4
+wScrollingTextStruct2:: ; 0xd5d4 Start of a scrolling struct2
ds $4
wd5d8:: ; 0xd5d8
@@ -746,7 +755,7 @@ wd5d8:: ; 0xd5d8
wd5db:: ; 0xd5db
ds $1
-wd5dc:: ; 0xd5dc
+wScrollingTextStruct3:: ; 0xd5dc Start of a scrolling struct3
ds $8
wd5e4:: ; 0xd5e4
@@ -1817,7 +1826,7 @@ wd803:: ; 0xd803
wd804:: ; 0xd804
ds $1
-wd805:: ; 0xd805
+wd805:: ; 0xd805 enables unused and odd PlaceString
ds $1
wd806:: ; 0xd806