summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorchaos-lord <dd4791.mariokarter@hotmail.co.uk>2017-07-12 18:59:28 +0100
committerchaos-lord <dd4791.mariokarter@hotmail.co.uk>2017-07-12 18:59:28 +0100
commitda4e2bbd49eadfa084341dd11df39a392047e404 (patch)
treefdfc1ad35ca7dd69b1a4a06014ce5be8c110b987 /wram.asm
parent3a675d926fd28eebd44887e8646ba5f24b098347 (diff)
labelled collision handlers
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm20
1 files changed, 18 insertions, 2 deletions
diff --git a/wram.asm b/wram.asm
index f19f0c3..a753245 100644
--- a/wram.asm
+++ b/wram.asm
@@ -566,7 +566,23 @@ wInSpecialMode:: ; 0xd54b
; Set to 1 if currently in special game mode. See wSpecialMode.
ds $1
-wd54c:: ; 0xd54c 10000 sets it to a input, records what the ball has collided with. 7 and 8 from the digletts, 4 from voltorb, b = upper cave lights?, 1 is upper left red trigger, 2 is a right trigger, 5 is bellsprout, d = slot, 6 = staryu, 9/a = right railing multiplier?,
+wSpecialModeCollisionID:: ; 0xd54c 10000 sets it to a input, records what the ball has collided with
+;0 nothing hit?
+;1 upper left red trigger (under ditto) | secondary left trigger on blue
+;2 second right trigger
+;3 second staryu ally trigger
+;4 any voltob | any shellder
+;5 bellsprout | N/A
+;6 staryu | N/A
+;7 left diglett | poliwag
+;8 right diglett | psyduck
+;9 hit right railing (33 multiplier)
+;a hit right railing (otherwise)
+;b upper cave lights (ball upgrade)
+;c Spinner
+;d slot hole
+;e N/A | cloyster
+;f N/A | slowpoke
ds $1
wd54d:: ; 0xd54d catch mode progress?
@@ -1908,7 +1924,7 @@ wOBP1:: ; 0xd80e
wd80f:: ; 0xd80f
ds $1
-wd810:: ; 0xd810
+wd810:: ; 0xd810 loaded by Func_9fa, RNG related
ds $1
wd811:: ; 0xd811