diff --git a/pokeblue.map b/pokeblue.map index cdad1f924..5db15050c 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -18071,9 +18071,9 @@ WRAM0 bank #0: $c1da = wSprite13StateData1YAdjusted $c1db = wSprite13StateData1XAdjusted $c1dc = wSprite13StateData1CollisionData - $c1e0 = wSprite13StateData1End - $c1e0 = wSprite14StateData1 $c1e0 = wSprite14StateData1PictureID + $c1e0 = wSprite14StateData1 + $c1e0 = wSprite13StateData1End $c1e1 = wSprite14StateData1MovementStatus $c1e2 = wSprite14StateData1ImageIndex $c1e3 = wSprite14StateData1YStepVector @@ -18755,8 +18755,8 @@ WRAM0 bank #0: $cc3e = wSerialExchangeNybbleReceiveData $cc42 = wSerialExchangeNybbleSendData $cc42 = wLinkMenuSelectionSendBuffer - $cc47 = wUnknownSerialCounter $cc47 = wLinkTimeoutCounter + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation @@ -18901,17 +18901,17 @@ WRAM0 bank #0: $cd3d = wPriceTemp $cd3d = wTitleMonSpecies $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY + $cd3d = wTempSCX $cd3d = wMoveDownSmallStarsOAMCount + $cd3d = wStoppingWhichSlotMachineWheel $cd3d = wUnusedCreditsByte $cd3d = wFieldMoves $cd3d = wHoFTeamIndex - $cd3d = wTempSCX $cd3d = wCoordIndex $cd3d = wDayCareStartLevel $cd3d = wBoxMonCounts $cd3d = wSavedY $cd3d = wPlayerCharacterOAMTile - $cd3d = wStoppingWhichSlotMachineWheel $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset diff --git a/pokeblue_debug.map b/pokeblue_debug.map index a9cc1cc85..001c4f705 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -18081,9 +18081,9 @@ WRAM0 bank #0: $c1da = wSprite13StateData1YAdjusted $c1db = wSprite13StateData1XAdjusted $c1dc = wSprite13StateData1CollisionData - $c1e0 = wSprite13StateData1End - $c1e0 = wSprite14StateData1 $c1e0 = wSprite14StateData1PictureID + $c1e0 = wSprite14StateData1 + $c1e0 = wSprite13StateData1End $c1e1 = wSprite14StateData1MovementStatus $c1e2 = wSprite14StateData1ImageIndex $c1e3 = wSprite14StateData1YStepVector @@ -18765,8 +18765,8 @@ WRAM0 bank #0: $cc3e = wSerialExchangeNybbleReceiveData $cc42 = wSerialExchangeNybbleSendData $cc42 = wLinkMenuSelectionSendBuffer - $cc47 = wUnknownSerialCounter $cc47 = wLinkTimeoutCounter + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation @@ -18911,17 +18911,17 @@ WRAM0 bank #0: $cd3d = wPriceTemp $cd3d = wTitleMonSpecies $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY + $cd3d = wTempSCX $cd3d = wMoveDownSmallStarsOAMCount + $cd3d = wStoppingWhichSlotMachineWheel $cd3d = wUnusedCreditsByte $cd3d = wFieldMoves $cd3d = wCoordIndex $cd3d = wHoFTeamIndex - $cd3d = wTempSCX $cd3d = wDayCareStartLevel $cd3d = wBoxMonCounts $cd3d = wSavedY $cd3d = wPlayerCharacterOAMTile - $cd3d = wStoppingWhichSlotMachineWheel $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 99ecce3c3..f42ca9577 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -18807,8 +18807,8 @@ WRAM0 bank #0: $cc3e = wSerialExchangeNybbleReceiveData $cc42 = wSerialExchangeNybbleSendData $cc42 = wLinkMenuSelectionSendBuffer - $cc47 = wUnknownSerialCounter $cc47 = wLinkTimeoutCounter + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation @@ -18954,9 +18954,9 @@ WRAM0 bank #0: $cd3d = wTitleMonSpecies $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY $cd3d = wTempSCX + $cd3d = wUnusedCreditsByte $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel - $cd3d = wUnusedCreditsByte $cd3d = wFieldMoves $cd3d = wCoordIndex $cd3d = wHoFTeamIndex diff --git a/pokered.map b/pokered.map index aba0857ca..bba5cc590 100644 --- a/pokered.map +++ b/pokered.map @@ -18071,9 +18071,9 @@ WRAM0 bank #0: $c1da = wSprite13StateData1YAdjusted $c1db = wSprite13StateData1XAdjusted $c1dc = wSprite13StateData1CollisionData - $c1e0 = wSprite13StateData1End - $c1e0 = wSprite14StateData1 $c1e0 = wSprite14StateData1PictureID + $c1e0 = wSprite14StateData1 + $c1e0 = wSprite13StateData1End $c1e1 = wSprite14StateData1MovementStatus $c1e2 = wSprite14StateData1ImageIndex $c1e3 = wSprite14StateData1YStepVector @@ -18755,8 +18755,8 @@ WRAM0 bank #0: $cc3e = wSerialExchangeNybbleReceiveData $cc42 = wSerialExchangeNybbleSendData $cc42 = wLinkMenuSelectionSendBuffer - $cc47 = wUnknownSerialCounter $cc47 = wLinkTimeoutCounter + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation @@ -18901,17 +18901,17 @@ WRAM0 bank #0: $cd3d = wPriceTemp $cd3d = wTitleMonSpecies $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY + $cd3d = wTempSCX $cd3d = wMoveDownSmallStarsOAMCount + $cd3d = wStoppingWhichSlotMachineWheel $cd3d = wUnusedCreditsByte $cd3d = wFieldMoves $cd3d = wHoFTeamIndex - $cd3d = wTempSCX $cd3d = wCoordIndex $cd3d = wDayCareStartLevel $cd3d = wBoxMonCounts $cd3d = wSavedY $cd3d = wPlayerCharacterOAMTile - $cd3d = wStoppingWhichSlotMachineWheel $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData $cd3d = wTrainerSpriteOffset diff --git a/pokered_vc.map b/pokered_vc.map index 3e4759b2a..3c01c19d8 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -18810,8 +18810,8 @@ WRAM0 bank #0: $cc3e = wSerialExchangeNybbleReceiveData $cc42 = wSerialExchangeNybbleSendData $cc42 = wLinkMenuSelectionSendBuffer - $cc47 = wUnknownSerialCounter $cc47 = wLinkTimeoutCounter + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation @@ -18957,9 +18957,9 @@ WRAM0 bank #0: $cd3d = wTitleMonSpecies $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY $cd3d = wTempSCX + $cd3d = wUnusedCreditsByte $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel - $cd3d = wUnusedCreditsByte $cd3d = wFieldMoves $cd3d = wCoordIndex $cd3d = wHoFTeamIndex