Merge https://github.com/pret/poketcg

1 files changed, 67 insertions, 44 deletions

diff --git a/src/wram.asm b/src/wram.asm
index 074b9c2..85c839b 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -913,7 +913,7 @@ wPlayerAttackingCardID:: ; cc12
 wIsPracticeDuel:: ; cc13
 	ds $1
 
-wcc14:: ; cc14
+wNPCDuelistCopy:: ; cc14
 	ds $1
 
 wOpponentPortrait:: ; cc15
@@ -924,11 +924,11 @@ wOpponentName:: ; cc16
 	ds $2
 
 ; an overworld script starting a duel sets this address to the value to be written into wDuelInitialPrizes
-wcc18:: ; cc18
+wNPCDuelPrizes:: ; cc18
 	ds $1
 
 ; an overworld script starting a duel sets this address to the value to be written into wOpponentDeckID
-wcc19:: ; cc19
+wNPCDuelDeckID:: ; cc19
 	ds $1
 
 ; song played during a duel
@@ -2002,7 +2002,7 @@ wd0c2:: ; d0c2
 wDuelResult:: ; d0c3
 	ds $1
 
-wd0c4:: ; d0c4
+wNPCDuelist:: ; d0c4
 	ds $1
 
 wd0c5:: ; d0c5
@@ -2036,7 +2036,7 @@ wd10f:: ; d10f
 wd110:: ; d110
 	ds $1
 
-wd111:: ; d111
+wDefaultSong:: ; d111
 	ds $1
 
 wd112:: ; d112
@@ -2054,7 +2054,10 @@ wd115:: ; d115
 wd116:: ; d116
 	ds $1
 
-wd117:: ; d117
+; if FALSE, first booster being given
+; if TRUE, additional booster being given
+; used to control the text that is displayed when booster is opened
+wAnotherBoosterPack:: ; d117
 	ds $1
 
 	ds $3
@@ -2147,8 +2150,8 @@ wLoadedPalData:: ; d23e
 
 NEXTU
 
-; where BG map data is decompressed
-wBGMapBuffer:: ; d23e
+; where BG map data or other compressed data is decompressed
+wDecompressionBuffer:: ; d23e
 	ds $40
 
 ENDU
@@ -2206,7 +2209,8 @@ wumLoadedFramesetSubgroups:: ; d322
 wd323:: ; d323
 	ds $b
 
-wd32e:: ; d32e
+; the OWMAP_* value for the current overworld map selection
+wOverworldMapSelection:: ; d32e
 	ds $1
 
 wCurMap:: ; d32f
@@ -2218,10 +2222,10 @@ wPlayerXCoord:: ; d330
 wPlayerYCoord:: ; d331
 	ds $1
 
-wd332:: ; d332
+wPlayerXCoordPixels:: ; d332
 	ds $1
 
-wd333:: ; d333
+wPlayerYCoordPixels:: ; d333
 	ds $1
 
 wPlayerDirection:: ; d334
@@ -2246,45 +2250,47 @@ wd339:: ; d339
 wd33a:: ; d33a
 	ds $1
 
-wd33b:: ; d33b
+wOverworldMapCursorSprite:: ; d33b
 	ds $1
 
-wd33c:: ; d33c
+wOverworldMapCursorAnimation:: ; d33c
 	ds $1
 
-wd33d:: ; d33d
+wOverworldMapStartingPosition:: ; d33d
 	ds $1
 
-wd33e:: ; d33e
+; 0: selection not made, controlling cursor
+; 1: selection made, animating player across map
+; 2: player arrived at new map
+wOverworldMapPlayerAnimationState:: ; d33e
 	ds $1
 
-wd33f:: ; d33f
-	ds $1
-
-wd340:: ; d340
-	ds $1
-
-wd341:: ; d341
-	ds $1
-
-	ds $1
+wOverworldMapPlayerMovementPtr:: ; d33f
+	ds $2
 
-wd343:: ; d343
+wOverworldMapPlayerMovementCounter:: ; d341
 	ds $1
 
-wd344:: ; d344
 	ds $1
 
-wd345:: ; d345
-	ds $1
+; during setup, this holds a signed 16-bit integer
+; representing the total horizontal distance between
+; the current point and the next point
+; afterward, this holds a signed fixed-point fractional number
+; where the high byte represents the number of pixels
+; to travel per frame and the low byte represents the
+; fraction of a pixel to travel per frame
+wOverworldMapPlayerPathHorizontalMovement:: ; d343
+	ds $2
 
-wd346:: ; d346
-	ds $1
+; works the same as above, but for vertical distance
+wOverworldMapPlayerPathVerticalMovement:: ; d345
+	ds $2
 
-wd347:: ; d347
+wOverworldMapPlayerHorizontalSubPixelPosition:: ; d347
 	ds $1
 
-wd348:: ; d348
+wOverworldMapPlayerVerticalSubPixelPosition:: ; d348
 	ds $1
 
 wd349:: ; d349
@@ -2359,11 +2365,11 @@ wd3cc:: ; d3cc
 wd3d0:: ; d3d0
 	ds $1
 
-; the bits relevant to the currently worked on flag, obtained from EventFlagMods
-wLoadedFlagBits:: ; d3d1
+; the bits relevant to the currently worked on event, obtained from EventVarMasks
+wLoadedEventBits:: ; d3d1
 	ds $1
 
-wEventFlags:: ; d3d2
+wEventVars:: ; d3d2
 	ds $40
 
 ; 0 keeps looping, other values break the loop in RST20
@@ -2373,7 +2379,7 @@ wBreakScriptLoop:: ; d412
 wScriptPointer:: ; d413
 	ds $2
 
-; generally set to ff when a flag check passes, 0 otherwise
+; generally set to ff when an event check passes, 0 otherwise
 wScriptControlByte:: ; d415
 	ds $1
 
@@ -2605,17 +2611,34 @@ wSpriteVRAMBuffer:: ; d5d8
 wSpriteVRAMBufferSize:: ; d618
 	ds $1
 
-	ds $2
+wSceneSprite:: ; d619
+	ds $1
 
-wd61b:: ; d61b
+wSceneSpriteAnimation:: ; d61a
 	ds $1
 
-	ds $2
+wSceneSpriteIndex:: ; d61b
+	ds $1
+
+; base X position in pixels of loaded scene
+wSceneBaseX:: ; d61c
+	ds $1
+
+; base Y position in pixels of loaded scene
+wSceneBaseY:: ; d61d
+	ds $1
 
 wd61e:: ; d61e
 	ds $1
 
-	ds $5
+wd61f:: ; d61f
+	ds $1
+
+wSceneSGBPacketPtr:: ; d620
+	ds $2
+
+wSceneSGBRoutinePtr:: ; d622
+	ds $2
 
 wd624:: ; d624
 	ds $1
@@ -2737,7 +2760,7 @@ wBoosterData_TypeChances:: ; d689
 
 	ds $1
 
-wd693:: ; d693
+wStarterDeckChoice:: ; d693
 	ds $1
 
 wMultichoiceTextboxResult_Sam:: ; d694
@@ -2746,10 +2769,10 @@ wMultichoiceTextboxResult_Sam:: ; d694
 wMultichoiceTextboxResult_ChooseDeckToDuelAgainst:: ; d695
 	ds $1
 
-wd696:: ; d696
+wChallengeHallNPC:: ; d696
 	ds $1
 
-wd697:: ; d697
+wCardReceived:: ; d697
 	ds $1
 
 wd698:: ; d698