summaryrefslogtreecommitdiff
path: root/src/wram.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-02-13 10:40:32 -0600
committerdannye <33dannye@gmail.com>2021-02-13 10:40:32 -0600
commit105768597ccd732ca54b734c9e6cbc529ebfd49b (patch)
treefbb7db84c0a4603d7f68874290b55407af9efb60 /src/wram.asm
parent9a20f8c737b53b4a078ade02df95d1e3d6346f3f (diff)
Document some overworld map stuff
and label some wram addresses used by script commands
Diffstat (limited to 'src/wram.asm')
-rw-r--r--src/wram.asm39
1 files changed, 17 insertions, 22 deletions
diff --git a/src/wram.asm b/src/wram.asm
index c20900f..83c260b 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
@@ -2174,7 +2177,8 @@ wd324:: ; d324
ds $9
-wd32e:: ; d32e
+; the OWMAP_* value for the current overworld map selection
+wOverworldMapSelection:: ; d32e
ds $1
wCurMap:: ; d32f
@@ -2186,10 +2190,10 @@ wPlayerXCoord:: ; d330
wPlayerYCoord:: ; d331
ds $1
-wd332:: ; d332
+wPlayerXCoordPixels:: ; d332
ds $1
-wd333:: ; d333
+wPlayerYCoordPixels:: ; d333
ds $1
wPlayerDirection:: ; d334
@@ -2697,7 +2701,7 @@ wBoosterData_TypeChances:: ; d689
ds $1
-wd693:: ; d693
+wStarterDeckChoice:: ; d693
ds $1
wMultichoiceTextboxResult_Sam:: ; d694
@@ -2706,23 +2710,14 @@ wMultichoiceTextboxResult_Sam:: ; d694
wMultichoiceTextboxResult_ChooseDeckToDuelAgainst:: ; d695
ds $1
-wd696:: ; d696
+wChallengeHallNPC:: ; d696
ds $1
-wd697:: ; d697
+wCardReceived:: ; d697
ds $1
wd698:: ; d698
- ds $1
-
-wd699:: ; d699
- ds $1
-
-wd69a:: ; d69a
- ds $1
-
-wd69b:: ; d69b
- ds $1
+ ds $4
ds $6e4