Clean up WRAM, SRAM, and HRAM space (#6)

ram/hram.asm

@@ -11,8 +11,6 @@ hRTCHours::   db
 hRTCMinutes:: db
 hRTCSeconds:: db
 
-	ds 2
-
 hHours:: db
 	ds 1
 hMinutes:: db
@@ -20,12 +18,8 @@ hMinutes:: db
 hSeconds:: db
 	ds 1
 
-	ds 1
-
 hVBlankCounter:: db
 
-	ds 1
-
 hROMBank:: db
 hVBlank:: db
 hMapEntryMethod:: db
@@ -44,8 +38,6 @@ hJoyLast::        db
 
 hInMenu:: db
 
-	ds 1
-
 hPrinter:: db
 hGraphicStartTile:: db
 hMoveMon:: db
@@ -86,17 +78,6 @@ hMathBuffer:: ds 5
 NEXTU
 ; PrintNum scratch space
 hPrintNumBuffer:: ds 10
-
-NEXTU
-; Mystery Gift
-hMGExchangedByte:: db
-hMGExchangedWord:: dw
-hMGNumBits:: db
-hMGChecksum:: dw
-	ds 1
-hMGUnusedMsgLength:: db
-hMGRole:: db
-hMGStatusFlags:: db
 ENDU
 
 UNION
@@ -145,8 +126,6 @@ hSPBuffer::  dw
 hBGMapUpdate::    db
 hBGMapTileCount:: db
 
-	ds 1
-
 hMapAnims::      db
 hTileAnimFrame:: db
 
@@ -172,5 +151,3 @@ if DEF(_DEBUG)
 hDebugRoomMenuPage::
 endc
 hClockResetTrigger:: db
-
-	ds 19

ram/sram.asm

@@ -32,7 +32,6 @@ sMailbox{d:n}Backup:: mailmsg sMailbox{d:n}Backup
 endr
 
 sRTCStatusFlags:: db
-	ds 7
 sLuckyNumberDay:: db
 sLuckyIDNumber::  dw
 
@@ -49,8 +48,6 @@ sBackupCurMapData::  ds wCurMapDataEnd - wCurMapData
 sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData
 sBackupGameDataEnd::
 
-	ds $18a
-
 sBackupChecksum:: dw
 
 sBackupCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruption
@@ -78,8 +75,6 @@ sCurMapData::  ds wCurMapDataEnd - wCurMapData
 sPokemonData:: ds wPokemonDataEnd - wPokemonData
 sGameDataEnd::
 
-	ds $18a
-
 sChecksum:: dw
 
 sCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruption
@@ -89,8 +84,6 @@ SECTION "Active Box", SRAM
 
 sBox:: box sBox
 
-	ds $100
-
 
 SECTION "Link Battle Data", SRAM
 
@@ -122,34 +115,6 @@ SECTION "SRAM Crystal Data", SRAM
 sCrystalData:: ds wCrystalDataEnd - wCrystalData
 
 
-SECTION "SRAM Battle Tower", SRAM
-
-; Battle Tower data must be in SRAM because you can save and leave between battles
-sBattleTowerChallengeState::
-; 0: normal
-; 2: battle tower
-	db
-
-sNrOfBeatenBattleTowerTrainers:: db
-sBTChoiceOfLevelGroup:: db
-; Battle Tower trainers are saved here, so nobody appears more than once
-sBTTrainers:: ds BATTLETOWER_STREAK_LENGTH
-sBattleTowerSaveFileFlags:: db
-sBattleTowerReward:: db
-
-sBTMonOfTrainers::
-; team of previous trainer
-; sBTMonPrevTrainer1 - sBTMonPrevTrainer3
-for n, 1, BATTLETOWER_PARTY_LENGTH + 1
-sBTMonPrevTrainer{d:n}:: db
-endr
-; team of preprevious trainer
-; sBTMonPrevPrevTrainer1 - sBTMonPrevPrevTrainer3
-for n, 1, BATTLETOWER_PARTY_LENGTH + 1
-sBTMonPrevPrevTrainer{d:n}:: db
-endr
-
-
 ; The PC boxes will not fit into one SRAM bank,
 ; so they use multiple SECTIONs
 DEF box_n = 0