Use more Pokemon data constants, create MOVE_NAME_LENGTH (#543)

pokeblue.map

@@ -1899,16 +1899,16 @@ ROMX bank #1:
 	         $7b5e = WhatToTossText
 	         $7b63 = TossHowManyText
 	         $7b68 = _RemovePokemon
-	         $7b74 = _RemovePokemon.usePartyCount
+	         $7b74 = _RemovePokemon.gotCount
 	         $7b81 = _RemovePokemon.shiftMonSpeciesLoop
-	         $7b97 = _RemovePokemon.usePartyMonOTs
+	         $7b97 = _RemovePokemon.gotOTsPointer
 	         $7ba6 = _RemovePokemon.notRemovingLastMon
-	         $7bb8 = _RemovePokemon.usePartyMonNicks
-	         $7bcd = _RemovePokemon.usePartyMonStructs
-	         $7be4 = _RemovePokemon.copyUntilPartyMonOTs
-	         $7beb = _RemovePokemon.continue
-	         $7bfa = _RemovePokemon.usePartyMonNicks2
-	         $7c15 = _RemovePokemon.copyUntilPartyMonNicksEnd
+	         $7bb8 = _RemovePokemon.gotNicksPointer
+	         $7bcd = _RemovePokemon.gotMonStructs
+	         $7be4 = _RemovePokemon.copyUntilPartyMonOT
+	         $7beb = _RemovePokemon.shiftOTs
+	         $7bfa = _RemovePokemon.gotNicksPointer2
+	         $7c15 = _RemovePokemon.shiftMonNicks
 	         $7c18 = _DisplayPokedex
 	EMPTY: $7c49-$7fff ($03b7 bytes)
 	TOTAL EMPTY: $03b7 bytes
@@ -3218,15 +3218,15 @@ ROMX bank #3:
 	         $678d = IsKeyItem_.checkIfItemIsHM
 	         $6799 = KeyItemFlags
 	         $67a4 = SendNewMonToBox
-	         $67b1 = SendNewMonToBox.loop
-	         $67db = SendNewMonToBox.loop2
-	         $67ee = SendNewMonToBox.skip
-	         $6817 = SendNewMonToBox.loop3
-	         $682a = SendNewMonToBox.skip2
-	         $6854 = SendNewMonToBox.loop4
-	         $6867 = SendNewMonToBox.skip3
-	         $689f = SendNewMonToBox.loop5
-	         $68b1 = SendNewMonToBox.loop6
+	         $67b1 = SendNewMonToBox.shiftSpeciesLoop
+	         $67db = SendNewMonToBox.shiftMonOTLoop
+	         $67ee = SendNewMonToBox.skipOTshift
+	         $6817 = SendNewMonToBox.shiftNickLoop
+	         $682a = SendNewMonToBox.skipNickShift
+	         $6854 = SendNewMonToBox.shiftMonDataLoop
+	         $6867 = SendNewMonToBox.skipMonDataShift
+	         $689f = SendNewMonToBox.statLoop
+	         $68b1 = SendNewMonToBox.movePPLoop
 	         $68b8 = IsNextTileShoreOrWater
 	         $68d8 = IsNextTileShoreOrWater.skipShoreTiles
 	         $68dc = IsNextTileShoreOrWater.notShoreOrWater
@@ -19206,6 +19206,7 @@ WRAM0 bank #0:
 	         $d05e = wCriticalHitOrOHKO
 	         $d05f = wMoveMissed
 	         $d060 = wPlayerStatsToDouble
+	         $d060 = wBattleStatusData
 	         $d061 = wPlayerStatsToHalve
 	         $d062 = wPlayerBattleStatus1
 	         $d063 = wPlayerBattleStatus2
@@ -19227,6 +19228,7 @@ WRAM0 bank #0:
 	         $d074 = wUnknownSerialCounter2
 	         $d074 = wPlayerBideAccumulatedDamage
 	         $d078 = wEscapedFromBattle
+	         $d078 = wBattleStatusDataEnd
 	         $d079 = wObjectToHide
 	         $d079 = wAmountMoneyWon
 	         $d07a = wObjectToShow

pokeblue.sym

@@ -1869,16 +1869,16 @@
 01:7b5e WhatToTossText
 01:7b63 TossHowManyText
 01:7b68 _RemovePokemon
-01:7b74 _RemovePokemon.usePartyCount
+01:7b74 _RemovePokemon.gotCount
 01:7b81 _RemovePokemon.shiftMonSpeciesLoop
-01:7b97 _RemovePokemon.usePartyMonOTs
+01:7b97 _RemovePokemon.gotOTsPointer
 01:7ba6 _RemovePokemon.notRemovingLastMon
-01:7bb8 _RemovePokemon.usePartyMonNicks
-01:7bcd _RemovePokemon.usePartyMonStructs
-01:7be4 _RemovePokemon.copyUntilPartyMonOTs
-01:7beb _RemovePokemon.continue
-01:7bfa _RemovePokemon.usePartyMonNicks2
-01:7c15 _RemovePokemon.copyUntilPartyMonNicksEnd
+01:7bb8 _RemovePokemon.gotNicksPointer
+01:7bcd _RemovePokemon.gotMonStructs
+01:7be4 _RemovePokemon.copyUntilPartyMonOT
+01:7beb _RemovePokemon.shiftOTs
+01:7bfa _RemovePokemon.gotNicksPointer2
+01:7c15 _RemovePokemon.shiftMonNicks
 01:7c18 _DisplayPokedex
 02:4000 SFX_Headers_1
 02:4003 SFX_Noise_Instrument01_1
@@ -3174,15 +3174,15 @@
 03:678d IsKeyItem_.checkIfItemIsHM
 03:6799 KeyItemFlags
 03:67a4 SendNewMonToBox
-03:67b1 SendNewMonToBox.loop
-03:67db SendNewMonToBox.loop2
-03:67ee SendNewMonToBox.skip
-03:6817 SendNewMonToBox.loop3
-03:682a SendNewMonToBox.skip2
-03:6854 SendNewMonToBox.loop4
-03:6867 SendNewMonToBox.skip3
-03:689f SendNewMonToBox.loop5
-03:68b1 SendNewMonToBox.loop6
+03:67b1 SendNewMonToBox.shiftSpeciesLoop
+03:67db SendNewMonToBox.shiftMonOTLoop
+03:67ee SendNewMonToBox.skipOTshift
+03:6817 SendNewMonToBox.shiftNickLoop
+03:682a SendNewMonToBox.skipNickShift
+03:6854 SendNewMonToBox.shiftMonDataLoop
+03:6867 SendNewMonToBox.skipMonDataShift
+03:689f SendNewMonToBox.statLoop
+03:68b1 SendNewMonToBox.movePPLoop
 03:68b8 IsNextTileShoreOrWater
 03:68d8 IsNextTileShoreOrWater.skipShoreTiles
 03:68dc IsNextTileShoreOrWater.notShoreOrWater
@@ -18871,6 +18871,7 @@
 00:d05d wTrainerNo
 00:d05e wCriticalHitOrOHKO
 00:d05f wMoveMissed
+00:d060 wBattleStatusData
 00:d060 wPlayerStatsToDouble
 00:d061 wPlayerStatsToHalve
 00:d062 wPlayerBattleStatus1
@@ -18892,6 +18893,7 @@
 00:d074 wPlayerBideAccumulatedDamage
 00:d074 wPlayerNumHits
 00:d074 wUnknownSerialCounter2
+00:d078 wBattleStatusDataEnd
 00:d078 wEscapedFromBattle
 00:d079 wAmountMoneyWon
 00:d079 wObjectToHide

pokeblue_debug.map

@@ -1909,16 +1909,16 @@ ROMX bank #1:
 	         $7c9c = WhatToTossText
 	         $7ca1 = TossHowManyText
 	         $7ca6 = _RemovePokemon
-	         $7cb2 = _RemovePokemon.usePartyCount
+	         $7cb2 = _RemovePokemon.gotCount
 	         $7cbf = _RemovePokemon.shiftMonSpeciesLoop
-	         $7cd5 = _RemovePokemon.usePartyMonOTs
+	         $7cd5 = _RemovePokemon.gotOTsPointer
 	         $7ce4 = _RemovePokemon.notRemovingLastMon
-	         $7cf6 = _RemovePokemon.usePartyMonNicks
-	         $7d0b = _RemovePokemon.usePartyMonStructs
-	         $7d22 = _RemovePokemon.copyUntilPartyMonOTs
-	         $7d29 = _RemovePokemon.continue
-	         $7d38 = _RemovePokemon.usePartyMonNicks2
-	         $7d53 = _RemovePokemon.copyUntilPartyMonNicksEnd
+	         $7cf6 = _RemovePokemon.gotNicksPointer
+	         $7d0b = _RemovePokemon.gotMonStructs
+	         $7d22 = _RemovePokemon.copyUntilPartyMonOT
+	         $7d29 = _RemovePokemon.shiftOTs
+	         $7d38 = _RemovePokemon.gotNicksPointer2
+	         $7d53 = _RemovePokemon.shiftMonNicks
 	         $7d56 = _DisplayPokedex
 	EMPTY: $7d87-$7fff ($0279 bytes)
 	TOTAL EMPTY: $0279 bytes
@@ -3228,15 +3228,15 @@ ROMX bank #3:
 	         $678d = IsKeyItem_.checkIfItemIsHM
 	         $6799 = KeyItemFlags
 	         $67a4 = SendNewMonToBox
-	         $67b1 = SendNewMonToBox.loop
-	         $67db = SendNewMonToBox.loop2
-	         $67ee = SendNewMonToBox.skip
-	         $6817 = SendNewMonToBox.loop3
-	         $682a = SendNewMonToBox.skip2
-	         $6854 = SendNewMonToBox.loop4
-	         $6867 = SendNewMonToBox.skip3
-	         $689f = SendNewMonToBox.loop5
-	         $68b1 = SendNewMonToBox.loop6
+	         $67b1 = SendNewMonToBox.shiftSpeciesLoop
+	         $67db = SendNewMonToBox.shiftMonOTLoop
+	         $67ee = SendNewMonToBox.skipOTshift
+	         $6817 = SendNewMonToBox.shiftNickLoop
+	         $682a = SendNewMonToBox.skipNickShift
+	         $6854 = SendNewMonToBox.shiftMonDataLoop
+	         $6867 = SendNewMonToBox.skipMonDataShift
+	         $689f = SendNewMonToBox.statLoop
+	         $68b1 = SendNewMonToBox.movePPLoop
 	         $68b8 = IsNextTileShoreOrWater
 	         $68d8 = IsNextTileShoreOrWater.skipShoreTiles
 	         $68dc = IsNextTileShoreOrWater.notShoreOrWater
@@ -19216,6 +19216,7 @@ WRAM0 bank #0:
 	         $d05e = wCriticalHitOrOHKO
 	         $d05f = wMoveMissed
 	         $d060 = wPlayerStatsToDouble
+	         $d060 = wBattleStatusData
 	         $d061 = wPlayerStatsToHalve
 	         $d062 = wPlayerBattleStatus1
 	         $d063 = wPlayerBattleStatus2
@@ -19237,6 +19238,7 @@ WRAM0 bank #0:
 	         $d074 = wUnknownSerialCounter2
 	         $d074 = wPlayerBideAccumulatedDamage
 	         $d078 = wEscapedFromBattle
+	         $d078 = wBattleStatusDataEnd
 	         $d079 = wObjectToHide
 	         $d079 = wAmountMoneyWon
 	         $d07a = wObjectToShow

pokeblue_debug.sym

@@ -1879,16 +1879,16 @@
 01:7c9c WhatToTossText
 01:7ca1 TossHowManyText
 01:7ca6 _RemovePokemon
-01:7cb2 _RemovePokemon.usePartyCount
+01:7cb2 _RemovePokemon.gotCount
 01:7cbf _RemovePokemon.shiftMonSpeciesLoop
-01:7cd5 _RemovePokemon.usePartyMonOTs
+01:7cd5 _RemovePokemon.gotOTsPointer
 01:7ce4 _RemovePokemon.notRemovingLastMon
-01:7cf6 _RemovePokemon.usePartyMonNicks
-01:7d0b _RemovePokemon.usePartyMonStructs
-01:7d22 _RemovePokemon.copyUntilPartyMonOTs
-01:7d29 _RemovePokemon.continue
-01:7d38 _RemovePokemon.usePartyMonNicks2
-01:7d53 _RemovePokemon.copyUntilPartyMonNicksEnd
+01:7cf6 _RemovePokemon.gotNicksPointer
+01:7d0b _RemovePokemon.gotMonStructs
+01:7d22 _RemovePokemon.copyUntilPartyMonOT
+01:7d29 _RemovePokemon.shiftOTs
+01:7d38 _RemovePokemon.gotNicksPointer2
+01:7d53 _RemovePokemon.shiftMonNicks
 01:7d56 _DisplayPokedex
 02:4000 SFX_Headers_1
 02:4003 SFX_Noise_Instrument01_1
@@ -3184,15 +3184,15 @@
 03:678d IsKeyItem_.checkIfItemIsHM
 03:6799 KeyItemFlags
 03:67a4 SendNewMonToBox
-03:67b1 SendNewMonToBox.loop
-03:67db SendNewMonToBox.loop2
-03:67ee SendNewMonToBox.skip
-03:6817 SendNewMonToBox.loop3
-03:682a SendNewMonToBox.skip2
-03:6854 SendNewMonToBox.loop4
-03:6867 SendNewMonToBox.skip3
-03:689f SendNewMonToBox.loop5
-03:68b1 SendNewMonToBox.loop6
+03:67b1 SendNewMonToBox.shiftSpeciesLoop
+03:67db SendNewMonToBox.shiftMonOTLoop
+03:67ee SendNewMonToBox.skipOTshift
+03:6817 SendNewMonToBox.shiftNickLoop
+03:682a SendNewMonToBox.skipNickShift
+03:6854 SendNewMonToBox.shiftMonDataLoop
+03:6867 SendNewMonToBox.skipMonDataShift
+03:689f SendNewMonToBox.statLoop
+03:68b1 SendNewMonToBox.movePPLoop
 03:68b8 IsNextTileShoreOrWater
 03:68d8 IsNextTileShoreOrWater.skipShoreTiles
 03:68dc IsNextTileShoreOrWater.notShoreOrWater
@@ -18881,6 +18881,7 @@
 00:d05d wTrainerNo
 00:d05e wCriticalHitOrOHKO
 00:d05f wMoveMissed
+00:d060 wBattleStatusData
 00:d060 wPlayerStatsToDouble
 00:d061 wPlayerStatsToHalve
 00:d062 wPlayerBattleStatus1
@@ -18902,6 +18903,7 @@
 00:d074 wPlayerBideAccumulatedDamage
 00:d074 wPlayerNumHits
 00:d074 wUnknownSerialCounter2
+00:d078 wBattleStatusDataEnd
 00:d078 wEscapedFromBattle
 00:d079 wAmountMoneyWon
 00:d079 wObjectToHide

pokeblue_vc.map

@@ -1915,16 +1915,16 @@ ROMX bank #1:
 	         $7b5e = WhatToTossText
 	         $7b63 = TossHowManyText
 	         $7b68 = _RemovePokemon
-	         $7b74 = _RemovePokemon.usePartyCount
+	         $7b74 = _RemovePokemon.gotCount
 	         $7b81 = _RemovePokemon.shiftMonSpeciesLoop
-	         $7b97 = _RemovePokemon.usePartyMonOTs
+	         $7b97 = _RemovePokemon.gotOTsPointer
 	         $7ba6 = _RemovePokemon.notRemovingLastMon
-	         $7bb8 = _RemovePokemon.usePartyMonNicks
-	         $7bcd = _RemovePokemon.usePartyMonStructs
-	         $7be4 = _RemovePokemon.copyUntilPartyMonOTs
-	         $7beb = _RemovePokemon.continue
-	         $7bfa = _RemovePokemon.usePartyMonNicks2
-	         $7c15 = _RemovePokemon.copyUntilPartyMonNicksEnd
+	         $7bb8 = _RemovePokemon.gotNicksPointer
+	         $7bcd = _RemovePokemon.gotMonStructs
+	         $7be4 = _RemovePokemon.copyUntilPartyMonOT
+	         $7beb = _RemovePokemon.shiftOTs
+	         $7bfa = _RemovePokemon.gotNicksPointer2
+	         $7c15 = _RemovePokemon.shiftMonNicks
 	         $7c18 = _DisplayPokedex
 	EMPTY: $7c49-$7fff ($03b7 bytes)
 	TOTAL EMPTY: $03b7 bytes
@@ -3234,15 +3234,15 @@ ROMX bank #3:
 	         $678d = IsKeyItem_.checkIfItemIsHM
 	         $6799 = KeyItemFlags
 	         $67a4 = SendNewMonToBox
-	         $67b1 = SendNewMonToBox.loop
-	         $67db = SendNewMonToBox.loop2
-	         $67ee = SendNewMonToBox.skip
-	         $6817 = SendNewMonToBox.loop3
-	         $682a = SendNewMonToBox.skip2
-	         $6854 = SendNewMonToBox.loop4
-	         $6867 = SendNewMonToBox.skip3
-	         $689f = SendNewMonToBox.loop5
-	         $68b1 = SendNewMonToBox.loop6
+	         $67b1 = SendNewMonToBox.shiftSpeciesLoop
+	         $67db = SendNewMonToBox.shiftMonOTLoop
+	         $67ee = SendNewMonToBox.skipOTshift
+	         $6817 = SendNewMonToBox.shiftNickLoop
+	         $682a = SendNewMonToBox.skipNickShift
+	         $6854 = SendNewMonToBox.shiftMonDataLoop
+	         $6867 = SendNewMonToBox.skipMonDataShift
+	         $689f = SendNewMonToBox.statLoop
+	         $68b1 = SendNewMonToBox.movePPLoop
 	         $68b8 = IsNextTileShoreOrWater
 	         $68d8 = IsNextTileShoreOrWater.skipShoreTiles
 	         $68dc = IsNextTileShoreOrWater.notShoreOrWater
@@ -19258,6 +19258,7 @@ WRAM0 bank #0:
 	         $d05e = wCriticalHitOrOHKO
 	         $d05f = wMoveMissed
 	         $d060 = wPlayerStatsToDouble
+	         $d060 = wBattleStatusData
 	         $d061 = wPlayerStatsToHalve
 	         $d062 = wPlayerBattleStatus1
 	         $d063 = wPlayerBattleStatus2
@@ -19279,6 +19280,7 @@ WRAM0 bank #0:
 	         $d074 = wUnknownSerialCounter2
 	         $d074 = wPlayerBideAccumulatedDamage
 	         $d078 = wEscapedFromBattle
+	         $d078 = wBattleStatusDataEnd
 	         $d079 = wObjectToHide
 	         $d079 = wAmountMoneyWon
 	         $d07a = wObjectToShow

pokeblue_vc.sym

@@ -1885,16 +1885,16 @@
 01:7b5e WhatToTossText
 01:7b63 TossHowManyText
 01:7b68 _RemovePokemon
-01:7b74 _RemovePokemon.usePartyCount
+01:7b74 _RemovePokemon.gotCount
 01:7b81 _RemovePokemon.shiftMonSpeciesLoop
-01:7b97 _RemovePokemon.usePartyMonOTs
+01:7b97 _RemovePokemon.gotOTsPointer
 01:7ba6 _RemovePokemon.notRemovingLastMon
-01:7bb8 _RemovePokemon.usePartyMonNicks
-01:7bcd _RemovePokemon.usePartyMonStructs
-01:7be4 _RemovePokemon.copyUntilPartyMonOTs
-01:7beb _RemovePokemon.continue
-01:7bfa _RemovePokemon.usePartyMonNicks2
-01:7c15 _RemovePokemon.copyUntilPartyMonNicksEnd
+01:7bb8 _RemovePokemon.gotNicksPointer
+01:7bcd _RemovePokemon.gotMonStructs
+01:7be4 _RemovePokemon.copyUntilPartyMonOT
+01:7beb _RemovePokemon.shiftOTs
+01:7bfa _RemovePokemon.gotNicksPointer2
+01:7c15 _RemovePokemon.shiftMonNicks
 01:7c18 _DisplayPokedex
 02:4000 SFX_Headers_1
 02:4003 SFX_Noise_Instrument01_1
@@ -3190,15 +3190,15 @@
 03:678d IsKeyItem_.checkIfItemIsHM
 03:6799 KeyItemFlags
 03:67a4 SendNewMonToBox
-03:67b1 SendNewMonToBox.loop
-03:67db SendNewMonToBox.loop2
-03:67ee SendNewMonToBox.skip
-03:6817 SendNewMonToBox.loop3
-03:682a SendNewMonToBox.skip2
-03:6854 SendNewMonToBox.loop4
-03:6867 SendNewMonToBox.skip3
-03:689f SendNewMonToBox.loop5
-03:68b1 SendNewMonToBox.loop6
+03:67b1 SendNewMonToBox.shiftSpeciesLoop
+03:67db SendNewMonToBox.shiftMonOTLoop
+03:67ee SendNewMonToBox.skipOTshift
+03:6817 SendNewMonToBox.shiftNickLoop
+03:682a SendNewMonToBox.skipNickShift
+03:6854 SendNewMonToBox.shiftMonDataLoop
+03:6867 SendNewMonToBox.skipMonDataShift
+03:689f SendNewMonToBox.statLoop
+03:68b1 SendNewMonToBox.movePPLoop
 03:68b8 IsNextTileShoreOrWater
 03:68d8 IsNextTileShoreOrWater.skipShoreTiles
 03:68dc IsNextTileShoreOrWater.notShoreOrWater
@@ -18923,6 +18923,7 @@
 00:d05d wTrainerNo
 00:d05e wCriticalHitOrOHKO
 00:d05f wMoveMissed
+00:d060 wBattleStatusData
 00:d060 wPlayerStatsToDouble
 00:d061 wPlayerStatsToHalve
 00:d062 wPlayerBattleStatus1
@@ -18944,6 +18945,7 @@
 00:d074 wPlayerBideAccumulatedDamage
 00:d074 wPlayerNumHits
 00:d074 wUnknownSerialCounter2
+00:d078 wBattleStatusDataEnd
 00:d078 wEscapedFromBattle
 00:d079 wAmountMoneyWon
 00:d079 wObjectToHide

pokered.map

@@ -1899,16 +1899,16 @@ ROMX bank #1:
 	         $7b5e = WhatToTossText
 	         $7b63 = TossHowManyText
 	         $7b68 = _RemovePokemon
-	         $7b74 = _RemovePokemon.usePartyCount
+	         $7b74 = _RemovePokemon.gotCount
 	         $7b81 = _RemovePokemon.shiftMonSpeciesLoop
-	         $7b97 = _RemovePokemon.usePartyMonOTs
+	         $7b97 = _RemovePokemon.gotOTsPointer
 	         $7ba6 = _RemovePokemon.notRemovingLastMon
-	         $7bb8 = _RemovePokemon.usePartyMonNicks
-	         $7bcd = _RemovePokemon.usePartyMonStructs
-	         $7be4 = _RemovePokemon.copyUntilPartyMonOTs
-	         $7beb = _RemovePokemon.continue
-	         $7bfa = _RemovePokemon.usePartyMonNicks2
-	         $7c15 = _RemovePokemon.copyUntilPartyMonNicksEnd
+	         $7bb8 = _RemovePokemon.gotNicksPointer
+	         $7bcd = _RemovePokemon.gotMonStructs
+	         $7be4 = _RemovePokemon.copyUntilPartyMonOT
+	         $7beb = _RemovePokemon.shiftOTs
+	         $7bfa = _RemovePokemon.gotNicksPointer2
+	         $7c15 = _RemovePokemon.shiftMonNicks
 	         $7c18 = _DisplayPokedex
 	EMPTY: $7c49-$7fff ($03b7 bytes)
 	TOTAL EMPTY: $03b7 bytes
@@ -3218,15 +3218,15 @@ ROMX bank #3:
 	         $678d = IsKeyItem_.checkIfItemIsHM
 	         $6799 = KeyItemFlags
 	         $67a4 = SendNewMonToBox
-	         $67b1 = SendNewMonToBox.loop
-	         $67db = SendNewMonToBox.loop2
-	         $67ee = SendNewMonToBox.skip
-	         $6817 = SendNewMonToBox.loop3
-	         $682a = SendNewMonToBox.skip2
-	         $6854 = SendNewMonToBox.loop4
-	         $6867 = SendNewMonToBox.skip3
-	         $689f = SendNewMonToBox.loop5
-	         $68b1 = SendNewMonToBox.loop6
+	         $67b1 = SendNewMonToBox.shiftSpeciesLoop
+	         $67db = SendNewMonToBox.shiftMonOTLoop
+	         $67ee = SendNewMonToBox.skipOTshift
+	         $6817 = SendNewMonToBox.shiftNickLoop
+	         $682a = SendNewMonToBox.skipNickShift
+	         $6854 = SendNewMonToBox.shiftMonDataLoop
+	         $6867 = SendNewMonToBox.skipMonDataShift
+	         $689f = SendNewMonToBox.statLoop
+	         $68b1 = SendNewMonToBox.movePPLoop
 	         $68b8 = IsNextTileShoreOrWater
 	         $68d8 = IsNextTileShoreOrWater.skipShoreTiles
 	         $68dc = IsNextTileShoreOrWater.notShoreOrWater
@@ -19206,6 +19206,7 @@ WRAM0 bank #0:
 	         $d05e = wCriticalHitOrOHKO
 	         $d05f = wMoveMissed
 	         $d060 = wPlayerStatsToDouble
+	         $d060 = wBattleStatusData
 	         $d061 = wPlayerStatsToHalve
 	         $d062 = wPlayerBattleStatus1
 	         $d063 = wPlayerBattleStatus2
@@ -19227,6 +19228,7 @@ WRAM0 bank #0:
 	         $d074 = wUnknownSerialCounter2
 	         $d074 = wPlayerBideAccumulatedDamage
 	         $d078 = wEscapedFromBattle
+	         $d078 = wBattleStatusDataEnd
 	         $d079 = wObjectToHide
 	         $d079 = wAmountMoneyWon
 	         $d07a = wObjectToShow

pokered.sym

@@ -1869,16 +1869,16 @@
 01:7b5e WhatToTossText
 01:7b63 TossHowManyText
 01:7b68 _RemovePokemon
-01:7b74 _RemovePokemon.usePartyCount
+01:7b74 _RemovePokemon.gotCount
 01:7b81 _RemovePokemon.shiftMonSpeciesLoop
-01:7b97 _RemovePokemon.usePartyMonOTs
+01:7b97 _RemovePokemon.gotOTsPointer
 01:7ba6 _RemovePokemon.notRemovingLastMon
-01:7bb8 _RemovePokemon.usePartyMonNicks
-01:7bcd _RemovePokemon.usePartyMonStructs
-01:7be4 _RemovePokemon.copyUntilPartyMonOTs
-01:7beb _RemovePokemon.continue
-01:7bfa _RemovePokemon.usePartyMonNicks2
-01:7c15 _RemovePokemon.copyUntilPartyMonNicksEnd
+01:7bb8 _RemovePokemon.gotNicksPointer
+01:7bcd _RemovePokemon.gotMonStructs
+01:7be4 _RemovePokemon.copyUntilPartyMonOT
+01:7beb _RemovePokemon.shiftOTs
+01:7bfa _RemovePokemon.gotNicksPointer2
+01:7c15 _RemovePokemon.shiftMonNicks
 01:7c18 _DisplayPokedex
 02:4000 SFX_Headers_1
 02:4003 SFX_Noise_Instrument01_1
@@ -3174,15 +3174,15 @@
 03:678d IsKeyItem_.checkIfItemIsHM
 03:6799 KeyItemFlags
 03:67a4 SendNewMonToBox
-03:67b1 SendNewMonToBox.loop
-03:67db SendNewMonToBox.loop2
-03:67ee SendNewMonToBox.skip
-03:6817 SendNewMonToBox.loop3
-03:682a SendNewMonToBox.skip2
-03:6854 SendNewMonToBox.loop4
-03:6867 SendNewMonToBox.skip3
-03:689f SendNewMonToBox.loop5
-03:68b1 SendNewMonToBox.loop6
+03:67b1 SendNewMonToBox.shiftSpeciesLoop
+03:67db SendNewMonToBox.shiftMonOTLoop
+03:67ee SendNewMonToBox.skipOTshift
+03:6817 SendNewMonToBox.shiftNickLoop
+03:682a SendNewMonToBox.skipNickShift
+03:6854 SendNewMonToBox.shiftMonDataLoop
+03:6867 SendNewMonToBox.skipMonDataShift
+03:689f SendNewMonToBox.statLoop
+03:68b1 SendNewMonToBox.movePPLoop
 03:68b8 IsNextTileShoreOrWater
 03:68d8 IsNextTileShoreOrWater.skipShoreTiles
 03:68dc IsNextTileShoreOrWater.notShoreOrWater
@@ -18871,6 +18871,7 @@
 00:d05d wTrainerNo
 00:d05e wCriticalHitOrOHKO
 00:d05f wMoveMissed
+00:d060 wBattleStatusData
 00:d060 wPlayerStatsToDouble
 00:d061 wPlayerStatsToHalve
 00:d062 wPlayerBattleStatus1
@@ -18892,6 +18893,7 @@
 00:d074 wPlayerBideAccumulatedDamage
 00:d074 wPlayerNumHits
 00:d074 wUnknownSerialCounter2
+00:d078 wBattleStatusDataEnd
 00:d078 wEscapedFromBattle
 00:d079 wAmountMoneyWon
 00:d079 wObjectToHide

pokered_vc.map

@@ -1915,16 +1915,16 @@ ROMX bank #1:
 	         $7b5e = WhatToTossText
 	         $7b63 = TossHowManyText
 	         $7b68 = _RemovePokemon
-	         $7b74 = _RemovePokemon.usePartyCount
+	         $7b74 = _RemovePokemon.gotCount
 	         $7b81 = _RemovePokemon.shiftMonSpeciesLoop
-	         $7b97 = _RemovePokemon.usePartyMonOTs
+	         $7b97 = _RemovePokemon.gotOTsPointer
 	         $7ba6 = _RemovePokemon.notRemovingLastMon
-	         $7bb8 = _RemovePokemon.usePartyMonNicks
-	         $7bcd = _RemovePokemon.usePartyMonStructs
-	         $7be4 = _RemovePokemon.copyUntilPartyMonOTs
-	         $7beb = _RemovePokemon.continue
-	         $7bfa = _RemovePokemon.usePartyMonNicks2
-	         $7c15 = _RemovePokemon.copyUntilPartyMonNicksEnd
+	         $7bb8 = _RemovePokemon.gotNicksPointer
+	         $7bcd = _RemovePokemon.gotMonStructs
+	         $7be4 = _RemovePokemon.copyUntilPartyMonOT
+	         $7beb = _RemovePokemon.shiftOTs
+	         $7bfa = _RemovePokemon.gotNicksPointer2
+	         $7c15 = _RemovePokemon.shiftMonNicks
 	         $7c18 = _DisplayPokedex
 	EMPTY: $7c49-$7fff ($03b7 bytes)
 	TOTAL EMPTY: $03b7 bytes
@@ -3234,15 +3234,15 @@ ROMX bank #3:
 	         $678d = IsKeyItem_.checkIfItemIsHM
 	         $6799 = KeyItemFlags
 	         $67a4 = SendNewMonToBox
-	         $67b1 = SendNewMonToBox.loop
-	         $67db = SendNewMonToBox.loop2
-	         $67ee = SendNewMonToBox.skip
-	         $6817 = SendNewMonToBox.loop3
-	         $682a = SendNewMonToBox.skip2
-	         $6854 = SendNewMonToBox.loop4
-	         $6867 = SendNewMonToBox.skip3
-	         $689f = SendNewMonToBox.loop5
-	         $68b1 = SendNewMonToBox.loop6
+	         $67b1 = SendNewMonToBox.shiftSpeciesLoop
+	         $67db = SendNewMonToBox.shiftMonOTLoop
+	         $67ee = SendNewMonToBox.skipOTshift
+	         $6817 = SendNewMonToBox.shiftNickLoop
+	         $682a = SendNewMonToBox.skipNickShift
+	         $6854 = SendNewMonToBox.shiftMonDataLoop
+	         $6867 = SendNewMonToBox.skipMonDataShift
+	         $689f = SendNewMonToBox.statLoop
+	         $68b1 = SendNewMonToBox.movePPLoop
 	         $68b8 = IsNextTileShoreOrWater
 	         $68d8 = IsNextTileShoreOrWater.skipShoreTiles
 	         $68dc = IsNextTileShoreOrWater.notShoreOrWater
@@ -19261,6 +19261,7 @@ WRAM0 bank #0:
 	         $d05e = wCriticalHitOrOHKO
 	         $d05f = wMoveMissed
 	         $d060 = wPlayerStatsToDouble
+	         $d060 = wBattleStatusData
 	         $d061 = wPlayerStatsToHalve
 	         $d062 = wPlayerBattleStatus1
 	         $d063 = wPlayerBattleStatus2
@@ -19282,6 +19283,7 @@ WRAM0 bank #0:
 	         $d074 = wUnknownSerialCounter2
 	         $d074 = wPlayerBideAccumulatedDamage
 	         $d078 = wEscapedFromBattle
+	         $d078 = wBattleStatusDataEnd
 	         $d079 = wObjectToHide
 	         $d079 = wAmountMoneyWon
 	         $d07a = wObjectToShow

pokered_vc.sym

@@ -1885,16 +1885,16 @@
 01:7b5e WhatToTossText
 01:7b63 TossHowManyText
 01:7b68 _RemovePokemon
-01:7b74 _RemovePokemon.usePartyCount
+01:7b74 _RemovePokemon.gotCount
 01:7b81 _RemovePokemon.shiftMonSpeciesLoop
-01:7b97 _RemovePokemon.usePartyMonOTs
+01:7b97 _RemovePokemon.gotOTsPointer
 01:7ba6 _RemovePokemon.notRemovingLastMon
-01:7bb8 _RemovePokemon.usePartyMonNicks
-01:7bcd _RemovePokemon.usePartyMonStructs
-01:7be4 _RemovePokemon.copyUntilPartyMonOTs
-01:7beb _RemovePokemon.continue
-01:7bfa _RemovePokemon.usePartyMonNicks2
-01:7c15 _RemovePokemon.copyUntilPartyMonNicksEnd
+01:7bb8 _RemovePokemon.gotNicksPointer
+01:7bcd _RemovePokemon.gotMonStructs
+01:7be4 _RemovePokemon.copyUntilPartyMonOT
+01:7beb _RemovePokemon.shiftOTs
+01:7bfa _RemovePokemon.gotNicksPointer2
+01:7c15 _RemovePokemon.shiftMonNicks
 01:7c18 _DisplayPokedex
 02:4000 SFX_Headers_1
 02:4003 SFX_Noise_Instrument01_1
@@ -3190,15 +3190,15 @@
 03:678d IsKeyItem_.checkIfItemIsHM
 03:6799 KeyItemFlags
 03:67a4 SendNewMonToBox
-03:67b1 SendNewMonToBox.loop
-03:67db SendNewMonToBox.loop2
-03:67ee SendNewMonToBox.skip
-03:6817 SendNewMonToBox.loop3
-03:682a SendNewMonToBox.skip2
-03:6854 SendNewMonToBox.loop4
-03:6867 SendNewMonToBox.skip3
-03:689f SendNewMonToBox.loop5
-03:68b1 SendNewMonToBox.loop6
+03:67b1 SendNewMonToBox.shiftSpeciesLoop
+03:67db SendNewMonToBox.shiftMonOTLoop
+03:67ee SendNewMonToBox.skipOTshift
+03:6817 SendNewMonToBox.shiftNickLoop
+03:682a SendNewMonToBox.skipNickShift
+03:6854 SendNewMonToBox.shiftMonDataLoop
+03:6867 SendNewMonToBox.skipMonDataShift
+03:689f SendNewMonToBox.statLoop
+03:68b1 SendNewMonToBox.movePPLoop
 03:68b8 IsNextTileShoreOrWater
 03:68d8 IsNextTileShoreOrWater.skipShoreTiles
 03:68dc IsNextTileShoreOrWater.notShoreOrWater
@@ -18926,6 +18926,7 @@
 00:d05d wTrainerNo
 00:d05e wCriticalHitOrOHKO
 00:d05f wMoveMissed
+00:d060 wBattleStatusData
 00:d060 wPlayerStatsToDouble
 00:d061 wPlayerStatsToHalve
 00:d062 wPlayerBattleStatus1
@@ -18947,6 +18948,7 @@
 00:d074 wPlayerBideAccumulatedDamage
 00:d074 wPlayerNumHits
 00:d074 wUnknownSerialCounter2
+00:d078 wBattleStatusDataEnd
 00:d078 wEscapedFromBattle
 00:d079 wAmountMoneyWon
 00:d079 wObjectToHide