From fc23e72a39eb9cb9ca0651ea805abb6f47ee458c Mon Sep 17 00:00:00 2001 From: Sylvie <35663410+Rangi42@users.noreply.github.com> Date: Sat, 15 Jun 2024 12:18:00 -0400 Subject: Identify some unused WRAM variables (#453) --- engine/battle/animations.asm | 6 +++--- engine/battle/misc.asm | 4 ++-- engine/items/item_effects.asm | 6 +++--- engine/link/cable_club.asm | 4 ++-- engine/menus/main_menu.asm | 2 +- engine/menus/pokedex.asm | 2 +- engine/movie/credits.asm | 2 +- engine/movie/oak_speech/init_player_data.asm | 2 +- engine/overworld/auto_movement.asm | 4 ++-- engine/overworld/clear_variables.asm | 2 +- engine/overworld/movement.asm | 2 +- engine/pokemon/add_mon.asm | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) (limited to 'engine') diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 712958bc..41d6a2ef 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -439,7 +439,7 @@ MoveAnimation: call WaitForSoundToFinish xor a ld [wSubAnimSubEntryAddr], a - ld [wUnusedD09B], a + ld [wUnusedMoveAnimByte], a ld [wSubAnimTransform], a dec a ; NO_MOVE - 1 ld [wAnimSoundID], a @@ -1125,12 +1125,12 @@ AnimationWaterDropletsEverywhere: ld a, 16 ld [wBaseCoordY], a ld a, 0 - ld [wUnusedD08A], a + ld [wUnusedWaterDropletsByte], a call _AnimationWaterDroplets ld a, 24 ld [wBaseCoordY], a ld a, 32 - ld [wUnusedD08A], a + ld [wUnusedWaterDropletsByte], a call _AnimationWaterDroplets dec d jr nz, .loop diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 524ec161..4feef343 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -92,9 +92,9 @@ InitList: ld a, h ld [wListPointer + 1], a ld a, e - ld [wUnusedCF8D], a + ld [wUnusedNamePointer], a ld a, d - ld [wUnusedCF8D + 1], a + ld [wUnusedNamePointer + 1], a ld bc, ItemPrices ld a, c ld [wItemPrices], a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index d312059a..8d21b964 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -740,7 +740,7 @@ ItemUseSurfboard: ld a, b ld [wSimulatedJoypadStatesEnd], a xor a - ld [wUnusedCD39], a + ld [wUnusedSimulatedJoypadStatesMask], a inc a ld [wSimulatedJoypadStatesIndex], a ret @@ -1553,7 +1553,7 @@ ItemUseXAccuracy: ; The Card Key is handled in a different way. ItemUseCardKey: xor a - ld [wUnusedD71F], a + ld [wUnusedCardKeyGateID], a call GetTileAndCoordsInFrontOfPlayer ld a, [GetTileAndCoordsInFrontOfPlayer] cp $18 @@ -1585,7 +1585,7 @@ ItemUseCardKey: cp e jr nz, .nextEntry3 ld a, [hl] - ld [wUnusedD71F], a + ld [wUnusedCardKeyGateID], a jr .done .nextEntry1 inc hl diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index 7e856093..f10e1ada 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -259,9 +259,9 @@ CableClub_DoBattleOrTradeAgain: dec c jr nz, .unpatchEnemyMonsLoop ld a, LOW(wEnemyMonOT) - ld [wUnusedCF8D], a + ld [wUnusedNamePointer], a ld a, HIGH(wEnemyMonOT) - ld [wUnusedCF8D + 1], a + ld [wUnusedNamePointer + 1], a xor a ld [wTradeCenterPointerTableIndex], a ld a, SFX_STOP_ALL_MUSIC diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 69b3b918..e638b169 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -150,7 +150,7 @@ LinkMenu: ld de, CableClubOptionsText call PlaceString xor a - ld [wUnusedCD37], a + ld [wUnusedLinkMenuByte], a ld [wd72d], a ld hl, wTopMenuItemY ld a, $7 diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 96bae343..df5d643e 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -36,7 +36,7 @@ ShowPokedexMenu: ld [wCurrentMenuItem], a ld [wLastMenuItem], a ldh [hJoy7], a - ld [wUnusedCD3A], a + ld [wUnusedOverrideSimulatedJoypadStatesIndex], a ld [wOverrideSimulatedJoypadStatesMask], a pop af ld [wListScrollOffset], a diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 5f258503..cb7e37c0 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -29,7 +29,7 @@ HallOfFamePC: ld c, 128 call DelayFrames xor a - ld [wUnusedCD3D], a ; not read + ld [wUnusedCreditsByte], a ; not read ld [wNumCreditsMonsDisplayed], a jp Credits diff --git a/engine/movie/oak_speech/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm index 44869d44..492e8068 100644 --- a/engine/movie/oak_speech/init_player_data.asm +++ b/engine/movie/oak_speech/init_player_data.asm @@ -10,7 +10,7 @@ InitPlayerData2: ld [wPlayerID + 1], a ld a, $ff - ld [wUnusedD71B], a + ld [wUnusedPlayerDataByte], a ld hl, wPartyCount call InitializeEmptyList diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 53b70c19..53898371 100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm @@ -17,7 +17,7 @@ PlayerStepOutFromDoor:: ret .notStandingOnDoor xor a - ld [wUnusedCD3A], a + ld [wUnusedOverrideSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ld hl, wd736 @@ -39,7 +39,7 @@ _EndNPCMovementScript:: ld [wNPCMovementScriptSpriteOffset], a ld [wNPCMovementScriptPointerTableNum], a ld [wNPCMovementScriptFunctionNum], a - ld [wUnusedCD3A], a + ld [wUnusedOverrideSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ret diff --git a/engine/overworld/clear_variables.asm b/engine/overworld/clear_variables.asm index bbb7c986..6bd44963 100644 --- a/engine/overworld/clear_variables.asm +++ b/engine/overworld/clear_variables.asm @@ -10,7 +10,7 @@ ClearVariablesOnEnterMap:: ldh [hJoyReleased], a ldh [hJoyHeld], a ld [wActionResultOrTookBattleTurn], a - ld [wUnusedD5A3], a + ld [wUnusedMapVariable], a ld hl, wCardKeyDoorY ld [hli], a ld [hl], a diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index fd26f9cb..afcb5907 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -179,7 +179,7 @@ UpdateNPCSprite: res 0, [hl] xor a ld [wSimulatedJoypadStatesIndex], a - ld [wUnusedCD3A], a + ld [wUnusedOverrideSimulatedJoypadStatesIndex], a ret .next cp WALK diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index 611aebf4..6fb074ac 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -92,7 +92,7 @@ _AddPartyMon:: ld hl, wPokedexOwned call FlagAction ld a, c ; whether the mon was already flagged as owned - ld [wUnusedD153], a ; not read + ld [wUnusedAlreadyOwnedFlag], a ld a, [wd11e] dec a ld c, a -- cgit v1.3.1-sl0p