diff --git a/pokeblue.map b/pokeblue.map index 42428d3d1..beb27fb00 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -17983,9 +17983,9 @@ WRAM0 bank #0: $c17a = wSprite07StateData1YAdjusted $c17b = wSprite07StateData1XAdjusted $c17c = wSprite07StateData1CollisionData - $c180 = wSprite07StateData1End - $c180 = wSprite08StateData1 $c180 = wSprite08StateData1PictureID + $c180 = wSprite08StateData1 + $c180 = wSprite07StateData1End $c181 = wSprite08StateData1MovementStatus $c182 = wSprite08StateData1ImageIndex $c183 = wSprite08StateData1YStepVector @@ -17999,8 +17999,8 @@ WRAM0 bank #0: $c18b = wSprite08StateData1XAdjusted $c18c = wSprite08StateData1CollisionData $c190 = wSprite09StateData1PictureID - $c190 = wSprite08StateData1End $c190 = wSprite09StateData1 + $c190 = wSprite08StateData1End $c191 = wSprite09StateData1MovementStatus $c192 = wSprite09StateData1ImageIndex $c193 = wSprite09StateData1YStepVector @@ -18013,9 +18013,9 @@ WRAM0 bank #0: $c19a = wSprite09StateData1YAdjusted $c19b = wSprite09StateData1XAdjusted $c19c = wSprite09StateData1CollisionData - $c1a0 = wSprite09StateData1End - $c1a0 = wSprite10StateData1 $c1a0 = wSprite10StateData1PictureID + $c1a0 = wSprite10StateData1 + $c1a0 = wSprite09StateData1End $c1a1 = wSprite10StateData1MovementStatus $c1a2 = wSprite10StateData1ImageIndex $c1a3 = wSprite10StateData1YStepVector @@ -18300,8 +18300,8 @@ WRAM0 bank #0: $c2ed = wSprite14StateData2PictureID $c2ee = wSprite14StateData2ImageBaseOffset $c2f0 = wSprite14StateData2End - $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f0 = wSprite15StateData2 + $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f2 = wSprite15StateData2YDisplacement $c2f3 = wSprite15StateData2XDisplacement $c2f4 = wSprite15StateData2MapY @@ -18886,7 +18886,6 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay - $cd3d = wHiddenObjectFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18907,6 +18906,7 @@ WRAM0 bank #0: $cd3d = wUnusedCreditsByte $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel + $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18918,7 +18918,6 @@ WRAM0 bank #0: $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset $cd3e = wNumCreditsMonsDisplayed - $cd3e = wTrainerInfoTextBoxWidth $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta @@ -18934,19 +18933,20 @@ WRAM0 bank #0: $cd3e = wTradedEnemyMonSpecies $cd3e = wRivalStarterBallSpriteIndex $cd3e = wBadgeNameTile + $cd3e = wTrainerInfoTextBoxWidth $cd3e = wHoFPartyMonIndex $cd3e = wOptionsBattleAnimCursorX $cd3f = wJigglypuffFacingDirections $cd3f = wBadgeOrFaceTiles - $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wNameOfPlayerMonToBeTraded - $cd3f = wDayCareTotalCost $cd3f = wHoFMonLevel + $cd3f = wDayCareTotalCost + $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wTrainerFacingDirection $cd3f = wHiddenObjectIndex $cd3f = wOptionsBattleStyleCursorX @@ -19026,10 +19026,10 @@ WRAM0 bank #0: $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP - $cee9 = wChangeMonPicEnemyTurnSpecies $cee9 = wBuffer $cee9 = wNamingScreenNameLength $cee9 = wEvoOldSpecies + $cee9 = wChangeMonPicEnemyTurnSpecies $ceea = wChangeMonPicPlayerTurnSpecies $ceea = wEvoNewSpecies $ceea = wNamingScreenSubmitName @@ -19357,8 +19357,8 @@ WRAM0 bank #0: $d12a = wListCount $d12b = wLinkState $d12c = wTwoOptionMenuID - $d12d = wOutOfBattleBlackout $d12d = wChosenMenuItem + $d12d = wOutOfBattleBlackout $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy @@ -20600,8 +20600,8 @@ HRAM bank #0: $ffdc = hOaksAideRewardItem $ffdc = hGymGateAnswer $ffdc = hItemToRemoveIndex - $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned + $ffdd = hPlayerXCoord $ffe0 = hBackupGymGateIndex $ffe0 = hUnlockedSilphCoDoors $ffe1 = hStartTileID diff --git a/pokeblue_debug.map b/pokeblue_debug.map index cbb5713a9..accbf8967 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -17993,9 +17993,9 @@ WRAM0 bank #0: $c17a = wSprite07StateData1YAdjusted $c17b = wSprite07StateData1XAdjusted $c17c = wSprite07StateData1CollisionData - $c180 = wSprite07StateData1End - $c180 = wSprite08StateData1 $c180 = wSprite08StateData1PictureID + $c180 = wSprite08StateData1 + $c180 = wSprite07StateData1End $c181 = wSprite08StateData1MovementStatus $c182 = wSprite08StateData1ImageIndex $c183 = wSprite08StateData1YStepVector @@ -18009,8 +18009,8 @@ WRAM0 bank #0: $c18b = wSprite08StateData1XAdjusted $c18c = wSprite08StateData1CollisionData $c190 = wSprite09StateData1PictureID - $c190 = wSprite08StateData1End $c190 = wSprite09StateData1 + $c190 = wSprite08StateData1End $c191 = wSprite09StateData1MovementStatus $c192 = wSprite09StateData1ImageIndex $c193 = wSprite09StateData1YStepVector @@ -18023,9 +18023,9 @@ WRAM0 bank #0: $c19a = wSprite09StateData1YAdjusted $c19b = wSprite09StateData1XAdjusted $c19c = wSprite09StateData1CollisionData - $c1a0 = wSprite09StateData1End - $c1a0 = wSprite10StateData1 $c1a0 = wSprite10StateData1PictureID + $c1a0 = wSprite10StateData1 + $c1a0 = wSprite09StateData1End $c1a1 = wSprite10StateData1MovementStatus $c1a2 = wSprite10StateData1ImageIndex $c1a3 = wSprite10StateData1YStepVector @@ -18310,8 +18310,8 @@ WRAM0 bank #0: $c2ed = wSprite14StateData2PictureID $c2ee = wSprite14StateData2ImageBaseOffset $c2f0 = wSprite14StateData2End - $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f0 = wSprite15StateData2 + $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f2 = wSprite15StateData2YDisplacement $c2f3 = wSprite15StateData2XDisplacement $c2f4 = wSprite15StateData2MapY @@ -18896,7 +18896,6 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay - $cd3d = wHiddenObjectFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18917,6 +18916,7 @@ WRAM0 bank #0: $cd3d = wUnusedCreditsByte $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel + $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18928,7 +18928,6 @@ WRAM0 bank #0: $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset $cd3e = wNumCreditsMonsDisplayed - $cd3e = wTrainerInfoTextBoxWidth $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta @@ -18944,19 +18943,20 @@ WRAM0 bank #0: $cd3e = wTradedEnemyMonSpecies $cd3e = wRivalStarterBallSpriteIndex $cd3e = wBadgeNameTile + $cd3e = wTrainerInfoTextBoxWidth $cd3e = wHoFPartyMonIndex $cd3e = wOptionsBattleAnimCursorX $cd3f = wJigglypuffFacingDirections $cd3f = wBadgeOrFaceTiles - $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wNameOfPlayerMonToBeTraded - $cd3f = wDayCareTotalCost $cd3f = wHoFMonLevel + $cd3f = wDayCareTotalCost + $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wTrainerFacingDirection $cd3f = wHiddenObjectIndex $cd3f = wOptionsBattleStyleCursorX @@ -19036,10 +19036,10 @@ WRAM0 bank #0: $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP - $cee9 = wChangeMonPicEnemyTurnSpecies $cee9 = wBuffer $cee9 = wNamingScreenNameLength $cee9 = wEvoOldSpecies + $cee9 = wChangeMonPicEnemyTurnSpecies $ceea = wChangeMonPicPlayerTurnSpecies $ceea = wEvoNewSpecies $ceea = wNamingScreenSubmitName @@ -19367,8 +19367,8 @@ WRAM0 bank #0: $d12a = wListCount $d12b = wLinkState $d12c = wTwoOptionMenuID - $d12d = wOutOfBattleBlackout $d12d = wChosenMenuItem + $d12d = wOutOfBattleBlackout $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy @@ -20610,8 +20610,8 @@ HRAM bank #0: $ffdc = hOaksAideRewardItem $ffdc = hGymGateAnswer $ffdc = hItemToRemoveIndex - $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned + $ffdd = hPlayerXCoord $ffe0 = hBackupGymGateIndex $ffe0 = hUnlockedSilphCoDoors $ffe1 = hStartTileID diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 2d51b2e5f..c9c2e97ff 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -18020,8 +18020,8 @@ WRAM0 bank #0: $c16a = wSprite06StateData1YAdjusted $c16b = wSprite06StateData1XAdjusted $c16c = wSprite06StateData1CollisionData - $c170 = wSprite06StateData1End $c170 = wSprite07StateData1PictureID + $c170 = wSprite06StateData1End $c170 = wSprite07StateData1 $c171 = wSprite07StateData1MovementStatus $c172 = wSprite07StateData1ImageIndex @@ -18035,9 +18035,9 @@ WRAM0 bank #0: $c17a = wSprite07StateData1YAdjusted $c17b = wSprite07StateData1XAdjusted $c17c = wSprite07StateData1CollisionData - $c180 = wSprite07StateData1End - $c180 = wSprite08StateData1 $c180 = wSprite08StateData1PictureID + $c180 = wSprite08StateData1 + $c180 = wSprite07StateData1End $c181 = wSprite08StateData1MovementStatus $c182 = wSprite08StateData1ImageIndex $c183 = wSprite08StateData1YStepVector @@ -18051,8 +18051,8 @@ WRAM0 bank #0: $c18b = wSprite08StateData1XAdjusted $c18c = wSprite08StateData1CollisionData $c190 = wSprite09StateData1PictureID - $c190 = wSprite08StateData1End $c190 = wSprite09StateData1 + $c190 = wSprite08StateData1End $c191 = wSprite09StateData1MovementStatus $c192 = wSprite09StateData1ImageIndex $c193 = wSprite09StateData1YStepVector @@ -18065,9 +18065,9 @@ WRAM0 bank #0: $c19a = wSprite09StateData1YAdjusted $c19b = wSprite09StateData1XAdjusted $c19c = wSprite09StateData1CollisionData - $c1a0 = wSprite09StateData1End - $c1a0 = wSprite10StateData1 $c1a0 = wSprite10StateData1PictureID + $c1a0 = wSprite10StateData1 + $c1a0 = wSprite09StateData1End $c1a1 = wSprite10StateData1MovementStatus $c1a2 = wSprite10StateData1ImageIndex $c1a3 = wSprite10StateData1YStepVector @@ -18352,8 +18352,8 @@ WRAM0 bank #0: $c2ed = wSprite14StateData2PictureID $c2ee = wSprite14StateData2ImageBaseOffset $c2f0 = wSprite14StateData2End - $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f0 = wSprite15StateData2 + $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f2 = wSprite15StateData2YDisplacement $c2f3 = wSprite15StateData2XDisplacement $c2f4 = wSprite15StateData2MapY @@ -18938,7 +18938,6 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay - $cd3d = wHiddenObjectFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18959,6 +18958,7 @@ WRAM0 bank #0: $cd3d = wUnusedCreditsByte $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel + $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18970,7 +18970,6 @@ WRAM0 bank #0: $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset $cd3e = wNumCreditsMonsDisplayed - $cd3e = wTrainerInfoTextBoxWidth $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta @@ -18986,19 +18985,20 @@ WRAM0 bank #0: $cd3e = wTradedEnemyMonSpecies $cd3e = wRivalStarterBallSpriteIndex $cd3e = wBadgeNameTile + $cd3e = wTrainerInfoTextBoxWidth $cd3e = wHoFPartyMonIndex $cd3e = wOptionsBattleAnimCursorX $cd3f = wJigglypuffFacingDirections $cd3f = wBadgeOrFaceTiles - $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wNameOfPlayerMonToBeTraded - $cd3f = wDayCareTotalCost $cd3f = wHoFMonLevel + $cd3f = wDayCareTotalCost + $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wTrainerFacingDirection $cd3f = wHiddenObjectIndex $cd3f = wOptionsBattleStyleCursorX @@ -19078,16 +19078,16 @@ WRAM0 bank #0: $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP - $cee9 = wChangeMonPicEnemyTurnSpecies $cee9 = wBuffer $cee9 = wNamingScreenNameLength $cee9 = wEvoOldSpecies + $cee9 = wChangeMonPicEnemyTurnSpecies $ceea = wChangeMonPicPlayerTurnSpecies $ceea = wEvoNewSpecies $ceea = wNamingScreenSubmitName $ceeb = wAlphabetCase - $ceeb = wHPBarOldHP $ceeb = wEvoMonTileOffset + $ceeb = wHPBarOldHP $ceec = wEvoCancelled $ceed = wHPBarNewHP $ceed = wNamingScreenLetter @@ -19409,8 +19409,8 @@ WRAM0 bank #0: $d12a = wListCount $d12b = wLinkState $d12c = wTwoOptionMenuID - $d12d = wOutOfBattleBlackout $d12d = wChosenMenuItem + $d12d = wOutOfBattleBlackout $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy diff --git a/pokered.map b/pokered.map index 25cfea650..239eed72d 100644 --- a/pokered.map +++ b/pokered.map @@ -17983,9 +17983,9 @@ WRAM0 bank #0: $c17a = wSprite07StateData1YAdjusted $c17b = wSprite07StateData1XAdjusted $c17c = wSprite07StateData1CollisionData - $c180 = wSprite07StateData1End - $c180 = wSprite08StateData1 $c180 = wSprite08StateData1PictureID + $c180 = wSprite08StateData1 + $c180 = wSprite07StateData1End $c181 = wSprite08StateData1MovementStatus $c182 = wSprite08StateData1ImageIndex $c183 = wSprite08StateData1YStepVector @@ -17999,8 +17999,8 @@ WRAM0 bank #0: $c18b = wSprite08StateData1XAdjusted $c18c = wSprite08StateData1CollisionData $c190 = wSprite09StateData1PictureID - $c190 = wSprite08StateData1End $c190 = wSprite09StateData1 + $c190 = wSprite08StateData1End $c191 = wSprite09StateData1MovementStatus $c192 = wSprite09StateData1ImageIndex $c193 = wSprite09StateData1YStepVector @@ -18013,9 +18013,9 @@ WRAM0 bank #0: $c19a = wSprite09StateData1YAdjusted $c19b = wSprite09StateData1XAdjusted $c19c = wSprite09StateData1CollisionData - $c1a0 = wSprite09StateData1End - $c1a0 = wSprite10StateData1 $c1a0 = wSprite10StateData1PictureID + $c1a0 = wSprite10StateData1 + $c1a0 = wSprite09StateData1End $c1a1 = wSprite10StateData1MovementStatus $c1a2 = wSprite10StateData1ImageIndex $c1a3 = wSprite10StateData1YStepVector @@ -18300,8 +18300,8 @@ WRAM0 bank #0: $c2ed = wSprite14StateData2PictureID $c2ee = wSprite14StateData2ImageBaseOffset $c2f0 = wSprite14StateData2End - $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f0 = wSprite15StateData2 + $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f2 = wSprite15StateData2YDisplacement $c2f3 = wSprite15StateData2XDisplacement $c2f4 = wSprite15StateData2MapY @@ -18886,7 +18886,6 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay - $cd3d = wHiddenObjectFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18907,6 +18906,7 @@ WRAM0 bank #0: $cd3d = wUnusedCreditsByte $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel + $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18918,7 +18918,6 @@ WRAM0 bank #0: $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset $cd3e = wNumCreditsMonsDisplayed - $cd3e = wTrainerInfoTextBoxWidth $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta @@ -18934,19 +18933,20 @@ WRAM0 bank #0: $cd3e = wTradedEnemyMonSpecies $cd3e = wRivalStarterBallSpriteIndex $cd3e = wBadgeNameTile + $cd3e = wTrainerInfoTextBoxWidth $cd3e = wHoFPartyMonIndex $cd3e = wOptionsBattleAnimCursorX $cd3f = wJigglypuffFacingDirections $cd3f = wBadgeOrFaceTiles - $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wNameOfPlayerMonToBeTraded - $cd3f = wDayCareTotalCost $cd3f = wHoFMonLevel + $cd3f = wDayCareTotalCost + $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wTrainerFacingDirection $cd3f = wHiddenObjectIndex $cd3f = wOptionsBattleStyleCursorX @@ -19026,10 +19026,10 @@ WRAM0 bank #0: $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP - $cee9 = wChangeMonPicEnemyTurnSpecies $cee9 = wBuffer $cee9 = wNamingScreenNameLength $cee9 = wEvoOldSpecies + $cee9 = wChangeMonPicEnemyTurnSpecies $ceea = wChangeMonPicPlayerTurnSpecies $ceea = wEvoNewSpecies $ceea = wNamingScreenSubmitName @@ -19357,8 +19357,8 @@ WRAM0 bank #0: $d12a = wListCount $d12b = wLinkState $d12c = wTwoOptionMenuID - $d12d = wOutOfBattleBlackout $d12d = wChosenMenuItem + $d12d = wOutOfBattleBlackout $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy @@ -20600,8 +20600,8 @@ HRAM bank #0: $ffdc = hOaksAideRewardItem $ffdc = hGymGateAnswer $ffdc = hItemToRemoveIndex - $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned + $ffdd = hPlayerXCoord $ffe0 = hBackupGymGateIndex $ffe0 = hUnlockedSilphCoDoors $ffe1 = hStartTileID diff --git a/pokered_vc.map b/pokered_vc.map index fbdaaa2ea..b4d989b1f 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -18023,8 +18023,8 @@ WRAM0 bank #0: $c16a = wSprite06StateData1YAdjusted $c16b = wSprite06StateData1XAdjusted $c16c = wSprite06StateData1CollisionData - $c170 = wSprite06StateData1End $c170 = wSprite07StateData1PictureID + $c170 = wSprite06StateData1End $c170 = wSprite07StateData1 $c171 = wSprite07StateData1MovementStatus $c172 = wSprite07StateData1ImageIndex @@ -18038,9 +18038,9 @@ WRAM0 bank #0: $c17a = wSprite07StateData1YAdjusted $c17b = wSprite07StateData1XAdjusted $c17c = wSprite07StateData1CollisionData - $c180 = wSprite07StateData1End - $c180 = wSprite08StateData1 $c180 = wSprite08StateData1PictureID + $c180 = wSprite08StateData1 + $c180 = wSprite07StateData1End $c181 = wSprite08StateData1MovementStatus $c182 = wSprite08StateData1ImageIndex $c183 = wSprite08StateData1YStepVector @@ -18054,8 +18054,8 @@ WRAM0 bank #0: $c18b = wSprite08StateData1XAdjusted $c18c = wSprite08StateData1CollisionData $c190 = wSprite09StateData1PictureID - $c190 = wSprite08StateData1End $c190 = wSprite09StateData1 + $c190 = wSprite08StateData1End $c191 = wSprite09StateData1MovementStatus $c192 = wSprite09StateData1ImageIndex $c193 = wSprite09StateData1YStepVector @@ -18068,9 +18068,9 @@ WRAM0 bank #0: $c19a = wSprite09StateData1YAdjusted $c19b = wSprite09StateData1XAdjusted $c19c = wSprite09StateData1CollisionData - $c1a0 = wSprite09StateData1End - $c1a0 = wSprite10StateData1 $c1a0 = wSprite10StateData1PictureID + $c1a0 = wSprite10StateData1 + $c1a0 = wSprite09StateData1End $c1a1 = wSprite10StateData1MovementStatus $c1a2 = wSprite10StateData1ImageIndex $c1a3 = wSprite10StateData1YStepVector @@ -18355,8 +18355,8 @@ WRAM0 bank #0: $c2ed = wSprite14StateData2PictureID $c2ee = wSprite14StateData2ImageBaseOffset $c2f0 = wSprite14StateData2End - $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f0 = wSprite15StateData2 + $c2f0 = wSprite15StateData2WalkAnimationCounter $c2f2 = wSprite15StateData2YDisplacement $c2f3 = wSprite15StateData2XDisplacement $c2f4 = wSprite15StateData2MapY @@ -18941,7 +18941,6 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay - $cd3d = wHiddenObjectFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18962,6 +18961,7 @@ WRAM0 bank #0: $cd3d = wUnusedCreditsByte $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel + $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18973,7 +18973,6 @@ WRAM0 bank #0: $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset $cd3e = wNumCreditsMonsDisplayed - $cd3e = wTrainerInfoTextBoxWidth $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta @@ -18989,19 +18988,20 @@ WRAM0 bank #0: $cd3e = wTradedEnemyMonSpecies $cd3e = wRivalStarterBallSpriteIndex $cd3e = wBadgeNameTile + $cd3e = wTrainerInfoTextBoxWidth $cd3e = wHoFPartyMonIndex $cd3e = wOptionsBattleAnimCursorX $cd3f = wJigglypuffFacingDirections $cd3f = wBadgeOrFaceTiles - $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wNameOfPlayerMonToBeTraded - $cd3f = wDayCareTotalCost $cd3f = wHoFMonLevel + $cd3f = wDayCareTotalCost + $cd3f = wTrainerInfoTextBoxNextRowOffset $cd3f = wTrainerFacingDirection $cd3f = wHiddenObjectIndex $cd3f = wOptionsBattleStyleCursorX @@ -19081,16 +19081,16 @@ WRAM0 bank #0: $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP - $cee9 = wChangeMonPicEnemyTurnSpecies $cee9 = wBuffer $cee9 = wNamingScreenNameLength $cee9 = wEvoOldSpecies + $cee9 = wChangeMonPicEnemyTurnSpecies $ceea = wChangeMonPicPlayerTurnSpecies $ceea = wEvoNewSpecies $ceea = wNamingScreenSubmitName $ceeb = wAlphabetCase - $ceeb = wHPBarOldHP $ceeb = wEvoMonTileOffset + $ceeb = wHPBarOldHP $ceec = wEvoCancelled $ceed = wHPBarNewHP $ceed = wNamingScreenLetter @@ -19412,8 +19412,8 @@ WRAM0 bank #0: $d12a = wListCount $d12b = wLinkState $d12c = wTwoOptionMenuID - $d12d = wOutOfBattleBlackout $d12d = wChosenMenuItem + $d12d = wOutOfBattleBlackout $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy