diff --git a/pokeblue.map b/pokeblue.map
index bf3c8720dd..e66620ddba 100644
--- a/pokeblue.map
+++ b/pokeblue.map
@@ -19088,7 +19088,8 @@ WRAM0 bank #0:
 	         $d0af = wSpriteOutputPtrCached
 	         $d0b1 = wSpriteDecodeTable0Ptr
 	         $d0b3 = wSpriteDecodeTable1Ptr
-	         $d0b5 = wd0b5
+	         $d0b5 = wCurSpecies
+	         $d0b5 = wNameListIndex
 	         $d0b6 = wNameListType
 	         $d0b7 = wPredefBank
 	         $d0b8 = wMonHIndex
@@ -19122,14 +19123,18 @@ WRAM0 bank #0:
 	         $d11b = wInitListType
 	         $d11c = wCapturedMonSpecies
 	         $d11d = wFirstMonsNotOutYet
-	         $d11e = wd11e
-	         $d11e = wMoveType
-	         $d11e = wMaxPP
 	         $d11e = wPokeBallAnimData
+	         $d11e = wMaxPP
+	         $d11e = wPokedexNum
+	         $d11e = wMoveType
+	         $d11e = wTempByteValue
 	         $d11e = wPokeBallCaptureCalcTemp
 	         $d11e = wUsingPPUp
+	         $d11e = wTempTMHM
+	         $d11e = wMoveGrammar
 	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
 	         $d120 = wNumRunAttempts
@@ -20263,9 +20268,9 @@ HRAM bank #0:
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
+	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
 	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
diff --git a/pokeblue.sym b/pokeblue.sym
index 131fca4606..48a7c12954 100644
--- a/pokeblue.sym
+++ b/pokeblue.sym
@@ -18754,7 +18754,8 @@
 00:d0af wSpriteOutputPtrCached
 00:d0b1 wSpriteDecodeTable0Ptr
 00:d0b3 wSpriteDecodeTable1Ptr
-00:d0b5 wd0b5
+00:d0b5 wCurSpecies
+00:d0b5 wNameListIndex
 00:d0b6 wNameListType
 00:d0b7 wPredefBank
 00:d0b8 wMonHIndex
@@ -18788,14 +18789,18 @@
 00:d11b wInitListType
 00:d11c wCapturedMonSpecies
 00:d11d wFirstMonsNotOutYet
-00:d11e wd11e
-00:d11e wMoveType
-00:d11e wMaxPP
 00:d11e wPokeBallAnimData
+00:d11e wMaxPP
+00:d11e wPokedexNum
+00:d11e wMoveType
+00:d11e wTempByteValue
 00:d11e wPokeBallCaptureCalcTemp
 00:d11e wUsingPPUp
+00:d11e wTempTMHM
+00:d11e wMoveGrammar
 00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
 00:d120 wNumRunAttempts
@@ -19919,9 +19924,9 @@
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
+00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hMapWidth
 00:ff8c hSpriteIndex
 00:ff8c hTextID
 00:ff8c hSlidingRegionSize
diff --git a/pokeblue_debug.map b/pokeblue_debug.map
index 511c7d8b39..3024954020 100644
--- a/pokeblue_debug.map
+++ b/pokeblue_debug.map
@@ -19098,7 +19098,8 @@ WRAM0 bank #0:
 	         $d0af = wSpriteOutputPtrCached
 	         $d0b1 = wSpriteDecodeTable0Ptr
 	         $d0b3 = wSpriteDecodeTable1Ptr
-	         $d0b5 = wd0b5
+	         $d0b5 = wCurSpecies
+	         $d0b5 = wNameListIndex
 	         $d0b6 = wNameListType
 	         $d0b7 = wPredefBank
 	         $d0b8 = wMonHIndex
@@ -19132,14 +19133,18 @@ WRAM0 bank #0:
 	         $d11b = wInitListType
 	         $d11c = wCapturedMonSpecies
 	         $d11d = wFirstMonsNotOutYet
-	         $d11e = wd11e
-	         $d11e = wMoveType
-	         $d11e = wMaxPP
 	         $d11e = wPokeBallAnimData
+	         $d11e = wMaxPP
+	         $d11e = wPokedexNum
+	         $d11e = wMoveType
+	         $d11e = wTempByteValue
 	         $d11e = wPokeBallCaptureCalcTemp
 	         $d11e = wUsingPPUp
+	         $d11e = wTempTMHM
+	         $d11e = wMoveGrammar
 	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
 	         $d120 = wNumRunAttempts
@@ -20273,9 +20278,9 @@ HRAM bank #0:
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
+	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
 	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
index a3631f20d7..1d3f9b0bf4 100644
--- a/pokeblue_debug.sym
+++ b/pokeblue_debug.sym
@@ -18764,7 +18764,8 @@
 00:d0af wSpriteOutputPtrCached
 00:d0b1 wSpriteDecodeTable0Ptr
 00:d0b3 wSpriteDecodeTable1Ptr
-00:d0b5 wd0b5
+00:d0b5 wCurSpecies
+00:d0b5 wNameListIndex
 00:d0b6 wNameListType
 00:d0b7 wPredefBank
 00:d0b8 wMonHIndex
@@ -18798,14 +18799,18 @@
 00:d11b wInitListType
 00:d11c wCapturedMonSpecies
 00:d11d wFirstMonsNotOutYet
-00:d11e wd11e
-00:d11e wMoveType
-00:d11e wMaxPP
 00:d11e wPokeBallAnimData
+00:d11e wMaxPP
+00:d11e wPokedexNum
+00:d11e wMoveType
+00:d11e wTempByteValue
 00:d11e wPokeBallCaptureCalcTemp
 00:d11e wUsingPPUp
+00:d11e wTempTMHM
+00:d11e wMoveGrammar
 00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
 00:d120 wNumRunAttempts
@@ -19929,9 +19934,9 @@
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
+00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hMapWidth
 00:ff8c hSpriteIndex
 00:ff8c hTextID
 00:ff8c hSlidingRegionSize
diff --git a/pokeblue_vc.map b/pokeblue_vc.map
index 6c3e555d34..e49cc8ad5e 100644
--- a/pokeblue_vc.map
+++ b/pokeblue_vc.map
@@ -19140,7 +19140,8 @@ WRAM0 bank #0:
 	         $d0af = wSpriteOutputPtrCached
 	         $d0b1 = wSpriteDecodeTable0Ptr
 	         $d0b3 = wSpriteDecodeTable1Ptr
-	         $d0b5 = wd0b5
+	         $d0b5 = wCurSpecies
+	         $d0b5 = wNameListIndex
 	         $d0b6 = wNameListType
 	         $d0b7 = wPredefBank
 	         $d0b8 = wMonHIndex
@@ -19174,14 +19175,18 @@ WRAM0 bank #0:
 	         $d11b = wInitListType
 	         $d11c = wCapturedMonSpecies
 	         $d11d = wFirstMonsNotOutYet
-	         $d11e = wd11e
-	         $d11e = wMoveType
-	         $d11e = wMaxPP
 	         $d11e = wPokeBallAnimData
+	         $d11e = wMaxPP
+	         $d11e = wPokedexNum
+	         $d11e = wMoveType
+	         $d11e = wTempByteValue
 	         $d11e = wPokeBallCaptureCalcTemp
 	         $d11e = wUsingPPUp
+	         $d11e = wTempTMHM
+	         $d11e = wMoveGrammar
 	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
 	         $d120 = wNumRunAttempts
@@ -20315,9 +20320,9 @@ HRAM bank #0:
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
+	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
 	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
index 16568f2cf8..7755025ed3 100644
--- a/pokeblue_vc.sym
+++ b/pokeblue_vc.sym
@@ -18806,7 +18806,8 @@
 00:d0af wSpriteOutputPtrCached
 00:d0b1 wSpriteDecodeTable0Ptr
 00:d0b3 wSpriteDecodeTable1Ptr
-00:d0b5 wd0b5
+00:d0b5 wCurSpecies
+00:d0b5 wNameListIndex
 00:d0b6 wNameListType
 00:d0b7 wPredefBank
 00:d0b8 wMonHIndex
@@ -18840,14 +18841,18 @@
 00:d11b wInitListType
 00:d11c wCapturedMonSpecies
 00:d11d wFirstMonsNotOutYet
-00:d11e wd11e
-00:d11e wMoveType
-00:d11e wMaxPP
 00:d11e wPokeBallAnimData
+00:d11e wMaxPP
+00:d11e wPokedexNum
+00:d11e wMoveType
+00:d11e wTempByteValue
 00:d11e wPokeBallCaptureCalcTemp
 00:d11e wUsingPPUp
+00:d11e wTempTMHM
+00:d11e wMoveGrammar
 00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
 00:d120 wNumRunAttempts
@@ -19971,9 +19976,9 @@
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
+00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hMapWidth
 00:ff8c hSpriteIndex
 00:ff8c hTextID
 00:ff8c hSlidingRegionSize
diff --git a/pokered.map b/pokered.map
index 730b18a9ce..5150e83943 100644
--- a/pokered.map
+++ b/pokered.map
@@ -19088,7 +19088,8 @@ WRAM0 bank #0:
 	         $d0af = wSpriteOutputPtrCached
 	         $d0b1 = wSpriteDecodeTable0Ptr
 	         $d0b3 = wSpriteDecodeTable1Ptr
-	         $d0b5 = wd0b5
+	         $d0b5 = wCurSpecies
+	         $d0b5 = wNameListIndex
 	         $d0b6 = wNameListType
 	         $d0b7 = wPredefBank
 	         $d0b8 = wMonHIndex
@@ -19122,14 +19123,18 @@ WRAM0 bank #0:
 	         $d11b = wInitListType
 	         $d11c = wCapturedMonSpecies
 	         $d11d = wFirstMonsNotOutYet
-	         $d11e = wd11e
-	         $d11e = wMoveType
-	         $d11e = wMaxPP
 	         $d11e = wPokeBallAnimData
+	         $d11e = wMaxPP
+	         $d11e = wPokedexNum
+	         $d11e = wMoveType
+	         $d11e = wTempByteValue
 	         $d11e = wPokeBallCaptureCalcTemp
 	         $d11e = wUsingPPUp
+	         $d11e = wTempTMHM
+	         $d11e = wMoveGrammar
 	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
 	         $d120 = wNumRunAttempts
@@ -20263,9 +20268,9 @@ HRAM bank #0:
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
+	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
 	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
diff --git a/pokered.sym b/pokered.sym
index d59f296542..d256e60035 100644
--- a/pokered.sym
+++ b/pokered.sym
@@ -18754,7 +18754,8 @@
 00:d0af wSpriteOutputPtrCached
 00:d0b1 wSpriteDecodeTable0Ptr
 00:d0b3 wSpriteDecodeTable1Ptr
-00:d0b5 wd0b5
+00:d0b5 wCurSpecies
+00:d0b5 wNameListIndex
 00:d0b6 wNameListType
 00:d0b7 wPredefBank
 00:d0b8 wMonHIndex
@@ -18788,14 +18789,18 @@
 00:d11b wInitListType
 00:d11c wCapturedMonSpecies
 00:d11d wFirstMonsNotOutYet
-00:d11e wd11e
-00:d11e wMoveType
-00:d11e wMaxPP
 00:d11e wPokeBallAnimData
+00:d11e wMaxPP
+00:d11e wPokedexNum
+00:d11e wMoveType
+00:d11e wTempByteValue
 00:d11e wPokeBallCaptureCalcTemp
 00:d11e wUsingPPUp
+00:d11e wTempTMHM
+00:d11e wMoveGrammar
 00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
 00:d120 wNumRunAttempts
@@ -19919,9 +19924,9 @@
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
+00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hMapWidth
 00:ff8c hSpriteIndex
 00:ff8c hTextID
 00:ff8c hSlidingRegionSize
diff --git a/pokered_vc.map b/pokered_vc.map
index dafb507c19..0774617aa5 100644
--- a/pokered_vc.map
+++ b/pokered_vc.map
@@ -19143,7 +19143,8 @@ WRAM0 bank #0:
 	         $d0af = wSpriteOutputPtrCached
 	         $d0b1 = wSpriteDecodeTable0Ptr
 	         $d0b3 = wSpriteDecodeTable1Ptr
-	         $d0b5 = wd0b5
+	         $d0b5 = wCurSpecies
+	         $d0b5 = wNameListIndex
 	         $d0b6 = wNameListType
 	         $d0b7 = wPredefBank
 	         $d0b8 = wMonHIndex
@@ -19177,14 +19178,18 @@ WRAM0 bank #0:
 	         $d11b = wInitListType
 	         $d11c = wCapturedMonSpecies
 	         $d11d = wFirstMonsNotOutYet
-	         $d11e = wd11e
-	         $d11e = wMoveType
-	         $d11e = wMaxPP
 	         $d11e = wPokeBallAnimData
+	         $d11e = wMaxPP
+	         $d11e = wPokedexNum
+	         $d11e = wMoveType
+	         $d11e = wTempByteValue
 	         $d11e = wPokeBallCaptureCalcTemp
 	         $d11e = wUsingPPUp
+	         $d11e = wTempTMHM
+	         $d11e = wMoveGrammar
 	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
 	         $d120 = wNumRunAttempts
@@ -20318,9 +20323,9 @@ HRAM bank #0:
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
+	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
 	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
diff --git a/pokered_vc.sym b/pokered_vc.sym
index 874f1f168a..f6fdf94891 100644
--- a/pokered_vc.sym
+++ b/pokered_vc.sym
@@ -18809,7 +18809,8 @@
 00:d0af wSpriteOutputPtrCached
 00:d0b1 wSpriteDecodeTable0Ptr
 00:d0b3 wSpriteDecodeTable1Ptr
-00:d0b5 wd0b5
+00:d0b5 wCurSpecies
+00:d0b5 wNameListIndex
 00:d0b6 wNameListType
 00:d0b7 wPredefBank
 00:d0b8 wMonHIndex
@@ -18843,14 +18844,18 @@
 00:d11b wInitListType
 00:d11c wCapturedMonSpecies
 00:d11d wFirstMonsNotOutYet
-00:d11e wd11e
-00:d11e wMoveType
-00:d11e wMaxPP
 00:d11e wPokeBallAnimData
+00:d11e wMaxPP
+00:d11e wPokedexNum
+00:d11e wMoveType
+00:d11e wTempByteValue
 00:d11e wPokeBallCaptureCalcTemp
 00:d11e wUsingPPUp
+00:d11e wTempTMHM
+00:d11e wMoveGrammar
 00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
 00:d120 wNumRunAttempts
@@ -19974,9 +19979,9 @@
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
+00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hMapWidth
 00:ff8c hSpriteIndex
 00:ff8c hTextID
 00:ff8c hSlidingRegionSize