summaryrefslogtreecommitdiff
path: root/sram.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 15:45:57 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 20:29:58 -0400
commit9dcdad5e60fbc10ba81ae127743c78a6b00d3dd5 (patch)
tree1bbe56fe1c3b0ad4c95d191f0137007becef7169 /sram.asm
parenta2b6befd7d12b2ad8bb97979a10519500dcdd870 (diff)
Comment, remove, or revise many unreferenced labels
Diffstat (limited to 'sram.asm')
-rw-r--r--sram.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/sram.asm b/sram.asm
index 36b0a61e8..c1508cc05 100644
--- a/sram.asm
+++ b/sram.asm
@@ -1,6 +1,6 @@
SECTION "Scratch", SRAM
-sScratch:: ds $600
+sScratch:: ds $60 tiles
SECTION "SRAM Bank 0", SRAM
@@ -22,7 +22,7 @@ sPartyMon5MailBackup:: mailmsg sPartyMon5MailBackup
sPartyMon6MailBackup:: mailmsg sPartyMon6MailBackup
sMailboxCount:: db
-sMailbox::
+sMailboxes::
sMailbox1:: mailmsg sMailbox1
sMailbox2:: mailmsg sMailbox2
sMailbox3:: mailmsg sMailbox3
@@ -35,7 +35,7 @@ sMailbox9:: mailmsg sMailbox9
sMailbox10:: mailmsg sMailbox10
sMailboxCountBackup:: db
-sMailboxBackup::
+sMailboxesBackup::
sMailbox1Backup:: mailmsg sMailbox1Backup
sMailbox2Backup:: mailmsg sMailbox2Backup
sMailbox3Backup:: mailmsg sMailbox3Backup
@@ -54,8 +54,7 @@ sNumDailyMysteryGiftPartnerIDs:: db
sDailyMysteryGiftPartnerIDs:: ds 5 * 2 ; maximum 5 per day, 2 bytes per ID
sMysteryGiftDecorationsReceived:: flag_array NUM_NON_TROPHY_DECOS
ds 4
-sMysteryGiftTimer:: db
-sMysteryGiftTimerStartDay:: db
+sMysteryGiftTimer:: dw
ds 1
sMysteryGiftTrainerHouseFlag:: db
sMysteryGiftPartnerName:: ds NAME_LENGTH
@@ -194,7 +193,6 @@ sBattleTowerChallengeState::
; 2: battle tower
db
-sBattleTower::
sNrOfBeatenBattleTowerTrainers:: db
sBTChoiceOfLevelGroup:: db
; Battle Tower trainers are saved here, so nobody appears more than once