summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm36
1 files changed, 21 insertions, 15 deletions
diff --git a/wram.asm b/wram.asm
index 61036d24f..daa27f66f 100644
--- a/wram.asm
+++ b/wram.asm
@@ -39,7 +39,7 @@ wChannel8:: channel_struct wChannel8 ; c25f
wCurTrackDuty:: db
wCurTrackIntensity:: db
wCurTrackFrequency:: dw
-wc296:: db ; BCD value, dummied out
+wUnusedBCDNumber:: db ; BCD value, dummied out
wCurNoteDuration:: db ; used in MusicE0 and LoadNote
wCurMusicByte:: db ; c298
@@ -95,7 +95,7 @@ wCryPitch:: dw ; c2b0
wCryLength:: dw ; c2b2
wLastVolume:: db ; c2b4
-wc2b5:: db ; c2b5
+wUnusedMusicF9Flag:: db ; c2b5
wSFXPriority:: ; c2b6
; if nonzero, turn off music when playing sfx
@@ -145,7 +145,7 @@ wDebugFlags:: db
wGameLogicPaused:: db ; c2cd
wSpriteUpdatesEnabled:: db
-wc2cf:: db ; ????
+wUnusedScriptByteBuffer:: db
wMapTimeOfDay:: db
@@ -171,7 +171,8 @@ wPlayerMovement:: db
wc2e2::
wMovementObject::
db
-wMovementDataPointer:: ds 3 ; dba
+wMovementDataBank:: db
+wMovementDataAddress:: dw
wc2e6:: ds 4
wMovementByteWasControlSwitch:: db
wMovementPointer:: dw ; c2eb
@@ -909,8 +910,10 @@ ENDU ; c7e8
ENDU ; c7e8
-wUnusedC7E8:: ds 24
-wUnusedC7E8End::
+; This was a buffer for map-related pointers in the 1997 G/S prototype.
+; See wMapBuffer in pokegold-spaceworld's wram.asm.
+wUnusedMapBuffer:: ds 24
+wUnusedMapBufferEnd::
SECTION "Overworld Map", WRAM0
@@ -954,7 +957,7 @@ wPrinterTileMapBuffer:: ds SCREEN_HEIGHT * SCREEN_WIDTH ; ca90
wPrinterTileMapBufferEnd::
wPrinterStatus:: db ; cbf8
ds 1
-wcbfa:: ds 1
+wcbfa:: db
wGBPrinterSettings:: db
ds 16
wGameboyPrinterRAMEnd::
@@ -2259,22 +2262,23 @@ wTimeOfDay:: db ; d269
SECTION "Enemy Party", WRAMX
UNION ; d26b
-wd26b::
wPokedexShowPointerAddr:: dw
wPokedexShowPointerBank:: db
ds 3
-wd271:: ds 5
+wd271:: dw ; mobile
+
+NEXTU ; d26b
+wUnusedEggHatchFlag:: db
NEXTU ; d26b
; enemy party
wOTPlayerName:: ds NAME_LENGTH ; d26b
-ENDU ; d276
-
wOTPlayerID:: dw ; d276
ds 8
wOTPartyCount:: db ; d280
wOTPartySpecies:: ds PARTY_LENGTH ; d281
wOTPartyEnd:: db ; older code doesn't check PartyCount
+ENDU ; d276
UNION ; d288
; ot party mons
@@ -2309,10 +2313,10 @@ wDudeBallsEnd:: db ; d2af
wDudeBagEnd::
ENDU ; d430
-wd430::
+wd430:: ; mobile
wBattleAction:: db ; d430
-wd431:: db
+wd431:: db ; mobile
wMapStatus:: db ; d432
wMapEventStatus:: db ; d433
@@ -2778,8 +2782,10 @@ wKenjiBreakTimer:: ds 2 ; Kenji
wYanmaMapGroup:: db ; dc5a
wYanmaMapNumber:: db
wPlayerMonSelection:: ds 3
-wdc5f:: ds 1
-wdc60:: ds 19
+wdc5f:: db
+wdc60:: db
+
+ ds 18
wStepCount:: db ; dc73
wPoisonStepCount:: db ; dc74