summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-03 21:22:06 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-03 21:22:06 -0500
commit79849a7e40faf2b44a5d56c555fe83a9f8a9d0d9 (patch)
tree7135a8766360b027df6592101981ce6e642a029d
parent73ea7c6326f16f84de1cf74193705328d1664645 (diff)
db/dw, and keep unused space away from labels
-rw-r--r--wram.asm20
1 files changed, 11 insertions, 9 deletions
diff --git a/wram.asm b/wram.asm
index 6b806cb41..10c91d5f0 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1226,7 +1226,7 @@ wcd72:: ds 1
wcd73:: ds 1
wcd74:: ds 1
-wOTMonSelection:: ds 2 ; ds 3
+wOTMonSelection:: ds 2 ; ds BATTLETOWER_PARTY_LENGTH
wcd77:: ds 1
wMobileCrashCheckPointer:: dw
@@ -1621,12 +1621,12 @@ wMartItemBCDEnd::
NEXTU ; d002
; town map data
-wTownMapPlayerIconLandmark:: ds 1
+wTownMapPlayerIconLandmark:: db
UNION
-wTownMapCursorLandmark:: ds 1
-wTownMapCursorObjectPointer:: ds 2
+wTownMapCursorLandmark:: db
+wTownMapCursorObjectPointer:: dw
NEXTU
-wTownMapCursorCoordinates:: ds 2
+wTownMapCursorCoordinates:: dw
ENDU
NEXTU ; d002
@@ -1903,7 +1903,7 @@ wCurMessageScrollPosition:: db
wCurMessageIndex:: db
wMailboxCount:: db
wMailboxItems:: ds MAILBOX_CAPACITY
-wMailboxEnd:: ds 1 ; d0fe
+wMailboxEnd:: ; d0fe
ENDU ; d100
wListPointer:: dw ; d100
@@ -2026,7 +2026,7 @@ wTilesetBlocksAddress:: dw ; d1dd
wTilesetCollisionBank:: db ; d1df
wTilesetCollisionAddress:: dw ; d1e0
wTilesetAnim:: dw ; bank 3f ; d1e2
- ds 2 ; unused ; d1e4
+ ds 2 ; unused ; d1e4
wTilesetPalettes:: dw ; bank 3f ; d1e6
wTilesetEnd::
@@ -2300,7 +2300,9 @@ wReceiveCallDelay_StartTime:: ds 3 ; d466
wBugContestMinsRemaining:: db ; d46c
wBugContestSecsRemaining:: db ; d46d
ds 2
-wMapStatusEnd:: ds 2 ; d470
+wMapStatusEnd:: ; d470
+
+ ds 2
wCrystalData::
wPlayerGender:: ; d472
@@ -2638,7 +2640,7 @@ wBikeFlags:: ; dbf5
; bit 1: always on bike
; bit 2: downhill
db
- ds 1 ; also cleared by ResetBikeFlags
+ ds 1 ; cleared along with wBikeFlags by ResetBikeFlags
wCurrMapSceneScriptPointer:: dw ; dbf7