summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'wram.asm')
-rw-r--r--[-rwxr-xr-x]wram.asm33
1 files changed, 21 insertions, 12 deletions
diff --git a/wram.asm b/wram.asm
index 56dd18e..2b33e5d 100755..100644
--- a/wram.asm
+++ b/wram.asm
@@ -40,7 +40,8 @@ wc4c0:: ; 0xc4c0
wc4cc:: ; 0xc4cc
ds $34
-wBottomMessageText:: ; 0xc500
+wBottomMessageText:: ; 0xc500 WARNING: text loading code may break if this is moved
+; This must be aligned with $100, since there is some logic that depends on the lower byte of the address. (See LoadMonNameIntoEvolutionSelectionList)
ds $100
wBottomMessageBuffer:: ; 0xc600
@@ -212,13 +213,15 @@ wBallSaverTimerFramesBackup:: ; 0xd4a6
wBallSaverTimerSecondsBackup:: ; 0xd4a7
ds $1
-wd4a8:: ; 0xd4a8
+wNumTimesBallSavedTextWillDisplayBackup:: ; 0xd4a8
ds $1
wd4a9:: ; 0xd4a9
ds $1
-wd4aa:: ; 0xd4aa
+wDrawBottomMessageBox:: ; 0xd4aa
+; Set to non-zero value if enable drawing the 1-tile high bottom message bar during V-Blank in normal pinball gameplay.
+; Set to 0 to disable.
ds $1
wd4ab:: ; 0xd4ab
@@ -529,12 +532,15 @@ wRightAlleyCount:: ; 0xd545
wSecondaryLeftAlleyTrigger:: ; 0xd546
ds $2
-wd548:: ; 0xd548
+wPinballIsVisible:: ; 0xd548
+; Set to 1 if the pinball is visible in play.
+; Set to 0 when the pinball disappears in things like the Slot, Slowpoke, Cloyster, Bellsprout, etc.
+; When it's set to 0, it disables tilt effects on the pinball.
ds $1
-wDisableBallGravityAndTilt:: ; 0xd549
-; Set to 1 to disable any affect gravity or tilt has on the pinball.
-; Used for things likes the initial pinball launch or to hold the ball stationary.
+wEnableBallGravityAndTilt:: ; 0xd549
+; Set to 1 to enable the effect of gravity and tilt on the pinball.
+; 0 disables these forces. Used for things likes the initial pinball launch or to hold the ball stationary.
ds $1
wCurrentMap:: ; 0xd54a
@@ -1814,14 +1820,17 @@ wd806:: ; 0xd806
wd807:: ; 0xd807
ds $1
-wd808:: ; 0xd808
+; These three bytes track different joypad states cummulatively, until they are manually cleared.
+; They inherit from their similarly-named counterparts found in hram.asm. (See ReadJoyPad)
+wJoypadStatesPersistent:: ; 0xd808
+wJoypadStatePersistent::
ds $1
-
-wd809:: ; 0xd809
+wNewlyPressedButtonsPersistent:: ; 0xd809
+ ds $1
+wPressedButtonsPersistent:: ; 0xd80a
ds $1
-wd80a:: ; 0xd80a
- ds $2
+ ds $1 ; unused byte
wBGP:: ; 0xd80c
ds $1