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

constants/battle_tower_constants.asm

@@ -51,11 +51,3 @@ DEF MOBILE_EVENT_OBJECT_GS_BALL EQU $b
 	const BATTLETOWERTEXT_INTRO
 	const BATTLETOWERTEXT_WIN_TEXT
 	const BATTLETOWERTEXT_LOSS_TEXT
-
-; sBattleTowerChallengeState values
-	const_def
-	const BATTLETOWER_NO_CHALLENGE
-	const BATTLETOWER_SAVED_AND_LEFT
-	const BATTLETOWER_CHALLENGE_IN_PROGRESS
-	const BATTLETOWER_WON_CHALLENGE
-	const BATTLETOWER_RECEIVED_REWARD

constants/tileset_constants.asm

@@ -39,7 +39,7 @@
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size
-DEF TILESET_LENGTH EQU 15
+DEF TILESET_LENGTH EQU 13
 
 ; roof length (see gfx/tilesets/roofs)
 DEF ROOF_LENGTH EQU 9

data/tilesets.asm

@@ -1,7 +1,6 @@
 MACRO tileset
 	dba \1GFX, \1Meta, \1Coll
 	dw \1Anim
-	dw NULL
 	dw \1PalMap
 ENDM
 

engine/gfx/mon_icons.asm

@@ -39,8 +39,8 @@ LoadMenuMonIcon:
 	dw NamingScreen_InitAnimatedMonIcon ; MONICON_NAMINGSCREEN
 	dw MoveList_InitAnimatedMonIcon     ; MONICON_MOVES
 	dw Trade_LoadMonIconGFX             ; MONICON_TRADE
-	dw Mobile_InitAnimatedMonIcon       ; MONICON_MOBILE1
+	dw Unused_GetPartyMenuMonIcon       ; MONICON_MOBILE1
-	dw Mobile_InitPartyMenuBGPal71      ; MONICON_MOBILE2
+	dw Unused_GetPartyMenuMonIcon      ; MONICON_MOBILE2
 	dw Unused_GetPartyMenuMonIcon       ; MONICON_UNUSED
 
 Unused_GetPartyMenuMonIcon:
@@ -80,43 +80,6 @@ Unused_GetPartyMenuMonIcon:
 	ld [hl], a
 	ret
 
-Mobile_InitAnimatedMonIcon:
-	call PartyMenu_InitAnimatedMonIcon
-	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
-	add hl, bc
-	ld a, SPRITE_ANIM_SEQ_NULL
-	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_XCOORD
-	add hl, bc
-	ld a, 9 * 8
-	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_YCOORD
-	add hl, bc
-	ld a, 9 * 8
-	ld [hl], a
-	ret
-
-Mobile_InitPartyMenuBGPal71:
-	call InitPartyMenuIcon
-	call SetPartyMonIconAnimSpeed
-	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
-	add hl, bc
-	ld a, SPRITE_ANIM_SEQ_NULL
-	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_XCOORD
-	add hl, bc
-	ld a, 3 * 8
-	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_YCOORD
-	add hl, bc
-	ld a, 12 * 8
-	ld [hl], a
-	ld a, c
-	ld [wc608], a
-	ld a, b
-	ld [wc608 + 1], a
-	ret
-
 PartyMenu_InitAnimatedMonIcon:
 	call InitPartyMenuIcon
 	call .SpawnItemIcon

engine/menus/save.asm

@@ -278,15 +278,6 @@ _SaveGameData:
 	call UpdateStackTop
 	farcall BackupPartyMonMail
 	farcall SaveRTC
-	ld a, BANK(sBattleTowerChallengeState)
-	call OpenSRAM
-	ld a, [sBattleTowerChallengeState]
-	cp BATTLETOWER_RECEIVED_REWARD
-	jr nz, .ok
-	xor a
-	ld [sBattleTowerChallengeState], a
-.ok
-	call CloseSRAM
 	ret
 
 UpdateStackTop:
@@ -659,15 +650,6 @@ LoadPlayerData:
 	ld de, wCurMapData
 	ld bc, wCurMapDataEnd - wCurMapData
 	call CopyBytes
-	call CloseSRAM
-	ld a, BANK(sBattleTowerChallengeState)
-	call OpenSRAM
-	ld a, [sBattleTowerChallengeState]
-	cp BATTLETOWER_RECEIVED_REWARD
-	jr nz, .not_4
-	ld a, BATTLETOWER_WON_CHALLENGE
-	ld [sBattleTowerChallengeState], a
-.not_4
 	call CloseSRAM
 	ret
 

home/flag.asm

@@ -7,7 +7,6 @@ ResetMapBufferEventFlags::
 ResetBikeFlags::
 	xor a
 	ld hl, wBikeFlags
-	ld [hli], a
 	ld [hl], a
 	ret
 

layout.link

@@ -285,7 +285,6 @@ SRAM $01
 	"Link Battle Data"
 	"SRAM Hall of Fame"
 	"SRAM Crystal Data"
-	"SRAM Battle Tower"
 SRAM $02
 	"Boxes 1-7"
 SRAM $03

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