Identify some unused WRAM variables (#453)

pret · Jun 15, 2024 · ce77a33 · ce77a33
1 parent b5bf00e
commit ce77a33
Show file tree

Hide file tree

Showing 10 changed files with 140 additions and 150 deletions.
diff --git a/pokeblue.map b/pokeblue.map
@@ -17820,7 +17820,7 @@ SRAM bank #3:
 
 WRAM0 bank #0:
 	SECTION: $c000-$c0ff ($0100 bytes) ["Audio RAM"]
-	         $c000 = wUnusedC000
+	         $c000 = wUnusedMusicByte
 	         $c001 = wSoundID
 	         $c002 = wMuteAudioAndPauseMusic
 	         $c003 = wDisableChannelOutputWhenSfxEnds
@@ -18665,12 +18665,12 @@ WRAM0 bank #0:
 	         $cd33 = wEnemyMonEvasionMod
 	         $cd34 = wInGameTradeReceiveMonSpecies
 	         $cd36 = wEnemyMonStatModsEnd
-	         $cd37 = wUnusedCD37
 	         $cd37 = wFilteredBagItemsCount
+	         $cd37 = wUnusedLinkMenuByte
 	         $cd37 = wNPCMovementDirections2Index
 	         $cd38 = wSimulatedJoypadStatesIndex
-	         $cd39 = wUnusedCD39
-	         $cd3a = wUnusedCD3A
+	         $cd39 = wUnusedSimulatedJoypadStatesMask
+	         $cd3a = wUnusedOverrideSimulatedJoypadStatesIndex
 	         $cd3b = wOverrideSimulatedJoypadStatesMask
 	         $cd3d = wCoordIndex
 	         $cd3d = wSwappedMenuItem
@@ -18690,7 +18690,6 @@ WRAM0 bank #0:
 	         $cd3d = wBoxNumString
 	         $cd3d = wWhichTownMapLocation
 	         $cd3d = wRivalStarterTemp
-	         $cd3d = wUnusedCD3D
 	         $cd3d = wInwardSpiralUpdateScreenCounter
 	         $cd3d = wHoFTeamIndex
 	         $cd3d = wFallingObjectsMovementData
@@ -18702,6 +18701,7 @@ WRAM0 bank #0:
 	         $cd3d = wPriceTemp
 	         $cd3d = wHoFMonSpecies
 	         $cd3d = wWereAnyMonsAsleep
+	         $cd3d = wUnusedCreditsByte
 	         $cd3d = wPlayerSpinInPlaceAnimFrameDelay
 	         $cd3d = wTrainerSpriteOffset
 	         $cd3d = wMoveDownSmallStarsOAMCount
@@ -18869,7 +18869,7 @@ WRAM0 bank #0:
 	         $cf70 = wGymLeaderName
 	         $cf7b = wItemList
 	         $cf8b = wListPointer
-	         $cf8d = wUnusedCF8D
+	         $cf8d = wUnusedNamePointer
 	         $cf8f = wItemPrices
 	         $cf91 = wcf91
 	         $cf92 = wWhichPokemon
@@ -19035,9 +19035,9 @@ WRAM0 bank #0:
 	         $d08a = wFallingObjectMovementByte
 	         $d08a = wTradedMonMovingRight
 	         $d08a = wNumShootingBalls
-	         $d08a = wUnusedD08A
 	         $d08a = wOptionsInitialized
 	         $d08a = wNewSlotMachineBallTile
+	         $d08a = wUnusedWaterDropletsByte
 	         $d08a = wSpiralBallsBaseY
 	         $d08a = wFlashScreenLongCounter
 	         $d08b = wSubAnimTransform
@@ -19052,8 +19052,8 @@ WRAM0 bank #0:
 	         $d096 = wSlotMachineAllowMatchesCounter
 	         $d096 = wSubAnimSubEntryAddr
 	         $d09a = wOutwardSpiralTileMapPointer
+	         $d09b = wUnusedMoveAnimByte
 	         $d09b = wTownMapSpriteBlinkingEnabled
-	         $d09b = wUnusedD09B
 	         $d09b = wPartyMenuAnimMonEnabled
 	         $d09c = wFBDestAddr
 	         $d09e = wFBMode
@@ -19110,7 +19110,7 @@ WRAM0 bank #0:
 	         $d0dc = wMoves
 	         $d0e0 = wMoveNum
 	         $d0e1 = wMovesString
-	         $d119 = wUnusedD119
+	         $d119 = wUnusedCurMapTilesetCopy
 	         $d11a = wWalkBikeSurfStateCopy
 	         $d11b = wInitListType
 	         $d11c = wCapturedMonSpecies
@@ -19161,7 +19161,7 @@ WRAM0 bank #0:
 	         $d148 = wLinkBattleRandomNumberList
 	         $d152 = wSerialPlayerDataBlock
 	         $d152 = wPseudoItemID
-	         $d153 = wUnusedD153
+	         $d153 = wUnusedAlreadyOwnedFlag
 	         $d156 = wEvoStoneItemID
 	         $d157 = wSavedNPCMovementDirections2Index
 	         $d158 = wPlayerName
@@ -19366,7 +19366,7 @@ WRAM0 bank #0:
 	         $d363 = wYBlockCoord
 	         $d364 = wXBlockCoord
 	         $d365 = wLastMap
-	         $d366 = wUnusedD366
+	         $d366 = wUnusedLastMapWidth
 	         $d367 = wCurMapHeader
 	         $d367 = wCurMapTileset
 	         $d368 = wCurMapHeight
@@ -19443,7 +19443,7 @@ WRAM0 bank #0:
 	         $d53b = wBoxItems
 	         $d5a0 = wCurrentBoxNum
 	         $d5a2 = wNumHoFTeams
-	         $d5a3 = wUnusedD5A3
+	         $d5a3 = wUnusedMapVariable
 	         $d5a4 = wPlayerCoins
 	         $d5a6 = wMissableObjectFlags
 	         $d5c6 = wMissableObjectFlagsEnd
@@ -19563,11 +19563,11 @@ WRAM0 bank #0:
 	         $d718 = wBoulderSpriteIndex
 	         $d719 = wLastBlackoutMap
 	         $d71a = wDestinationMap
-	         $d71b = wUnusedD71B
+	         $d71b = wUnusedPlayerDataByte
 	         $d71c = wTileInFrontOfBoulderAndBoulderCollisionResult
 	         $d71d = wDungeonWarpDestinationMap
 	         $d71e = wWhichDungeonWarp
-	         $d71f = wUnusedD71F
+	         $d71f = wUnusedCardKeyGateID
 	         $d728 = wd728
 	         $d72a = wBeatGymFlags
 	         $d72c = wd72c
@@ -19767,7 +19767,6 @@ WRAM0 bank #0:
 	         $da25 = wEnemyMon6Nick
 	         $da30 = wTrainerHeaderPtr
 	         $da38 = wOpponentAfterWrongAnswer
-	         $da38 = wUnusedDA38
 	         $da39 = wCurMapScript
 	         $da41 = wPlayTimeHours
 	         $da42 = wPlayTimeMaxed

diff --git a/pokeblue.sym b/pokeblue.sym
@@ -17491,7 +17491,7 @@
 03:b5ea sBox12
 03:ba4c sBank3AllBoxesChecksum
 03:ba4d sBank3IndividualBoxChecksums
-00:c000 wUnusedC000
+00:c000 wUnusedMusicByte
 00:c001 wSoundID
 00:c002 wMuteAudioAndPauseMusic
 00:c003 wDisableChannelOutputWhenSfxEnds
@@ -18331,12 +18331,12 @@
 00:cd33 wEnemyMonEvasionMod
 00:cd34 wInGameTradeReceiveMonSpecies
 00:cd36 wEnemyMonStatModsEnd
-00:cd37 wUnusedCD37
 00:cd37 wFilteredBagItemsCount
+00:cd37 wUnusedLinkMenuByte
 00:cd37 wNPCMovementDirections2Index
 00:cd38 wSimulatedJoypadStatesIndex
-00:cd39 wUnusedCD39
-00:cd3a wUnusedCD3A
+00:cd39 wUnusedSimulatedJoypadStatesMask
+00:cd3a wUnusedOverrideSimulatedJoypadStatesIndex
 00:cd3b wOverrideSimulatedJoypadStatesMask
 00:cd3d wCoordIndex
 00:cd3d wSwappedMenuItem
@@ -18356,7 +18356,6 @@
 00:cd3d wBoxNumString
 00:cd3d wWhichTownMapLocation
 00:cd3d wRivalStarterTemp
-00:cd3d wUnusedCD3D
 00:cd3d wInwardSpiralUpdateScreenCounter
 00:cd3d wHoFTeamIndex
 00:cd3d wFallingObjectsMovementData
@@ -18368,6 +18367,7 @@
 00:cd3d wPriceTemp
 00:cd3d wHoFMonSpecies
 00:cd3d wWereAnyMonsAsleep
+00:cd3d wUnusedCreditsByte
 00:cd3d wPlayerSpinInPlaceAnimFrameDelay
 00:cd3d wTrainerSpriteOffset
 00:cd3d wMoveDownSmallStarsOAMCount
@@ -18535,7 +18535,7 @@
 00:cf70 wGymLeaderName
 00:cf7b wItemList
 00:cf8b wListPointer
-00:cf8d wUnusedCF8D
+00:cf8d wUnusedNamePointer
 00:cf8f wItemPrices
 00:cf91 wcf91
 00:cf92 wWhichPokemon
@@ -18701,9 +18701,9 @@
 00:d08a wFallingObjectMovementByte
 00:d08a wTradedMonMovingRight
 00:d08a wNumShootingBalls
-00:d08a wUnusedD08A
 00:d08a wOptionsInitialized
 00:d08a wNewSlotMachineBallTile
+00:d08a wUnusedWaterDropletsByte
 00:d08a wSpiralBallsBaseY
 00:d08a wFlashScreenLongCounter
 00:d08b wSubAnimTransform
@@ -18718,8 +18718,8 @@
 00:d096 wSlotMachineAllowMatchesCounter
 00:d096 wSubAnimSubEntryAddr
 00:d09a wOutwardSpiralTileMapPointer
+00:d09b wUnusedMoveAnimByte
 00:d09b wTownMapSpriteBlinkingEnabled
-00:d09b wUnusedD09B
 00:d09b wPartyMenuAnimMonEnabled
 00:d09c wFBDestAddr
 00:d09e wFBMode
@@ -18776,7 +18776,7 @@
 00:d0dc wMoves
 00:d0e0 wMoveNum
 00:d0e1 wMovesString
-00:d119 wUnusedD119
+00:d119 wUnusedCurMapTilesetCopy
 00:d11a wWalkBikeSurfStateCopy
 00:d11b wInitListType
 00:d11c wCapturedMonSpecies
@@ -18827,7 +18827,7 @@
 00:d148 wLinkBattleRandomNumberList
 00:d152 wSerialPlayerDataBlock
 00:d152 wPseudoItemID
-00:d153 wUnusedD153
+00:d153 wUnusedAlreadyOwnedFlag
 00:d156 wEvoStoneItemID
 00:d157 wSavedNPCMovementDirections2Index
 00:d158 wPlayerName
@@ -19030,7 +19030,7 @@
 00:d363 wYBlockCoord
 00:d364 wXBlockCoord
 00:d365 wLastMap
-00:d366 wUnusedD366
+00:d366 wUnusedLastMapWidth
 00:d367 wCurMapHeader
 00:d367 wCurMapTileset
 00:d368 wCurMapHeight
@@ -19107,7 +19107,7 @@
 00:d53b wBoxItems
 00:d5a0 wCurrentBoxNum
 00:d5a2 wNumHoFTeams
-00:d5a3 wUnusedD5A3
+00:d5a3 wUnusedMapVariable
 00:d5a4 wPlayerCoins
 00:d5a6 wMissableObjectFlags
 00:d5c6 wMissableObjectFlagsEnd
@@ -19227,11 +19227,11 @@
 00:d718 wBoulderSpriteIndex
 00:d719 wLastBlackoutMap
 00:d71a wDestinationMap
-00:d71b wUnusedD71B
+00:d71b wUnusedPlayerDataByte
 00:d71c wTileInFrontOfBoulderAndBoulderCollisionResult
 00:d71d wDungeonWarpDestinationMap
 00:d71e wWhichDungeonWarp
-00:d71f wUnusedD71F
+00:d71f wUnusedCardKeyGateID
 00:d728 wd728
 00:d72a wBeatGymFlags
 00:d72c wd72c
@@ -19431,7 +19431,6 @@
 00:da25 wEnemyMon6Nick
 00:da30 wTrainerHeaderPtr
 00:da38 wOpponentAfterWrongAnswer
-00:da38 wUnusedDA38
 00:da39 wCurMapScript
 00:da41 wPlayTimeHours
 00:da42 wPlayTimeMaxed

diff --git a/pokeblue_debug.map b/pokeblue_debug.map
@@ -17830,7 +17830,7 @@ SRAM bank #3:
 
 WRAM0 bank #0:
 	SECTION: $c000-$c0ff ($0100 bytes) ["Audio RAM"]
-	         $c000 = wUnusedC000
+	         $c000 = wUnusedMusicByte
 	         $c001 = wSoundID
 	         $c002 = wMuteAudioAndPauseMusic
 	         $c003 = wDisableChannelOutputWhenSfxEnds
@@ -18675,12 +18675,12 @@ WRAM0 bank #0:
 	         $cd33 = wEnemyMonEvasionMod
 	         $cd34 = wInGameTradeReceiveMonSpecies
 	         $cd36 = wEnemyMonStatModsEnd
-	         $cd37 = wUnusedCD37
 	         $cd37 = wFilteredBagItemsCount
+	         $cd37 = wUnusedLinkMenuByte
 	         $cd37 = wNPCMovementDirections2Index
 	         $cd38 = wSimulatedJoypadStatesIndex
-	         $cd39 = wUnusedCD39
-	         $cd3a = wUnusedCD3A
+	         $cd39 = wUnusedSimulatedJoypadStatesMask
+	         $cd3a = wUnusedOverrideSimulatedJoypadStatesIndex
 	         $cd3b = wOverrideSimulatedJoypadStatesMask
 	         $cd3d = wCoordIndex
 	         $cd3d = wSwappedMenuItem
@@ -18700,7 +18700,6 @@ WRAM0 bank #0:
 	         $cd3d = wBoxNumString
 	         $cd3d = wWhichTownMapLocation
 	         $cd3d = wRivalStarterTemp
-	         $cd3d = wUnusedCD3D
 	         $cd3d = wInwardSpiralUpdateScreenCounter
 	         $cd3d = wHoFTeamIndex
 	         $cd3d = wFallingObjectsMovementData
@@ -18712,6 +18711,7 @@ WRAM0 bank #0:
 	         $cd3d = wPriceTemp
 	         $cd3d = wHoFMonSpecies
 	         $cd3d = wWereAnyMonsAsleep
+	         $cd3d = wUnusedCreditsByte
 	         $cd3d = wPlayerSpinInPlaceAnimFrameDelay
 	         $cd3d = wTrainerSpriteOffset
 	         $cd3d = wMoveDownSmallStarsOAMCount
@@ -18879,7 +18879,7 @@ WRAM0 bank #0:
 	         $cf70 = wGymLeaderName
 	         $cf7b = wItemList
 	         $cf8b = wListPointer
-	         $cf8d = wUnusedCF8D
+	         $cf8d = wUnusedNamePointer
 	         $cf8f = wItemPrices
 	         $cf91 = wcf91
 	         $cf92 = wWhichPokemon
@@ -19045,9 +19045,9 @@ WRAM0 bank #0:
 	         $d08a = wFallingObjectMovementByte
 	         $d08a = wTradedMonMovingRight
 	         $d08a = wNumShootingBalls
-	         $d08a = wUnusedD08A
 	         $d08a = wOptionsInitialized
 	         $d08a = wNewSlotMachineBallTile
+	         $d08a = wUnusedWaterDropletsByte
 	         $d08a = wSpiralBallsBaseY
 	         $d08a = wFlashScreenLongCounter
 	         $d08b = wSubAnimTransform
@@ -19062,8 +19062,8 @@ WRAM0 bank #0:
 	         $d096 = wSlotMachineAllowMatchesCounter
 	         $d096 = wSubAnimSubEntryAddr
 	         $d09a = wOutwardSpiralTileMapPointer
+	         $d09b = wUnusedMoveAnimByte
 	         $d09b = wTownMapSpriteBlinkingEnabled
-	         $d09b = wUnusedD09B
 	         $d09b = wPartyMenuAnimMonEnabled
 	         $d09c = wFBDestAddr
 	         $d09e = wFBMode
@@ -19120,7 +19120,7 @@ WRAM0 bank #0:
 	         $d0dc = wMoves
 	         $d0e0 = wMoveNum
 	         $d0e1 = wMovesString
-	         $d119 = wUnusedD119
+	         $d119 = wUnusedCurMapTilesetCopy
 	         $d11a = wWalkBikeSurfStateCopy
 	         $d11b = wInitListType
 	         $d11c = wCapturedMonSpecies
@@ -19171,7 +19171,7 @@ WRAM0 bank #0:
 	         $d148 = wLinkBattleRandomNumberList
 	         $d152 = wSerialPlayerDataBlock
 	         $d152 = wPseudoItemID
-	         $d153 = wUnusedD153
+	         $d153 = wUnusedAlreadyOwnedFlag
 	         $d156 = wEvoStoneItemID
 	         $d157 = wSavedNPCMovementDirections2Index
 	         $d158 = wPlayerName
@@ -19376,7 +19376,7 @@ WRAM0 bank #0:
 	         $d363 = wYBlockCoord
 	         $d364 = wXBlockCoord
 	         $d365 = wLastMap
-	         $d366 = wUnusedD366
+	         $d366 = wUnusedLastMapWidth
 	         $d367 = wCurMapHeader
 	         $d367 = wCurMapTileset
 	         $d368 = wCurMapHeight
@@ -19453,7 +19453,7 @@ WRAM0 bank #0:
 	         $d53b = wBoxItems
 	         $d5a0 = wCurrentBoxNum
 	         $d5a2 = wNumHoFTeams
-	         $d5a3 = wUnusedD5A3
+	         $d5a3 = wUnusedMapVariable
 	         $d5a4 = wPlayerCoins
 	         $d5a6 = wMissableObjectFlags
 	         $d5c6 = wMissableObjectFlagsEnd
@@ -19573,11 +19573,11 @@ WRAM0 bank #0:
 	         $d718 = wBoulderSpriteIndex
 	         $d719 = wLastBlackoutMap
 	         $d71a = wDestinationMap
-	         $d71b = wUnusedD71B
+	         $d71b = wUnusedPlayerDataByte
 	         $d71c = wTileInFrontOfBoulderAndBoulderCollisionResult
 	         $d71d = wDungeonWarpDestinationMap
 	         $d71e = wWhichDungeonWarp
-	         $d71f = wUnusedD71F
+	         $d71f = wUnusedCardKeyGateID
 	         $d728 = wd728
 	         $d72a = wBeatGymFlags
 	         $d72c = wd72c
@@ -19777,7 +19777,6 @@ WRAM0 bank #0:
 	         $da25 = wEnemyMon6Nick
 	         $da30 = wTrainerHeaderPtr
 	         $da38 = wOpponentAfterWrongAnswer
-	         $da38 = wUnusedDA38
 	         $da39 = wCurMapScript
 	         $da41 = wPlayTimeHours
 	         $da42 = wPlayTimeMaxed