diff options
Diffstat (limited to 'wram.asm')
| -rw-r--r--[-rwxr-xr-x] | wram.asm | 105 |
1 files changed, 59 insertions, 46 deletions
@@ -145,7 +145,9 @@ wBallTypeCounter:: ; 0xd47f wBallTypeBackup:: ; 0xd481 ds $1 -wd482:: ; 0xd482 +wCurBonusMultiplier:: ; 0xd482 +; Current value of the bonus multplier. Incremented from achieving various events during the game, or hitting the two bonus multiplier +; railings. (left one first, then right one). See MAX_BONUS_MULTIPLIER ds $1 wd483:: ; 0xd483 @@ -176,8 +178,8 @@ wCompletedBonusStage:: ; 0xd49a ; Set to 1 when a bonus stage is successfully cleared. ds $1 -wCurBonusMultiplier:: ; 0xd49b -; Current value of the bonus multiplier. See MAX_BONUS_MULTIPLIER. +wCurBonusMultiplierFromFieldEvents:: ; 0xd49b +; Current value of the bonus multiplier received from field events, like catching a pokemon or hitting psyduck 3 times. See MAX_BONUS_MULTIPLIER_FIELD_EVENTS. ds $1 wd49c:: ; 0xd49c @@ -395,28 +397,30 @@ wRightMapMoveCounter:: ; 0xd4f2 ds $1 wLeftMapMoveDiglettAnimationCounter:: ; 0xd4f3 +wLeftMapMovePoliwagAnimationCounter:: ds $1 wLeftMapMoveDiglettFrame:: ; 0xd4f4 +wLeftMapMovePoliwagFrame:: ds $1 wRightMapMoveDiglettAnimationCounter:: ; 0xd4f5 +wRightMapMovePsyduckAnimationCounter:: ds $1 wRightMapMoveDiglettFrame:: ; 0xd4f6 +wRightMapMovePsyduckFrame:: ds $1 -wd4f7:: ; 0xd4f7 - ds $1 - -wd4f8:: ; 0xd4f8 - ds $1 - -wd4f9:: ; 0xd4f9 - ds $1 +wLeftMapMoveCounterFramesUntilDecrease:: ; 0xd4f7 +; Holds the number of frames remaining until the wLeftMapMoveCounter +; counter will decrease by 1. + ds $2 -wd4fa:: ; 0xd4fa - ds $1 +wRightMapMoveCounterFramesUntilDecrease:: ; 0xd4f9 +; Holds the number of frames remaining until the wRightMapMoveCounter +; counter will decrease by 1. + ds $2 wBellsproutCollision:: ; 0xd4fb ; Second byte is set by HandleGameObjectCollision, but is unused @@ -465,16 +469,18 @@ wWhichCAVELight:: ; 0xd50d wWhichCAVELightId:: ; 0xd50e ds $1 -wd50f:: ; 0xd50f - ds $3 - -wd512:: ; 0xd512 - ds $1 +wCAVELightStates:: ; 0xd50f +; Marks each of the 4 CAVE lights as On (1) or Off (0). +; When all four are On, it will do a blinking animation, and then open the Slot bonus. + ds $4 -wd513:: ; 0xd513 +wCAVELightsBlinking:: ; 0xd513 +; Set to 1 when the 4 CAVE lights are blinking for a couple seconds after successfully +; lighting up all 4. Set to 0, otherwise. ds $1 -wd514:: ; 0xd514 +wCAVELightsBlinkingFramesRemaining:: ; 0xd514 +; Holds the number of frames remaining in the 4 CAVE lights' blinking animation. ds $1 wWhichPikachu:: ; 0xd515 @@ -677,7 +683,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 @@ -724,26 +730,29 @@ 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 - ds $8 - -wd5d4:: ; 0xd5d4 - ds $4 - -wd5d8:: ; 0xd5d8 - ds $3 - -wd5db:: ; 0xd5db - ds $1 +scrolling_text: MACRO +\1Enabled:: ds 1 ; Toggles if enabled. 0 is off, non-0 is on +\1ScrollDelayCounter:: ds 1 ; Number of frames remaining until the next scroll step +\1ScrollDelay:: ds 1 ; Number of frames between each scroll step +\1MessageBoxOffset:: ds 1 ; Offset in wBottomMessageBuffer to place first character of text +\1StopOffset:: ds 1 ; Offset in wBottomMessageBuffer where the scrolling text will briefly stop +\1StopDuration:: ds 1 ; Number of frames the message will remained stopped, before resuming scroll +\1SourceTextOffset:: ds 1 ; Offset in wBottomMessageText for the text to be displayed +\1ScrollStepsRemaining:: ds 1 ; Number of scroll steps remaining. Isn't decremented during the stop. +ENDM -wd5dc:: ; 0xd5dc - ds $8 +wScrollingText1:: ; 0xd5cc + scrolling_text wScrollingText1 +wScrollingText2:: ; 0xd5d4 + scrolling_text wScrollingText2 +wScrollingText3:: ; 0xd5dc + scrolling_text wScrollingText3 wd5e4:: ; 0xd5e4 ds $5 @@ -766,16 +775,18 @@ wWhichPinballUpgradeTrigger:: ; 0xd5f7 wWhichPinballUpgradeTriggerId:: ; 0xd5f8 ds $1 -wd5f9:: ; 0xd5f9 - ds $2 - -wd5fb:: ; 0xd5fb - ds $1 +wBallUpgradeTriggerStates:: ; 0xd5f9 +; Marks each of the 3 ball upgrade triggers as On (1) or Off (0). +; When all three are On, it upgrades the pinball field multiplier. (e.g. Pokeball -> Great Ball) + ds $3 -wd5fc:: ; 0xd5fc +wBallUpgradeTriggersBlinking:: ; 0xd5fc +; Set to 1 when the 3 ball upgrade triggers are blinking for a couple seconds after successfully +; lighting up all 3. Set to 0, otherwise. ds $1 -wd5fd:: ; 0xd5fd +wBallUpgradeTriggersBlinkingFramesRemaining:: ; 0xd5fd +; Holds the number of frames remaining in the ball upgrade blinking animation. ds $1 wDittoSlotCollision:: ; 0xd5fe @@ -812,10 +823,12 @@ wWhichBonusMultiplierRailing:: ; 0xd60a wWhichBonusMultiplierRailingId:: ; 0xd60b ds $1 -wd60c:: ; 0xd60c +wBonusMultiplierTensDigit:: ; 0xd60c +; Holds the tens digit for the current bonus multiplier value. This number is displayed on the left-side bonus multiplier railing. ds $1 -wd60d:: ; 0xd60d +wBonusMultiplierOnesDigit:: ; 0xd60d +; Holds the ones digit for the current bonus multiplier value. This number is displayed on the right-side bonus multiplier railing. ds $1 wd60e:: ; 0xd60e @@ -1811,7 +1824,7 @@ wd803:: ; 0xd803 wd804:: ; 0xd804 ds $1 -wd805:: ; 0xd805 +wd805:: ; 0xd805 enables unused and odd PlaceString ds $1 wd806:: ; 0xd806 |