Merge remote-tracking branch 'origin/master' into chaos_requests-tppfork

1 files changed, 17 insertions, 9 deletions

diff --git a/wram.asm b/wram.asm
index a753245..8e80515 100644
--- a/wram.asm
+++ b/wram.asm
@@ -159,20 +159,28 @@ wd489:: ; 0xd489
 wd48f:: ; 0xd48f
 	ds $6
 
-wd495:: ; 0xd495
+wGoingToBonusStage:: ; 0xd495
+; Set to 1 when the player's pinball enters the Slot cave to go to a Bonus Stage.
 	ds $1
 
-wd496:: ; 0xd496
+wReturningFromBonusStage:: ; 0xd496
+; Set to 1 when a bonus stage is is finished. This is used when the main field logic is determining
+; where to start the ball, since it falls out of the Slot cave after a bonus stage.
 	ds $1
 
 wNextStage:: ; 0xd497
 ; Holds the id of the next stage to go to. Used for transitioning between bonus stage and the main red/blue field.
 	ds $1
 
-wd498:: ; 0xd498
+wNextBonusStage:: ; 0xd498
+; Holds id of the next Bonus Stage the player is eligible to go to.
+; This is not the raw stage id (e.g. STAGE_MEOWTH_BONUS), rather, its the id in the order the STAGE constants are defined.
+; See constants/bonus_stage_order_constants.asm for list of values.
 	ds $1
 
-wd499:: ; 0xd499
+wInitialNextBonusStage:: ; 0xd499
+; Holds the id of the first Bonus Stage for the current field. This is used to "wrap around" back to the start of the bonus stages
+; after defeating the Mewtwo stage.  See wNextBonusStage.
 	ds $1
 
 wCompletedBonusStage:: ; 0xd49a
@@ -1921,19 +1929,19 @@ wOBP0:: ; 0xd80d
 wOBP1:: ; 0xd80e
 	ds $1
 
-wd80f:: ; 0xd80f
+wRNGSub:: ; 0xd80f
 	ds $1
 
-wd810:: ; 0xd810 loaded by Func_9fa, RNG related
+wRNGModulus:: ; 0xd810 loaded by UpdateRNG, RNG related
 	ds $1
 
-wd811:: ; 0xd811
+wRNGPointer:: ; 0xd811
 	ds $1
 
-wd812:: ; 0xd812
+wRNGValues:: ; 0xd812
 	ds $36
 
-wd848:: ; 0xd848
+wRNGSub2:: ; 0xd848
 	ds $1
 
 wUpdateAudioEngineUsingTimerInterrupt:: ; 0xd849