summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/wram.asm b/wram.asm
index 2f9b8dda7..963edbb73 100644
--- a/wram.asm
+++ b/wram.asm
@@ -212,7 +212,7 @@ SECTION "wSpriteAnims", WRAM0
UNION ; c300
; wSpriteAnimDict is a 10x2 dictionary
; keys: taken from third column of SpriteAnimSeqData
-; values: VTiles
+; values: vTiles
wSpriteAnimDict:: ds 10 * 2
wSpriteAnimationStructs::
@@ -1320,6 +1320,7 @@ NEXTU ; cf64
; miscellaneous
wNrOfBeatenBattleTowerTrainers::
wMomBankDigitCursorPosition::
+wSlotsDelay::
db
wCurrPocket::
wPrinterQueueLength::
@@ -1431,7 +1432,7 @@ wFarCallBCBuffer:: dw ; cfb9
wcfbb:: db
-GameTimerPause:: ; cfbc
+wGameTimerPause:: ; cfbc
; bit 0
db
@@ -1629,10 +1630,9 @@ NEXTU ; d002
; miscellaneous
wTempDayOfWeek::
wApricorns::
+wKeepSevenBiasChance:: ; used in the slots to handle the favoring of 7 symbol streaks
db
-
ds 2
-
StartFlypoint:: db
EndFlypoint:: db
@@ -2238,7 +2238,7 @@ wBugContestSecsRemaining:: db ; d46d
wMapStatusEnd:: ds 2 ; d470
wCrystalData::
-PlayerGender:: ; d472
+wPlayerGender:: ; d472
; bit 0:
; 0 male
; 1 female
@@ -2348,7 +2348,7 @@ CurTimeOfDay:: db ; d848
ds 1
wSecretID:: dw
-StatusFlags:: ; d84c
+wStatusFlags:: ; d84c
; 0 - pokedex
; 1 - unown dex
; 2 -
@@ -2359,7 +2359,7 @@ StatusFlags:: ; d84c
; 7 - bug contest on
db
-StatusFlags2:: ; d84d
+wStatusFlags2:: ; d84d
; 0 - rockets
; 1 -
; 2 - bug contest timer
@@ -2377,8 +2377,8 @@ wMomSavingMoney:: db ; d854
Coins:: dw ; d855
Badges::
-JohtoBadges:: flag_array NUM_JOHTO_BADGES ; d857
-KantoBadges:: flag_array NUM_KANTO_BADGES ; d858
+wJohtoBadges:: flag_array NUM_JOHTO_BADGES ; d857
+wKantoBadges:: flag_array NUM_KANTO_BADGES ; d858
TMsHMs:: ds NUM_TMS + NUM_HMS ; d859
@@ -2557,7 +2557,7 @@ wCelebiEvent:: db
ds 1
-BikeFlags:: ; dbf5
+wBikeFlags:: ; dbf5
; bit 0: using strength
; bit 1: always on bike
; bit 2: downhill
@@ -2599,9 +2599,9 @@ wWhichMomItemSet:: db ; dc18
MomItemTriggerBalance:: ds 3 ; dc19
wDailyResetTimer:: dw ; dc1c
-DailyFlags:: db
-WeeklyFlags:: db
-SwarmFlags:: db
+wDailyFlags:: db
+wWeeklyFlags:: db
+wSwarmFlags:: db
ds 2
wStartDay:: db
ds 3
@@ -2660,7 +2660,7 @@ wPlayerDataEnd::
wMapData::
-VisitedSpawns:: flag_array NUM_SPAWNS ; dca5
+wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5
wDigWarpNumber:: db ; dcaa
wDigMapGroup:: db ; dcab
@@ -2717,7 +2717,7 @@ PokedexSeen:: flag_array NUM_POKEMON ; deb9
EndPokedexSeen::
UnownDex:: ds NUM_UNOWN ; ded9
-UnlockedUnowns:: db ; def3
+wUnlockedUnowns:: db ; def3
wFirstUnownSeen:: db
wDayCareMan:: ; def5