diff --git a/pokeblue.map b/pokeblue.map
index 99c1f23af7..acf4af074d 100644
--- a/pokeblue.map
+++ b/pokeblue.map
@@ -18520,8 +18520,8 @@ WRAM0 bank #0:
 	         $c3a0 = wShadowOAMEnd
 	SECTION: $c3a0-$c6e7 ($0348 bytes) ["Tilemap"]
 	         $c3a0 = wTileMap
-	         $c508 = wTileMapBackup
 	         $c508 = wSerialPartyMonsPatchList
+	         $c508 = wTileMapBackup
 	         $c5d0 = wSerialEnemyMonsPatchList
 	SECTION: $c6e8-$cbfb ($0514 bytes) ["Overworld Map"]
 	         $c6e8 = wTempPic
@@ -18679,7 +18679,6 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
-	         $cd3d = wWhichTrade
 	         $cd3d = wSavedY
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
@@ -18699,14 +18698,16 @@ WRAM0 bank #0:
 	         $cd3d = wBoxNumString
 	         $cd3d = wTradingWhichPlayerMon
 	         $cd3d = wTradedPlayerMonSpecies
+	         $cd3d = wChargeMoveNum
+	         $cd3d = wPriceTemp
 	         $cd3d = wFieldMoves
 	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wChargeMoveNum
 	         $cd3d = wCoordIndex
 	         $cd3d = wTempSCX
 	         $cd3d = wBoxMonCounts
 	         $cd3d = wHoFTeamIndex
 	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wWhichTrade
 	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount
 	         $cd3d = wWereAnyMonsAsleep
@@ -18714,7 +18715,6 @@ WRAM0 bank #0:
 	         $cd3d = wTrainerSpriteOffset
 	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wStoppingWhichSlotMachineWheel
-	         $cd3d = wPriceTemp
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
diff --git a/pokeblue.sym b/pokeblue.sym
index cce6bd021d..a8f5457563 100644
--- a/pokeblue.sym
+++ b/pokeblue.sym
@@ -18188,8 +18188,8 @@
 00:c39f wShadowOAMSprite39Attributes
 00:c3a0 wShadowOAMEnd
 00:c3a0 wTileMap
-00:c508 wTileMapBackup
 00:c508 wSerialPartyMonsPatchList
+00:c508 wTileMapBackup
 00:c5d0 wSerialEnemyMonsPatchList
 00:c6e8 wTempPic
 00:c6e8 wOverworldMap
@@ -18345,7 +18345,6 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
-00:cd3d wWhichTrade
 00:cd3d wSavedY
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
@@ -18365,14 +18364,16 @@
 00:cd3d wBoxNumString
 00:cd3d wTradingWhichPlayerMon
 00:cd3d wTradedPlayerMonSpecies
+00:cd3d wChargeMoveNum
+00:cd3d wPriceTemp
 00:cd3d wFieldMoves
 00:cd3d wPlayerCharacterOAMTile
-00:cd3d wChargeMoveNum
 00:cd3d wCoordIndex
 00:cd3d wTempSCX
 00:cd3d wBoxMonCounts
 00:cd3d wHoFTeamIndex
 00:cd3d wUnusedCreditsByte
+00:cd3d wWhichTrade
 00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount
 00:cd3d wWereAnyMonsAsleep
@@ -18380,7 +18381,6 @@
 00:cd3d wTrainerSpriteOffset
 00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wStoppingWhichSlotMachineWheel
-00:cd3d wPriceTemp
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
diff --git a/pokeblue_debug.map b/pokeblue_debug.map
index 4e8af2fc04..9bc505eefd 100644
--- a/pokeblue_debug.map
+++ b/pokeblue_debug.map
@@ -18530,8 +18530,8 @@ WRAM0 bank #0:
 	         $c3a0 = wShadowOAMEnd
 	SECTION: $c3a0-$c6e7 ($0348 bytes) ["Tilemap"]
 	         $c3a0 = wTileMap
-	         $c508 = wTileMapBackup
 	         $c508 = wSerialPartyMonsPatchList
+	         $c508 = wTileMapBackup
 	         $c5d0 = wSerialEnemyMonsPatchList
 	SECTION: $c6e8-$cbfb ($0514 bytes) ["Overworld Map"]
 	         $c6e8 = wTempPic
@@ -18689,7 +18689,6 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
-	         $cd3d = wWhichTrade
 	         $cd3d = wSavedY
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
@@ -18709,14 +18708,16 @@ WRAM0 bank #0:
 	         $cd3d = wBoxNumString
 	         $cd3d = wTradingWhichPlayerMon
 	         $cd3d = wTradedPlayerMonSpecies
+	         $cd3d = wChargeMoveNum
+	         $cd3d = wPriceTemp
 	         $cd3d = wFieldMoves
 	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wChargeMoveNum
 	         $cd3d = wCoordIndex
 	         $cd3d = wTempSCX
 	         $cd3d = wBoxMonCounts
 	         $cd3d = wHoFTeamIndex
 	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wWhichTrade
 	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount
 	         $cd3d = wWereAnyMonsAsleep
@@ -18724,7 +18725,6 @@ WRAM0 bank #0:
 	         $cd3d = wTrainerSpriteOffset
 	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wStoppingWhichSlotMachineWheel
-	         $cd3d = wPriceTemp
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
index cc05252fd9..77aff59b4f 100644
--- a/pokeblue_debug.sym
+++ b/pokeblue_debug.sym
@@ -18198,8 +18198,8 @@
 00:c39f wShadowOAMSprite39Attributes
 00:c3a0 wShadowOAMEnd
 00:c3a0 wTileMap
-00:c508 wTileMapBackup
 00:c508 wSerialPartyMonsPatchList
+00:c508 wTileMapBackup
 00:c5d0 wSerialEnemyMonsPatchList
 00:c6e8 wTempPic
 00:c6e8 wOverworldMap
@@ -18355,7 +18355,6 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
-00:cd3d wWhichTrade
 00:cd3d wSavedY
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
@@ -18375,14 +18374,16 @@
 00:cd3d wBoxNumString
 00:cd3d wTradingWhichPlayerMon
 00:cd3d wTradedPlayerMonSpecies
+00:cd3d wChargeMoveNum
+00:cd3d wPriceTemp
 00:cd3d wFieldMoves
 00:cd3d wPlayerCharacterOAMTile
-00:cd3d wChargeMoveNum
 00:cd3d wCoordIndex
 00:cd3d wTempSCX
 00:cd3d wBoxMonCounts
 00:cd3d wHoFTeamIndex
 00:cd3d wUnusedCreditsByte
+00:cd3d wWhichTrade
 00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount
 00:cd3d wWereAnyMonsAsleep
@@ -18390,7 +18391,6 @@
 00:cd3d wTrainerSpriteOffset
 00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wStoppingWhichSlotMachineWheel
-00:cd3d wPriceTemp
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
diff --git a/pokeblue_vc.map b/pokeblue_vc.map
index bdd42812d2..d12d790a6b 100644
--- a/pokeblue_vc.map
+++ b/pokeblue_vc.map
@@ -18572,8 +18572,8 @@ WRAM0 bank #0:
 	         $c3a0 = wShadowOAMEnd
 	SECTION: $c3a0-$c6e7 ($0348 bytes) ["Tilemap"]
 	         $c3a0 = wTileMap
-	         $c508 = wTileMapBackup
 	         $c508 = wSerialPartyMonsPatchList
+	         $c508 = wTileMapBackup
 	         $c5d0 = wSerialEnemyMonsPatchList
 	SECTION: $c6e8-$cbfb ($0514 bytes) ["Overworld Map"]
 	         $c6e8 = wTempPic
@@ -18731,7 +18731,6 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
-	         $cd3d = wWhichTrade
 	         $cd3d = wSavedY
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
@@ -18751,14 +18750,16 @@ WRAM0 bank #0:
 	         $cd3d = wBoxNumString
 	         $cd3d = wTradingWhichPlayerMon
 	         $cd3d = wTradedPlayerMonSpecies
+	         $cd3d = wChargeMoveNum
+	         $cd3d = wPriceTemp
 	         $cd3d = wFieldMoves
 	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wChargeMoveNum
 	         $cd3d = wCoordIndex
 	         $cd3d = wTempSCX
 	         $cd3d = wBoxMonCounts
 	         $cd3d = wHoFTeamIndex
 	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wWhichTrade
 	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount
 	         $cd3d = wWereAnyMonsAsleep
@@ -18766,7 +18767,6 @@ WRAM0 bank #0:
 	         $cd3d = wTrainerSpriteOffset
 	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wStoppingWhichSlotMachineWheel
-	         $cd3d = wPriceTemp
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
index 084d667b3e..eaa783ad2b 100644
--- a/pokeblue_vc.sym
+++ b/pokeblue_vc.sym
@@ -18240,8 +18240,8 @@
 00:c39f wShadowOAMSprite39Attributes
 00:c3a0 wShadowOAMEnd
 00:c3a0 wTileMap
-00:c508 wTileMapBackup
 00:c508 wSerialPartyMonsPatchList
+00:c508 wTileMapBackup
 00:c5d0 wSerialEnemyMonsPatchList
 00:c6e8 wTempPic
 00:c6e8 wOverworldMap
@@ -18397,7 +18397,6 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
-00:cd3d wWhichTrade
 00:cd3d wSavedY
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
@@ -18417,14 +18416,16 @@
 00:cd3d wBoxNumString
 00:cd3d wTradingWhichPlayerMon
 00:cd3d wTradedPlayerMonSpecies
+00:cd3d wChargeMoveNum
+00:cd3d wPriceTemp
 00:cd3d wFieldMoves
 00:cd3d wPlayerCharacterOAMTile
-00:cd3d wChargeMoveNum
 00:cd3d wCoordIndex
 00:cd3d wTempSCX
 00:cd3d wBoxMonCounts
 00:cd3d wHoFTeamIndex
 00:cd3d wUnusedCreditsByte
+00:cd3d wWhichTrade
 00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount
 00:cd3d wWereAnyMonsAsleep
@@ -18432,7 +18433,6 @@
 00:cd3d wTrainerSpriteOffset
 00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wStoppingWhichSlotMachineWheel
-00:cd3d wPriceTemp
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
diff --git a/pokered.map b/pokered.map
index 2fc3cec12a..42347dc7d8 100644
--- a/pokered.map
+++ b/pokered.map
@@ -18520,8 +18520,8 @@ WRAM0 bank #0:
 	         $c3a0 = wShadowOAMEnd
 	SECTION: $c3a0-$c6e7 ($0348 bytes) ["Tilemap"]
 	         $c3a0 = wTileMap
-	         $c508 = wTileMapBackup
 	         $c508 = wSerialPartyMonsPatchList
+	         $c508 = wTileMapBackup
 	         $c5d0 = wSerialEnemyMonsPatchList
 	SECTION: $c6e8-$cbfb ($0514 bytes) ["Overworld Map"]
 	         $c6e8 = wTempPic
@@ -18679,7 +18679,6 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
-	         $cd3d = wWhichTrade
 	         $cd3d = wSavedY
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
@@ -18699,14 +18698,16 @@ WRAM0 bank #0:
 	         $cd3d = wBoxNumString
 	         $cd3d = wTradingWhichPlayerMon
 	         $cd3d = wTradedPlayerMonSpecies
+	         $cd3d = wChargeMoveNum
+	         $cd3d = wPriceTemp
 	         $cd3d = wFieldMoves
 	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wChargeMoveNum
 	         $cd3d = wCoordIndex
 	         $cd3d = wTempSCX
 	         $cd3d = wBoxMonCounts
 	         $cd3d = wHoFTeamIndex
 	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wWhichTrade
 	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount
 	         $cd3d = wWereAnyMonsAsleep
@@ -18714,7 +18715,6 @@ WRAM0 bank #0:
 	         $cd3d = wTrainerSpriteOffset
 	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wStoppingWhichSlotMachineWheel
-	         $cd3d = wPriceTemp
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
diff --git a/pokered.sym b/pokered.sym
index 248df776b3..02a5d190aa 100644
--- a/pokered.sym
+++ b/pokered.sym
@@ -18188,8 +18188,8 @@
 00:c39f wShadowOAMSprite39Attributes
 00:c3a0 wShadowOAMEnd
 00:c3a0 wTileMap
-00:c508 wTileMapBackup
 00:c508 wSerialPartyMonsPatchList
+00:c508 wTileMapBackup
 00:c5d0 wSerialEnemyMonsPatchList
 00:c6e8 wTempPic
 00:c6e8 wOverworldMap
@@ -18345,7 +18345,6 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
-00:cd3d wWhichTrade
 00:cd3d wSavedY
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
@@ -18365,14 +18364,16 @@
 00:cd3d wBoxNumString
 00:cd3d wTradingWhichPlayerMon
 00:cd3d wTradedPlayerMonSpecies
+00:cd3d wChargeMoveNum
+00:cd3d wPriceTemp
 00:cd3d wFieldMoves
 00:cd3d wPlayerCharacterOAMTile
-00:cd3d wChargeMoveNum
 00:cd3d wCoordIndex
 00:cd3d wTempSCX
 00:cd3d wBoxMonCounts
 00:cd3d wHoFTeamIndex
 00:cd3d wUnusedCreditsByte
+00:cd3d wWhichTrade
 00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount
 00:cd3d wWereAnyMonsAsleep
@@ -18380,7 +18381,6 @@
 00:cd3d wTrainerSpriteOffset
 00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wStoppingWhichSlotMachineWheel
-00:cd3d wPriceTemp
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
diff --git a/pokered_vc.map b/pokered_vc.map
index e7073dfa29..b6992426b2 100644
--- a/pokered_vc.map
+++ b/pokered_vc.map
@@ -18575,8 +18575,8 @@ WRAM0 bank #0:
 	         $c3a0 = wShadowOAMEnd
 	SECTION: $c3a0-$c6e7 ($0348 bytes) ["Tilemap"]
 	         $c3a0 = wTileMap
-	         $c508 = wTileMapBackup
 	         $c508 = wSerialPartyMonsPatchList
+	         $c508 = wTileMapBackup
 	         $c5d0 = wSerialEnemyMonsPatchList
 	SECTION: $c6e8-$cbfb ($0514 bytes) ["Overworld Map"]
 	         $c6e8 = wTempPic
@@ -18734,7 +18734,6 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
-	         $cd3d = wWhichTrade
 	         $cd3d = wSavedY
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
@@ -18754,14 +18753,16 @@ WRAM0 bank #0:
 	         $cd3d = wBoxNumString
 	         $cd3d = wTradingWhichPlayerMon
 	         $cd3d = wTradedPlayerMonSpecies
+	         $cd3d = wChargeMoveNum
+	         $cd3d = wPriceTemp
 	         $cd3d = wFieldMoves
 	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wChargeMoveNum
 	         $cd3d = wCoordIndex
 	         $cd3d = wTempSCX
 	         $cd3d = wBoxMonCounts
 	         $cd3d = wHoFTeamIndex
 	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wWhichTrade
 	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount
 	         $cd3d = wWereAnyMonsAsleep
@@ -18769,7 +18770,6 @@ WRAM0 bank #0:
 	         $cd3d = wTrainerSpriteOffset
 	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wStoppingWhichSlotMachineWheel
-	         $cd3d = wPriceTemp
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
diff --git a/pokered_vc.sym b/pokered_vc.sym
index 65eb161aca..8246f811d4 100644
--- a/pokered_vc.sym
+++ b/pokered_vc.sym
@@ -18243,8 +18243,8 @@
 00:c39f wShadowOAMSprite39Attributes
 00:c3a0 wShadowOAMEnd
 00:c3a0 wTileMap
-00:c508 wTileMapBackup
 00:c508 wSerialPartyMonsPatchList
+00:c508 wTileMapBackup
 00:c5d0 wSerialEnemyMonsPatchList
 00:c6e8 wTempPic
 00:c6e8 wOverworldMap
@@ -18400,7 +18400,6 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
-00:cd3d wWhichTrade
 00:cd3d wSavedY
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
@@ -18420,14 +18419,16 @@
 00:cd3d wBoxNumString
 00:cd3d wTradingWhichPlayerMon
 00:cd3d wTradedPlayerMonSpecies
+00:cd3d wChargeMoveNum
+00:cd3d wPriceTemp
 00:cd3d wFieldMoves
 00:cd3d wPlayerCharacterOAMTile
-00:cd3d wChargeMoveNum
 00:cd3d wCoordIndex
 00:cd3d wTempSCX
 00:cd3d wBoxMonCounts
 00:cd3d wHoFTeamIndex
 00:cd3d wUnusedCreditsByte
+00:cd3d wWhichTrade
 00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount
 00:cd3d wWereAnyMonsAsleep
@@ -18435,7 +18436,6 @@
 00:cd3d wTrainerSpriteOffset
 00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wStoppingWhichSlotMachineWheel
-00:cd3d wPriceTemp
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance