Fix some label typos, and add some constants instead of raw numbers (#492)

2026-09-29 12:37:52 -05:00 · 2025-01-30 22:28:00 +00:00
parent 310a5d97e0
commit c3ea02b086
10 changed files with 330 additions and 330 deletions
--- a/pokeblue.map
+++ b/pokeblue.map
@@ -4321,8 +4321,8 @@ ROMX bank #6:
 	         $62ab = SilphCo6FSilphWorkerM3Text.WorkForSilphText
 	         $62b0 = SilphCo6FRocket1Text
 	         $62ba = SilphCo6FRocket1BattleText
-	         $62bf = SilphCo6Rocket1EndBattleText
-	         $62c4 = SilphCo6Rocket1AfterBattleText
+	         $62bf = SilphCo6FRocket1EndBattleText
+	         $62c4 = SilphCo6FRocket1AfterBattleText
 	         $62c9 = SilphCo6FScientistText
 	         $62d3 = SilphCo6FScientistBattleText
 	         $62d8 = SilphCo6FScientistEndBattleText
@@ -8171,9 +8171,9 @@ ROMX bank #17:
 	         $50d1 = RocketHideout2TrainerHeaders
 	         $50d1 = RocketHideout2TrainerHeader0
 	         $50de = RocketHideoutB2FRocketText
-	         $50e8 = RocketHideoutB1FRocketBattleText
-	         $50ed = RocketHideoutB1FRocketEndBattleText
-	         $50f2 = RocketHideoutB1FRocketAfterBattleText
+	         $50e8 = RocketHideoutB2FRocketBattleText
+	         $50ed = RocketHideoutB2FRocketEndBattleText
+	         $50f2 = RocketHideoutB2FRocketAfterBattleText
 	         $50f7 = RocketHideoutB2F_Object
 	         $5147 = RocketHideoutB2F_Blocks
 	         $5219 = RocketHideoutB3F_h
@@ -8229,19 +8229,19 @@ ROMX bank #17:
 	         $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText
 	         $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	         $5589 = RocketHideoutB4FRocket1Text
-	         $5593 = RocketHideoutB4FGiovanniBattleText
-	         $5598 = RocketHideoutB4FGiovanniEndBattleText
-	         $559d = RocketHideoutB4FGiovanniAfterBattleText
+	         $5593 = RocketHideoutB4FRocket1BattleText
+	         $5598 = RocketHideoutB4FRocket1EndBattleText
+	         $559d = RocketHideoutB4FRocket1AfterBattleText
 	         $55a2 = RocketHideoutB4FRocket2Text
-	         $55ac = RocketHideoutB4FRocket1BattleText
-	         $55b1 = RocketHideoutB4FRocket1EndBattleText
-	         $55b6 = RocketHideoutB4FRocket1AfterBattleText
+	         $55ac = RocketHideoutB4FRocket2BattleText
+	         $55b1 = RocketHideoutB4FRocket2EndBattleText
+	         $55b6 = RocketHideoutB4FRocket2AfterBattleText
 	         $55bb = RocketHideoutB4FRocket3Text
-	         $55c5 = RocketHideoutB4FRocket2BattleText
-	         $55ca = RocketHideoutB4FRocket2EndBattleText
-	         $55cf = RocketHideoutB4FRocket2AfterBattleText
-	         $55e9 = RocketHideoutB4FRocket2AfterBattleText.done
-	         $55ec = RocketHideoutB4FRocket2AfterBattleText.Text
+	         $55c5 = RocketHideoutB4FRocket3BattleText
+	         $55ca = RocketHideoutB4FRocket3EndBattleText
+	         $55cf = RocketHideoutB4FRocket3AfterBattleText
+	         $55e9 = RocketHideoutB4FRocket3AfterBattleText.done
+	         $55ec = RocketHideoutB4FRocket3AfterBattleText.Text
 	         $55f1 = RocketHideoutB4F_Object
 	         $5650 = RocketHideoutB4F_Blocks
 	         $5704 = RocketHideoutElevator_h
@@ -8249,7 +8249,7 @@ ROMX bank #17:
 	         $572c = RocketHideoutElevatorStoreWarpEntriesScript
 	         $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 	         $5741 = RocketHideoutElevatorScript
-	         $5754 = RocketHideoutElavatorFloors
+	         $5754 = RocketHideoutElevatorFloors
 	         $5759 = RocketHideoutElevatorWarpMaps
 	         $575f = RocketHideoutElevatorShakeScript
 	         $575f = RocketHideoutElevatorWarpMaps.End
@@ -10716,7 +10716,7 @@ ROMX bank #22:
 	         $5296 = Route8SuperNerd2AfterBattleText
 	         $529b = Route8CooltrainerF1Text
 	         $52a5 = Route8CooltrainerF1BattleText
-	         $52aa = Route8CooltrainerF21EndBattleText
+	         $52aa = Route8CooltrainerF1EndBattleText
 	         $52af = Route8CooltrainerF1AfterBattleText
 	         $52b4 = Route8SuperNerd3Text
 	         $52be = Route8SuperNerd3BattleText
@@ -15288,9 +15288,9 @@ ROMX bank #32:
 	         $6047 = _RocketHideoutB1FRocket4AfterBattleText
 	         $6078 = _RocketHideoutB1FRocket5BattleText
 	         $6097 = _RocketHideoutB1FRocket5AfterBattleText
-	         $60bb = _RocketHideoutB1FRocketBattleText
-	         $60ef = _RocketHideoutB1FRocketEndBattleText
-	         $60fd = _RocketHideoutB1FRocketAfterBattleText
+	         $60bb = _RocketHideoutB2FRocketBattleText
+	         $60ef = _RocketHideoutB2FRocketEndBattleText
+	         $60fd = _RocketHideoutB2FRocketAfterBattleText
 	         $6140 = _RocketHideoutB3FRocket1BattleText
 	         $6168 = _RocketHideoutB3FRocket1EndBattleText
 	         $617a = _RocketHideoutB3FRocket1AfterBattleText
@@ -15300,15 +15300,15 @@ ROMX bank #32:
 	         $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText
 	         $626c = _RocketHideoutB4FGiovanniWhatCannotBeText
 	         $6283 = _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-	         $6326 = _RocketHideoutB4FGiovanniBattleText
-	         $6354 = _RocketHideoutB4FGiovanniEndBattleText
-	         $6363 = _RocketHideoutB4FGiovanniAfterBattleText
-	         $638f = _RocketHideoutB4FRocket1BattleText
-	         $63bc = _RocketHideoutB4FRocket1EndBattleText
-	         $63c4 = _RocketHideoutB4FRocket1AfterBattleText
-	         $63e2 = _RocketHideoutB4FRocket2BattleText
-	         $6413 = _RocketHideoutB4FRocket2EndBattleText
-	         $6418 = _RocketHideoutB4FRocket2AfterBattleText
+	         $6326 = _RocketHideoutB4FRocket1BattleText
+	         $6354 = _RocketHideoutB4FRocket1EndBattleText
+	         $6363 = _RocketHideoutB4FRocket1AfterBattleText
+	         $638f = _RocketHideoutB4FRocket2BattleText
+	         $63bc = _RocketHideoutB4FRocket2EndBattleText
+	         $63c4 = _RocketHideoutB4FRocket2AfterBattleText
+	         $63e2 = _RocketHideoutB4FRocket3BattleText
+	         $6413 = _RocketHideoutB4FRocket3EndBattleText
+	         $6418 = _RocketHideoutB4FRocket3AfterBattleText
 	         $6438 = _RocketHideoutElevatorAppearsToNeedKeyText
 	         $6454 = SilphCo2FSilphWorkerFPleaseTakeThisText
 	         $64ba = _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15378,8 +15378,8 @@ ROMX bank #33:
 	         $42a7 = _SilphCo6FSilphWorkerM3TargetedSilphText
 	         $42dd = _SilphCo6FSilphWorkerM3WorkForSilphText
 	         $4306 = _SilphCo6FRocket1BattleText
-	         $432a = _SilphCo6Rocket1EndBattleText
-	         $4336 = _SilphCo6Rocket1AfterBattleText
+	         $432a = _SilphCo6FRocket1EndBattleText
+	         $4336 = _SilphCo6FRocket1AfterBattleText
 	         $435e = _SilphCo6FScientistBattleText
 	         $43a4 = _SilphCo6FScientistEndBattleText
 	         $43ac = _SilphCo6FScientistAfterBattleText
@@ -16063,7 +16063,7 @@ ROMX bank #35:
 	         $5f7e = _Route8SuperNerd2EndBattleText
 	         $5f90 = _Route8SuperNerd2AfterBattleText
 	         $5fc0 = _Route8CooltrainerF1BattleText
-	         $5fe4 = _Route8CooltrainerF21EndBattleText
+	         $5fe4 = _Route8CooltrainerF1EndBattleText
 	         $5ff0 = _Route8CooltrainerF1AfterBattleText
 	         $6028 = _Route8SuperNerd3BattleText
 	         $6049 = _Route8SuperNerd3EndBattleText
--- a/pokeblue.sym
+++ b/pokeblue.sym
@@ -4257,8 +4257,8 @@
 06:62ab SilphCo6FSilphWorkerM3Text.WorkForSilphText
 06:62b0 SilphCo6FRocket1Text
 06:62ba SilphCo6FRocket1BattleText
-06:62bf SilphCo6Rocket1EndBattleText
-06:62c4 SilphCo6Rocket1AfterBattleText
+06:62bf SilphCo6FRocket1EndBattleText
+06:62c4 SilphCo6FRocket1AfterBattleText
 06:62c9 SilphCo6FScientistText
 06:62d3 SilphCo6FScientistBattleText
 06:62d8 SilphCo6FScientistEndBattleText
@@ -8035,9 +8035,9 @@
 11:50d1 RocketHideout2TrainerHeaders
 11:50d1 RocketHideout2TrainerHeader0
 11:50de RocketHideoutB2FRocketText
-11:50e8 RocketHideoutB1FRocketBattleText
-11:50ed RocketHideoutB1FRocketEndBattleText
-11:50f2 RocketHideoutB1FRocketAfterBattleText
+11:50e8 RocketHideoutB2FRocketBattleText
+11:50ed RocketHideoutB2FRocketEndBattleText
+11:50f2 RocketHideoutB2FRocketAfterBattleText
 11:50f7 RocketHideoutB2F_Object
 11:5147 RocketHideoutB2F_Blocks
 11:5219 RocketHideoutB3F_h
@@ -8093,19 +8093,19 @@
 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText
 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText
 11:5589 RocketHideoutB4FRocket1Text
-11:5593 RocketHideoutB4FGiovanniBattleText
-11:5598 RocketHideoutB4FGiovanniEndBattleText
-11:559d RocketHideoutB4FGiovanniAfterBattleText
+11:5593 RocketHideoutB4FRocket1BattleText
+11:5598 RocketHideoutB4FRocket1EndBattleText
+11:559d RocketHideoutB4FRocket1AfterBattleText
 11:55a2 RocketHideoutB4FRocket2Text
-11:55ac RocketHideoutB4FRocket1BattleText
-11:55b1 RocketHideoutB4FRocket1EndBattleText
-11:55b6 RocketHideoutB4FRocket1AfterBattleText
+11:55ac RocketHideoutB4FRocket2BattleText
+11:55b1 RocketHideoutB4FRocket2EndBattleText
+11:55b6 RocketHideoutB4FRocket2AfterBattleText
 11:55bb RocketHideoutB4FRocket3Text
-11:55c5 RocketHideoutB4FRocket2BattleText
-11:55ca RocketHideoutB4FRocket2EndBattleText
-11:55cf RocketHideoutB4FRocket2AfterBattleText
-11:55e9 RocketHideoutB4FRocket2AfterBattleText.done
-11:55ec RocketHideoutB4FRocket2AfterBattleText.Text
+11:55c5 RocketHideoutB4FRocket3BattleText
+11:55ca RocketHideoutB4FRocket3EndBattleText
+11:55cf RocketHideoutB4FRocket3AfterBattleText
+11:55e9 RocketHideoutB4FRocket3AfterBattleText.done
+11:55ec RocketHideoutB4FRocket3AfterBattleText.Text
 11:55f1 RocketHideoutB4F_Object
 11:5650 RocketHideoutB4F_Blocks
 11:5704 RocketHideoutElevator_h
@@ -8113,7 +8113,7 @@
 11:572c RocketHideoutElevatorStoreWarpEntriesScript
 11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 11:5741 RocketHideoutElevatorScript
-11:5754 RocketHideoutElavatorFloors
+11:5754 RocketHideoutElevatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
 11:575f RocketHideoutElevatorWarpMaps.End
 11:575f RocketHideoutElevatorShakeScript
@@ -10542,7 +10542,7 @@
 16:5296 Route8SuperNerd2AfterBattleText
 16:529b Route8CooltrainerF1Text
 16:52a5 Route8CooltrainerF1BattleText
-16:52aa Route8CooltrainerF21EndBattleText
+16:52aa Route8CooltrainerF1EndBattleText
 16:52af Route8CooltrainerF1AfterBattleText
 16:52b4 Route8SuperNerd3Text
 16:52be Route8SuperNerd3BattleText
@@ -15048,9 +15048,9 @@
 20:6047 _RocketHideoutB1FRocket4AfterBattleText
 20:6078 _RocketHideoutB1FRocket5BattleText
 20:6097 _RocketHideoutB1FRocket5AfterBattleText
-20:60bb _RocketHideoutB1FRocketBattleText
-20:60ef _RocketHideoutB1FRocketEndBattleText
-20:60fd _RocketHideoutB1FRocketAfterBattleText
+20:60bb _RocketHideoutB2FRocketBattleText
+20:60ef _RocketHideoutB2FRocketEndBattleText
+20:60fd _RocketHideoutB2FRocketAfterBattleText
 20:6140 _RocketHideoutB3FRocket1BattleText
 20:6168 _RocketHideoutB3FRocket1EndBattleText
 20:617a _RocketHideoutB3FRocket1AfterBattleText
@@ -15060,15 +15060,15 @@
 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText
 20:626c _RocketHideoutB4FGiovanniWhatCannotBeText
 20:6283 _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-20:6326 _RocketHideoutB4FGiovanniBattleText
-20:6354 _RocketHideoutB4FGiovanniEndBattleText
-20:6363 _RocketHideoutB4FGiovanniAfterBattleText
-20:638f _RocketHideoutB4FRocket1BattleText
-20:63bc _RocketHideoutB4FRocket1EndBattleText
-20:63c4 _RocketHideoutB4FRocket1AfterBattleText
-20:63e2 _RocketHideoutB4FRocket2BattleText
-20:6413 _RocketHideoutB4FRocket2EndBattleText
-20:6418 _RocketHideoutB4FRocket2AfterBattleText
+20:6326 _RocketHideoutB4FRocket1BattleText
+20:6354 _RocketHideoutB4FRocket1EndBattleText
+20:6363 _RocketHideoutB4FRocket1AfterBattleText
+20:638f _RocketHideoutB4FRocket2BattleText
+20:63bc _RocketHideoutB4FRocket2EndBattleText
+20:63c4 _RocketHideoutB4FRocket2AfterBattleText
+20:63e2 _RocketHideoutB4FRocket3BattleText
+20:6413 _RocketHideoutB4FRocket3EndBattleText
+20:6418 _RocketHideoutB4FRocket3AfterBattleText
 20:6438 _RocketHideoutElevatorAppearsToNeedKeyText
 20:6454 SilphCo2FSilphWorkerFPleaseTakeThisText
 20:64ba _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15133,8 +15133,8 @@
 21:42a7 _SilphCo6FSilphWorkerM3TargetedSilphText
 21:42dd _SilphCo6FSilphWorkerM3WorkForSilphText
 21:4306 _SilphCo6FRocket1BattleText
-21:432a _SilphCo6Rocket1EndBattleText
-21:4336 _SilphCo6Rocket1AfterBattleText
+21:432a _SilphCo6FRocket1EndBattleText
+21:4336 _SilphCo6FRocket1AfterBattleText
 21:435e _SilphCo6FScientistBattleText
 21:43a4 _SilphCo6FScientistEndBattleText
 21:43ac _SilphCo6FScientistAfterBattleText
@@ -15808,7 +15808,7 @@
 23:5f7e _Route8SuperNerd2EndBattleText
 23:5f90 _Route8SuperNerd2AfterBattleText
 23:5fc0 _Route8CooltrainerF1BattleText
-23:5fe4 _Route8CooltrainerF21EndBattleText
+23:5fe4 _Route8CooltrainerF1EndBattleText
 23:5ff0 _Route8CooltrainerF1AfterBattleText
 23:6028 _Route8SuperNerd3BattleText
 23:6049 _Route8SuperNerd3EndBattleText
--- a/pokeblue_debug.map
+++ b/pokeblue_debug.map
@@ -4331,8 +4331,8 @@ ROMX bank #6:
 	         $62b3 = SilphCo6FSilphWorkerM3Text.WorkForSilphText
 	         $62b8 = SilphCo6FRocket1Text
 	         $62c2 = SilphCo6FRocket1BattleText
-	         $62c7 = SilphCo6Rocket1EndBattleText
-	         $62cc = SilphCo6Rocket1AfterBattleText
+	         $62c7 = SilphCo6FRocket1EndBattleText
+	         $62cc = SilphCo6FRocket1AfterBattleText
 	         $62d1 = SilphCo6FScientistText
 	         $62db = SilphCo6FScientistBattleText
 	         $62e0 = SilphCo6FScientistEndBattleText
@@ -8181,9 +8181,9 @@ ROMX bank #17:
 	         $50d1 = RocketHideout2TrainerHeaders
 	         $50d1 = RocketHideout2TrainerHeader0
 	         $50de = RocketHideoutB2FRocketText
-	         $50e8 = RocketHideoutB1FRocketBattleText
-	         $50ed = RocketHideoutB1FRocketEndBattleText
-	         $50f2 = RocketHideoutB1FRocketAfterBattleText
+	         $50e8 = RocketHideoutB2FRocketBattleText
+	         $50ed = RocketHideoutB2FRocketEndBattleText
+	         $50f2 = RocketHideoutB2FRocketAfterBattleText
 	         $50f7 = RocketHideoutB2F_Object
 	         $5147 = RocketHideoutB2F_Blocks
 	         $5219 = RocketHideoutB3F_h
@@ -8239,19 +8239,19 @@ ROMX bank #17:
 	         $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText
 	         $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	         $5589 = RocketHideoutB4FRocket1Text
-	         $5593 = RocketHideoutB4FGiovanniBattleText
-	         $5598 = RocketHideoutB4FGiovanniEndBattleText
-	         $559d = RocketHideoutB4FGiovanniAfterBattleText
+	         $5593 = RocketHideoutB4FRocket1BattleText
+	         $5598 = RocketHideoutB4FRocket1EndBattleText
+	         $559d = RocketHideoutB4FRocket1AfterBattleText
 	         $55a2 = RocketHideoutB4FRocket2Text
-	         $55ac = RocketHideoutB4FRocket1BattleText
-	         $55b1 = RocketHideoutB4FRocket1EndBattleText
-	         $55b6 = RocketHideoutB4FRocket1AfterBattleText
+	         $55ac = RocketHideoutB4FRocket2BattleText
+	         $55b1 = RocketHideoutB4FRocket2EndBattleText
+	         $55b6 = RocketHideoutB4FRocket2AfterBattleText
 	         $55bb = RocketHideoutB4FRocket3Text
-	         $55c5 = RocketHideoutB4FRocket2BattleText
-	         $55ca = RocketHideoutB4FRocket2EndBattleText
-	         $55cf = RocketHideoutB4FRocket2AfterBattleText
-	         $55e9 = RocketHideoutB4FRocket2AfterBattleText.done
-	         $55ec = RocketHideoutB4FRocket2AfterBattleText.Text
+	         $55c5 = RocketHideoutB4FRocket3BattleText
+	         $55ca = RocketHideoutB4FRocket3EndBattleText
+	         $55cf = RocketHideoutB4FRocket3AfterBattleText
+	         $55e9 = RocketHideoutB4FRocket3AfterBattleText.done
+	         $55ec = RocketHideoutB4FRocket3AfterBattleText.Text
 	         $55f1 = RocketHideoutB4F_Object
 	         $5650 = RocketHideoutB4F_Blocks
 	         $5704 = RocketHideoutElevator_h
@@ -8259,7 +8259,7 @@ ROMX bank #17:
 	         $572c = RocketHideoutElevatorStoreWarpEntriesScript
 	         $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 	         $5741 = RocketHideoutElevatorScript
-	         $5754 = RocketHideoutElavatorFloors
+	         $5754 = RocketHideoutElevatorFloors
 	         $5759 = RocketHideoutElevatorWarpMaps
 	         $575f = RocketHideoutElevatorShakeScript
 	         $575f = RocketHideoutElevatorWarpMaps.End
@@ -10726,7 +10726,7 @@ ROMX bank #22:
 	         $5296 = Route8SuperNerd2AfterBattleText
 	         $529b = Route8CooltrainerF1Text
 	         $52a5 = Route8CooltrainerF1BattleText
-	         $52aa = Route8CooltrainerF21EndBattleText
+	         $52aa = Route8CooltrainerF1EndBattleText
 	         $52af = Route8CooltrainerF1AfterBattleText
 	         $52b4 = Route8SuperNerd3Text
 	         $52be = Route8SuperNerd3BattleText
@@ -15298,9 +15298,9 @@ ROMX bank #32:
 	         $6047 = _RocketHideoutB1FRocket4AfterBattleText
 	         $6078 = _RocketHideoutB1FRocket5BattleText
 	         $6097 = _RocketHideoutB1FRocket5AfterBattleText
-	         $60bb = _RocketHideoutB1FRocketBattleText
-	         $60ef = _RocketHideoutB1FRocketEndBattleText
-	         $60fd = _RocketHideoutB1FRocketAfterBattleText
+	         $60bb = _RocketHideoutB2FRocketBattleText
+	         $60ef = _RocketHideoutB2FRocketEndBattleText
+	         $60fd = _RocketHideoutB2FRocketAfterBattleText
 	         $6140 = _RocketHideoutB3FRocket1BattleText
 	         $6168 = _RocketHideoutB3FRocket1EndBattleText
 	         $617a = _RocketHideoutB3FRocket1AfterBattleText
@@ -15310,15 +15310,15 @@ ROMX bank #32:
 	         $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText
 	         $626c = _RocketHideoutB4FGiovanniWhatCannotBeText
 	         $6283 = _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-	         $6326 = _RocketHideoutB4FGiovanniBattleText
-	         $6354 = _RocketHideoutB4FGiovanniEndBattleText
-	         $6363 = _RocketHideoutB4FGiovanniAfterBattleText
-	         $638f = _RocketHideoutB4FRocket1BattleText
-	         $63bc = _RocketHideoutB4FRocket1EndBattleText
-	         $63c4 = _RocketHideoutB4FRocket1AfterBattleText
-	         $63e2 = _RocketHideoutB4FRocket2BattleText
-	         $6413 = _RocketHideoutB4FRocket2EndBattleText
-	         $6418 = _RocketHideoutB4FRocket2AfterBattleText
+	         $6326 = _RocketHideoutB4FRocket1BattleText
+	         $6354 = _RocketHideoutB4FRocket1EndBattleText
+	         $6363 = _RocketHideoutB4FRocket1AfterBattleText
+	         $638f = _RocketHideoutB4FRocket2BattleText
+	         $63bc = _RocketHideoutB4FRocket2EndBattleText
+	         $63c4 = _RocketHideoutB4FRocket2AfterBattleText
+	         $63e2 = _RocketHideoutB4FRocket3BattleText
+	         $6413 = _RocketHideoutB4FRocket3EndBattleText
+	         $6418 = _RocketHideoutB4FRocket3AfterBattleText
 	         $6438 = _RocketHideoutElevatorAppearsToNeedKeyText
 	         $6454 = SilphCo2FSilphWorkerFPleaseTakeThisText
 	         $64ba = _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15388,8 +15388,8 @@ ROMX bank #33:
 	         $42a7 = _SilphCo6FSilphWorkerM3TargetedSilphText
 	         $42dd = _SilphCo6FSilphWorkerM3WorkForSilphText
 	         $4306 = _SilphCo6FRocket1BattleText
-	         $432a = _SilphCo6Rocket1EndBattleText
-	         $4336 = _SilphCo6Rocket1AfterBattleText
+	         $432a = _SilphCo6FRocket1EndBattleText
+	         $4336 = _SilphCo6FRocket1AfterBattleText
 	         $435e = _SilphCo6FScientistBattleText
 	         $43a4 = _SilphCo6FScientistEndBattleText
 	         $43ac = _SilphCo6FScientistAfterBattleText
@@ -16073,7 +16073,7 @@ ROMX bank #35:
 	         $5f7e = _Route8SuperNerd2EndBattleText
 	         $5f90 = _Route8SuperNerd2AfterBattleText
 	         $5fc0 = _Route8CooltrainerF1BattleText
-	         $5fe4 = _Route8CooltrainerF21EndBattleText
+	         $5fe4 = _Route8CooltrainerF1EndBattleText
 	         $5ff0 = _Route8CooltrainerF1AfterBattleText
 	         $6028 = _Route8SuperNerd3BattleText
 	         $6049 = _Route8SuperNerd3EndBattleText
--- a/pokeblue_debug.sym
+++ b/pokeblue_debug.sym
@@ -4267,8 +4267,8 @@
 06:62b3 SilphCo6FSilphWorkerM3Text.WorkForSilphText
 06:62b8 SilphCo6FRocket1Text
 06:62c2 SilphCo6FRocket1BattleText
-06:62c7 SilphCo6Rocket1EndBattleText
-06:62cc SilphCo6Rocket1AfterBattleText
+06:62c7 SilphCo6FRocket1EndBattleText
+06:62cc SilphCo6FRocket1AfterBattleText
 06:62d1 SilphCo6FScientistText
 06:62db SilphCo6FScientistBattleText
 06:62e0 SilphCo6FScientistEndBattleText
@@ -8045,9 +8045,9 @@
 11:50d1 RocketHideout2TrainerHeaders
 11:50d1 RocketHideout2TrainerHeader0
 11:50de RocketHideoutB2FRocketText
-11:50e8 RocketHideoutB1FRocketBattleText
-11:50ed RocketHideoutB1FRocketEndBattleText
-11:50f2 RocketHideoutB1FRocketAfterBattleText
+11:50e8 RocketHideoutB2FRocketBattleText
+11:50ed RocketHideoutB2FRocketEndBattleText
+11:50f2 RocketHideoutB2FRocketAfterBattleText
 11:50f7 RocketHideoutB2F_Object
 11:5147 RocketHideoutB2F_Blocks
 11:5219 RocketHideoutB3F_h
@@ -8103,19 +8103,19 @@
 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText
 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText
 11:5589 RocketHideoutB4FRocket1Text
-11:5593 RocketHideoutB4FGiovanniBattleText
-11:5598 RocketHideoutB4FGiovanniEndBattleText
-11:559d RocketHideoutB4FGiovanniAfterBattleText
+11:5593 RocketHideoutB4FRocket1BattleText
+11:5598 RocketHideoutB4FRocket1EndBattleText
+11:559d RocketHideoutB4FRocket1AfterBattleText
 11:55a2 RocketHideoutB4FRocket2Text
-11:55ac RocketHideoutB4FRocket1BattleText
-11:55b1 RocketHideoutB4FRocket1EndBattleText
-11:55b6 RocketHideoutB4FRocket1AfterBattleText
+11:55ac RocketHideoutB4FRocket2BattleText
+11:55b1 RocketHideoutB4FRocket2EndBattleText
+11:55b6 RocketHideoutB4FRocket2AfterBattleText
 11:55bb RocketHideoutB4FRocket3Text
-11:55c5 RocketHideoutB4FRocket2BattleText
-11:55ca RocketHideoutB4FRocket2EndBattleText
-11:55cf RocketHideoutB4FRocket2AfterBattleText
-11:55e9 RocketHideoutB4FRocket2AfterBattleText.done
-11:55ec RocketHideoutB4FRocket2AfterBattleText.Text
+11:55c5 RocketHideoutB4FRocket3BattleText
+11:55ca RocketHideoutB4FRocket3EndBattleText
+11:55cf RocketHideoutB4FRocket3AfterBattleText
+11:55e9 RocketHideoutB4FRocket3AfterBattleText.done
+11:55ec RocketHideoutB4FRocket3AfterBattleText.Text
 11:55f1 RocketHideoutB4F_Object
 11:5650 RocketHideoutB4F_Blocks
 11:5704 RocketHideoutElevator_h
@@ -8123,7 +8123,7 @@
 11:572c RocketHideoutElevatorStoreWarpEntriesScript
 11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 11:5741 RocketHideoutElevatorScript
-11:5754 RocketHideoutElavatorFloors
+11:5754 RocketHideoutElevatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
 11:575f RocketHideoutElevatorWarpMaps.End
 11:575f RocketHideoutElevatorShakeScript
@@ -10552,7 +10552,7 @@
 16:5296 Route8SuperNerd2AfterBattleText
 16:529b Route8CooltrainerF1Text
 16:52a5 Route8CooltrainerF1BattleText
-16:52aa Route8CooltrainerF21EndBattleText
+16:52aa Route8CooltrainerF1EndBattleText
 16:52af Route8CooltrainerF1AfterBattleText
 16:52b4 Route8SuperNerd3Text
 16:52be Route8SuperNerd3BattleText
@@ -15058,9 +15058,9 @@
 20:6047 _RocketHideoutB1FRocket4AfterBattleText
 20:6078 _RocketHideoutB1FRocket5BattleText
 20:6097 _RocketHideoutB1FRocket5AfterBattleText
-20:60bb _RocketHideoutB1FRocketBattleText
-20:60ef _RocketHideoutB1FRocketEndBattleText
-20:60fd _RocketHideoutB1FRocketAfterBattleText
+20:60bb _RocketHideoutB2FRocketBattleText
+20:60ef _RocketHideoutB2FRocketEndBattleText
+20:60fd _RocketHideoutB2FRocketAfterBattleText
 20:6140 _RocketHideoutB3FRocket1BattleText
 20:6168 _RocketHideoutB3FRocket1EndBattleText
 20:617a _RocketHideoutB3FRocket1AfterBattleText
@@ -15070,15 +15070,15 @@
 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText
 20:626c _RocketHideoutB4FGiovanniWhatCannotBeText
 20:6283 _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-20:6326 _RocketHideoutB4FGiovanniBattleText
-20:6354 _RocketHideoutB4FGiovanniEndBattleText
-20:6363 _RocketHideoutB4FGiovanniAfterBattleText
-20:638f _RocketHideoutB4FRocket1BattleText
-20:63bc _RocketHideoutB4FRocket1EndBattleText
-20:63c4 _RocketHideoutB4FRocket1AfterBattleText
-20:63e2 _RocketHideoutB4FRocket2BattleText
-20:6413 _RocketHideoutB4FRocket2EndBattleText
-20:6418 _RocketHideoutB4FRocket2AfterBattleText
+20:6326 _RocketHideoutB4FRocket1BattleText
+20:6354 _RocketHideoutB4FRocket1EndBattleText
+20:6363 _RocketHideoutB4FRocket1AfterBattleText
+20:638f _RocketHideoutB4FRocket2BattleText
+20:63bc _RocketHideoutB4FRocket2EndBattleText
+20:63c4 _RocketHideoutB4FRocket2AfterBattleText
+20:63e2 _RocketHideoutB4FRocket3BattleText
+20:6413 _RocketHideoutB4FRocket3EndBattleText
+20:6418 _RocketHideoutB4FRocket3AfterBattleText
 20:6438 _RocketHideoutElevatorAppearsToNeedKeyText
 20:6454 SilphCo2FSilphWorkerFPleaseTakeThisText
 20:64ba _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15143,8 +15143,8 @@
 21:42a7 _SilphCo6FSilphWorkerM3TargetedSilphText
 21:42dd _SilphCo6FSilphWorkerM3WorkForSilphText
 21:4306 _SilphCo6FRocket1BattleText
-21:432a _SilphCo6Rocket1EndBattleText
-21:4336 _SilphCo6Rocket1AfterBattleText
+21:432a _SilphCo6FRocket1EndBattleText
+21:4336 _SilphCo6FRocket1AfterBattleText
 21:435e _SilphCo6FScientistBattleText
 21:43a4 _SilphCo6FScientistEndBattleText
 21:43ac _SilphCo6FScientistAfterBattleText
@@ -15818,7 +15818,7 @@
 23:5f7e _Route8SuperNerd2EndBattleText
 23:5f90 _Route8SuperNerd2AfterBattleText
 23:5fc0 _Route8CooltrainerF1BattleText
-23:5fe4 _Route8CooltrainerF21EndBattleText
+23:5fe4 _Route8CooltrainerF1EndBattleText
 23:5ff0 _Route8CooltrainerF1AfterBattleText
 23:6028 _Route8SuperNerd3BattleText
 23:6049 _Route8SuperNerd3EndBattleText
--- a/pokeblue_vc.map
+++ b/pokeblue_vc.map
@@ -4337,8 +4337,8 @@ ROMX bank #6:
 	         $62ab = SilphCo6FSilphWorkerM3Text.WorkForSilphText
 	         $62b0 = SilphCo6FRocket1Text
 	         $62ba = SilphCo6FRocket1BattleText
-	         $62bf = SilphCo6Rocket1EndBattleText
-	         $62c4 = SilphCo6Rocket1AfterBattleText
+	         $62bf = SilphCo6FRocket1EndBattleText
+	         $62c4 = SilphCo6FRocket1AfterBattleText
 	         $62c9 = SilphCo6FScientistText
 	         $62d3 = SilphCo6FScientistBattleText
 	         $62d8 = SilphCo6FScientistEndBattleText
@@ -8198,9 +8198,9 @@ ROMX bank #17:
 	         $50d1 = RocketHideout2TrainerHeaders
 	         $50d1 = RocketHideout2TrainerHeader0
 	         $50de = RocketHideoutB2FRocketText
-	         $50e8 = RocketHideoutB1FRocketBattleText
-	         $50ed = RocketHideoutB1FRocketEndBattleText
-	         $50f2 = RocketHideoutB1FRocketAfterBattleText
+	         $50e8 = RocketHideoutB2FRocketBattleText
+	         $50ed = RocketHideoutB2FRocketEndBattleText
+	         $50f2 = RocketHideoutB2FRocketAfterBattleText
 	         $50f7 = RocketHideoutB2F_Object
 	         $5147 = RocketHideoutB2F_Blocks
 	         $5219 = RocketHideoutB3F_h
@@ -8256,19 +8256,19 @@ ROMX bank #17:
 	         $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText
 	         $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	         $5589 = RocketHideoutB4FRocket1Text
-	         $5593 = RocketHideoutB4FGiovanniBattleText
-	         $5598 = RocketHideoutB4FGiovanniEndBattleText
-	         $559d = RocketHideoutB4FGiovanniAfterBattleText
+	         $5593 = RocketHideoutB4FRocket1BattleText
+	         $5598 = RocketHideoutB4FRocket1EndBattleText
+	         $559d = RocketHideoutB4FRocket1AfterBattleText
 	         $55a2 = RocketHideoutB4FRocket2Text
-	         $55ac = RocketHideoutB4FRocket1BattleText
-	         $55b1 = RocketHideoutB4FRocket1EndBattleText
-	         $55b6 = RocketHideoutB4FRocket1AfterBattleText
+	         $55ac = RocketHideoutB4FRocket2BattleText
+	         $55b1 = RocketHideoutB4FRocket2EndBattleText
+	         $55b6 = RocketHideoutB4FRocket2AfterBattleText
 	         $55bb = RocketHideoutB4FRocket3Text
-	         $55c5 = RocketHideoutB4FRocket2BattleText
-	         $55ca = RocketHideoutB4FRocket2EndBattleText
-	         $55cf = RocketHideoutB4FRocket2AfterBattleText
-	         $55e9 = RocketHideoutB4FRocket2AfterBattleText.done
-	         $55ec = RocketHideoutB4FRocket2AfterBattleText.Text
+	         $55c5 = RocketHideoutB4FRocket3BattleText
+	         $55ca = RocketHideoutB4FRocket3EndBattleText
+	         $55cf = RocketHideoutB4FRocket3AfterBattleText
+	         $55e9 = RocketHideoutB4FRocket3AfterBattleText.done
+	         $55ec = RocketHideoutB4FRocket3AfterBattleText.Text
 	         $55f1 = RocketHideoutB4F_Object
 	         $5650 = RocketHideoutB4F_Blocks
 	         $5704 = RocketHideoutElevator_h
@@ -8276,7 +8276,7 @@ ROMX bank #17:
 	         $572c = RocketHideoutElevatorStoreWarpEntriesScript
 	         $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 	         $5741 = RocketHideoutElevatorScript
-	         $5754 = RocketHideoutElavatorFloors
+	         $5754 = RocketHideoutElevatorFloors
 	         $5759 = RocketHideoutElevatorWarpMaps
 	         $575f = RocketHideoutElevatorShakeScript
 	         $575f = RocketHideoutElevatorWarpMaps.End
@@ -10743,7 +10743,7 @@ ROMX bank #22:
 	         $5296 = Route8SuperNerd2AfterBattleText
 	         $529b = Route8CooltrainerF1Text
 	         $52a5 = Route8CooltrainerF1BattleText
-	         $52aa = Route8CooltrainerF21EndBattleText
+	         $52aa = Route8CooltrainerF1EndBattleText
 	         $52af = Route8CooltrainerF1AfterBattleText
 	         $52b4 = Route8SuperNerd3Text
 	         $52be = Route8SuperNerd3BattleText
@@ -15338,9 +15338,9 @@ ROMX bank #32:
 	         $6047 = _RocketHideoutB1FRocket4AfterBattleText
 	         $6078 = _RocketHideoutB1FRocket5BattleText
 	         $6097 = _RocketHideoutB1FRocket5AfterBattleText
-	         $60bb = _RocketHideoutB1FRocketBattleText
-	         $60ef = _RocketHideoutB1FRocketEndBattleText
-	         $60fd = _RocketHideoutB1FRocketAfterBattleText
+	         $60bb = _RocketHideoutB2FRocketBattleText
+	         $60ef = _RocketHideoutB2FRocketEndBattleText
+	         $60fd = _RocketHideoutB2FRocketAfterBattleText
 	         $6140 = _RocketHideoutB3FRocket1BattleText
 	         $6168 = _RocketHideoutB3FRocket1EndBattleText
 	         $617a = _RocketHideoutB3FRocket1AfterBattleText
@@ -15350,15 +15350,15 @@ ROMX bank #32:
 	         $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText
 	         $626c = _RocketHideoutB4FGiovanniWhatCannotBeText
 	         $6283 = _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-	         $6326 = _RocketHideoutB4FGiovanniBattleText
-	         $6354 = _RocketHideoutB4FGiovanniEndBattleText
-	         $6363 = _RocketHideoutB4FGiovanniAfterBattleText
-	         $638f = _RocketHideoutB4FRocket1BattleText
-	         $63bc = _RocketHideoutB4FRocket1EndBattleText
-	         $63c4 = _RocketHideoutB4FRocket1AfterBattleText
-	         $63e2 = _RocketHideoutB4FRocket2BattleText
-	         $6413 = _RocketHideoutB4FRocket2EndBattleText
-	         $6418 = _RocketHideoutB4FRocket2AfterBattleText
+	         $6326 = _RocketHideoutB4FRocket1BattleText
+	         $6354 = _RocketHideoutB4FRocket1EndBattleText
+	         $6363 = _RocketHideoutB4FRocket1AfterBattleText
+	         $638f = _RocketHideoutB4FRocket2BattleText
+	         $63bc = _RocketHideoutB4FRocket2EndBattleText
+	         $63c4 = _RocketHideoutB4FRocket2AfterBattleText
+	         $63e2 = _RocketHideoutB4FRocket3BattleText
+	         $6413 = _RocketHideoutB4FRocket3EndBattleText
+	         $6418 = _RocketHideoutB4FRocket3AfterBattleText
 	         $6438 = _RocketHideoutElevatorAppearsToNeedKeyText
 	         $6454 = SilphCo2FSilphWorkerFPleaseTakeThisText
 	         $64ba = _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15428,8 +15428,8 @@ ROMX bank #33:
 	         $42a7 = _SilphCo6FSilphWorkerM3TargetedSilphText
 	         $42dd = _SilphCo6FSilphWorkerM3WorkForSilphText
 	         $4306 = _SilphCo6FRocket1BattleText
-	         $432a = _SilphCo6Rocket1EndBattleText
-	         $4336 = _SilphCo6Rocket1AfterBattleText
+	         $432a = _SilphCo6FRocket1EndBattleText
+	         $4336 = _SilphCo6FRocket1AfterBattleText
 	         $435e = _SilphCo6FScientistBattleText
 	         $43a4 = _SilphCo6FScientistEndBattleText
 	         $43ac = _SilphCo6FScientistAfterBattleText
@@ -16113,7 +16113,7 @@ ROMX bank #35:
 	         $5f7e = _Route8SuperNerd2EndBattleText
 	         $5f90 = _Route8SuperNerd2AfterBattleText
 	         $5fc0 = _Route8CooltrainerF1BattleText
-	         $5fe4 = _Route8CooltrainerF21EndBattleText
+	         $5fe4 = _Route8CooltrainerF1EndBattleText
 	         $5ff0 = _Route8CooltrainerF1AfterBattleText
 	         $6028 = _Route8SuperNerd3BattleText
 	         $6049 = _Route8SuperNerd3EndBattleText
--- a/pokeblue_vc.sym
+++ b/pokeblue_vc.sym
@@ -4273,8 +4273,8 @@
 06:62ab SilphCo6FSilphWorkerM3Text.WorkForSilphText
 06:62b0 SilphCo6FRocket1Text
 06:62ba SilphCo6FRocket1BattleText
-06:62bf SilphCo6Rocket1EndBattleText
-06:62c4 SilphCo6Rocket1AfterBattleText
+06:62bf SilphCo6FRocket1EndBattleText
+06:62c4 SilphCo6FRocket1AfterBattleText
 06:62c9 SilphCo6FScientistText
 06:62d3 SilphCo6FScientistBattleText
 06:62d8 SilphCo6FScientistEndBattleText
@@ -8062,9 +8062,9 @@
 11:50d1 RocketHideout2TrainerHeaders
 11:50d1 RocketHideout2TrainerHeader0
 11:50de RocketHideoutB2FRocketText
-11:50e8 RocketHideoutB1FRocketBattleText
-11:50ed RocketHideoutB1FRocketEndBattleText
-11:50f2 RocketHideoutB1FRocketAfterBattleText
+11:50e8 RocketHideoutB2FRocketBattleText
+11:50ed RocketHideoutB2FRocketEndBattleText
+11:50f2 RocketHideoutB2FRocketAfterBattleText
 11:50f7 RocketHideoutB2F_Object
 11:5147 RocketHideoutB2F_Blocks
 11:5219 RocketHideoutB3F_h
@@ -8120,19 +8120,19 @@
 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText
 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText
 11:5589 RocketHideoutB4FRocket1Text
-11:5593 RocketHideoutB4FGiovanniBattleText
-11:5598 RocketHideoutB4FGiovanniEndBattleText
-11:559d RocketHideoutB4FGiovanniAfterBattleText
+11:5593 RocketHideoutB4FRocket1BattleText
+11:5598 RocketHideoutB4FRocket1EndBattleText
+11:559d RocketHideoutB4FRocket1AfterBattleText
 11:55a2 RocketHideoutB4FRocket2Text
-11:55ac RocketHideoutB4FRocket1BattleText
-11:55b1 RocketHideoutB4FRocket1EndBattleText
-11:55b6 RocketHideoutB4FRocket1AfterBattleText
+11:55ac RocketHideoutB4FRocket2BattleText
+11:55b1 RocketHideoutB4FRocket2EndBattleText
+11:55b6 RocketHideoutB4FRocket2AfterBattleText
 11:55bb RocketHideoutB4FRocket3Text
-11:55c5 RocketHideoutB4FRocket2BattleText
-11:55ca RocketHideoutB4FRocket2EndBattleText
-11:55cf RocketHideoutB4FRocket2AfterBattleText
-11:55e9 RocketHideoutB4FRocket2AfterBattleText.done
-11:55ec RocketHideoutB4FRocket2AfterBattleText.Text
+11:55c5 RocketHideoutB4FRocket3BattleText
+11:55ca RocketHideoutB4FRocket3EndBattleText
+11:55cf RocketHideoutB4FRocket3AfterBattleText
+11:55e9 RocketHideoutB4FRocket3AfterBattleText.done
+11:55ec RocketHideoutB4FRocket3AfterBattleText.Text
 11:55f1 RocketHideoutB4F_Object
 11:5650 RocketHideoutB4F_Blocks
 11:5704 RocketHideoutElevator_h
@@ -8140,7 +8140,7 @@
 11:572c RocketHideoutElevatorStoreWarpEntriesScript
 11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 11:5741 RocketHideoutElevatorScript
-11:5754 RocketHideoutElavatorFloors
+11:5754 RocketHideoutElevatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
 11:575f RocketHideoutElevatorWarpMaps.End
 11:575f RocketHideoutElevatorShakeScript
@@ -10569,7 +10569,7 @@
 16:5296 Route8SuperNerd2AfterBattleText
 16:529b Route8CooltrainerF1Text
 16:52a5 Route8CooltrainerF1BattleText
-16:52aa Route8CooltrainerF21EndBattleText
+16:52aa Route8CooltrainerF1EndBattleText
 16:52af Route8CooltrainerF1AfterBattleText
 16:52b4 Route8SuperNerd3Text
 16:52be Route8SuperNerd3BattleText
@@ -15098,9 +15098,9 @@
 20:6047 _RocketHideoutB1FRocket4AfterBattleText
 20:6078 _RocketHideoutB1FRocket5BattleText
 20:6097 _RocketHideoutB1FRocket5AfterBattleText
-20:60bb _RocketHideoutB1FRocketBattleText
-20:60ef _RocketHideoutB1FRocketEndBattleText
-20:60fd _RocketHideoutB1FRocketAfterBattleText
+20:60bb _RocketHideoutB2FRocketBattleText
+20:60ef _RocketHideoutB2FRocketEndBattleText
+20:60fd _RocketHideoutB2FRocketAfterBattleText
 20:6140 _RocketHideoutB3FRocket1BattleText
 20:6168 _RocketHideoutB3FRocket1EndBattleText
 20:617a _RocketHideoutB3FRocket1AfterBattleText
@@ -15110,15 +15110,15 @@
 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText
 20:626c _RocketHideoutB4FGiovanniWhatCannotBeText
 20:6283 _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-20:6326 _RocketHideoutB4FGiovanniBattleText
-20:6354 _RocketHideoutB4FGiovanniEndBattleText
-20:6363 _RocketHideoutB4FGiovanniAfterBattleText
-20:638f _RocketHideoutB4FRocket1BattleText
-20:63bc _RocketHideoutB4FRocket1EndBattleText
-20:63c4 _RocketHideoutB4FRocket1AfterBattleText
-20:63e2 _RocketHideoutB4FRocket2BattleText
-20:6413 _RocketHideoutB4FRocket2EndBattleText
-20:6418 _RocketHideoutB4FRocket2AfterBattleText
+20:6326 _RocketHideoutB4FRocket1BattleText
+20:6354 _RocketHideoutB4FRocket1EndBattleText
+20:6363 _RocketHideoutB4FRocket1AfterBattleText
+20:638f _RocketHideoutB4FRocket2BattleText
+20:63bc _RocketHideoutB4FRocket2EndBattleText
+20:63c4 _RocketHideoutB4FRocket2AfterBattleText
+20:63e2 _RocketHideoutB4FRocket3BattleText
+20:6413 _RocketHideoutB4FRocket3EndBattleText
+20:6418 _RocketHideoutB4FRocket3AfterBattleText
 20:6438 _RocketHideoutElevatorAppearsToNeedKeyText
 20:6454 SilphCo2FSilphWorkerFPleaseTakeThisText
 20:64ba _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15183,8 +15183,8 @@
 21:42a7 _SilphCo6FSilphWorkerM3TargetedSilphText
 21:42dd _SilphCo6FSilphWorkerM3WorkForSilphText
 21:4306 _SilphCo6FRocket1BattleText
-21:432a _SilphCo6Rocket1EndBattleText
-21:4336 _SilphCo6Rocket1AfterBattleText
+21:432a _SilphCo6FRocket1EndBattleText
+21:4336 _SilphCo6FRocket1AfterBattleText
 21:435e _SilphCo6FScientistBattleText
 21:43a4 _SilphCo6FScientistEndBattleText
 21:43ac _SilphCo6FScientistAfterBattleText
@@ -15858,7 +15858,7 @@
 23:5f7e _Route8SuperNerd2EndBattleText
 23:5f90 _Route8SuperNerd2AfterBattleText
 23:5fc0 _Route8CooltrainerF1BattleText
-23:5fe4 _Route8CooltrainerF21EndBattleText
+23:5fe4 _Route8CooltrainerF1EndBattleText
 23:5ff0 _Route8CooltrainerF1AfterBattleText
 23:6028 _Route8SuperNerd3BattleText
 23:6049 _Route8SuperNerd3EndBattleText
--- a/pokered.map
+++ b/pokered.map
@@ -4321,8 +4321,8 @@ ROMX bank #6:
 	         $62ab = SilphCo6FSilphWorkerM3Text.WorkForSilphText
 	         $62b0 = SilphCo6FRocket1Text
 	         $62ba = SilphCo6FRocket1BattleText
-	         $62bf = SilphCo6Rocket1EndBattleText
-	         $62c4 = SilphCo6Rocket1AfterBattleText
+	         $62bf = SilphCo6FRocket1EndBattleText
+	         $62c4 = SilphCo6FRocket1AfterBattleText
 	         $62c9 = SilphCo6FScientistText
 	         $62d3 = SilphCo6FScientistBattleText
 	         $62d8 = SilphCo6FScientistEndBattleText
@@ -8171,9 +8171,9 @@ ROMX bank #17:
 	         $50d1 = RocketHideout2TrainerHeaders
 	         $50d1 = RocketHideout2TrainerHeader0
 	         $50de = RocketHideoutB2FRocketText
-	         $50e8 = RocketHideoutB1FRocketBattleText
-	         $50ed = RocketHideoutB1FRocketEndBattleText
-	         $50f2 = RocketHideoutB1FRocketAfterBattleText
+	         $50e8 = RocketHideoutB2FRocketBattleText
+	         $50ed = RocketHideoutB2FRocketEndBattleText
+	         $50f2 = RocketHideoutB2FRocketAfterBattleText
 	         $50f7 = RocketHideoutB2F_Object
 	         $5147 = RocketHideoutB2F_Blocks
 	         $5219 = RocketHideoutB3F_h
@@ -8229,19 +8229,19 @@ ROMX bank #17:
 	         $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText
 	         $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	         $5589 = RocketHideoutB4FRocket1Text
-	         $5593 = RocketHideoutB4FGiovanniBattleText
-	         $5598 = RocketHideoutB4FGiovanniEndBattleText
-	         $559d = RocketHideoutB4FGiovanniAfterBattleText
+	         $5593 = RocketHideoutB4FRocket1BattleText
+	         $5598 = RocketHideoutB4FRocket1EndBattleText
+	         $559d = RocketHideoutB4FRocket1AfterBattleText
 	         $55a2 = RocketHideoutB4FRocket2Text
-	         $55ac = RocketHideoutB4FRocket1BattleText
-	         $55b1 = RocketHideoutB4FRocket1EndBattleText
-	         $55b6 = RocketHideoutB4FRocket1AfterBattleText
+	         $55ac = RocketHideoutB4FRocket2BattleText
+	         $55b1 = RocketHideoutB4FRocket2EndBattleText
+	         $55b6 = RocketHideoutB4FRocket2AfterBattleText
 	         $55bb = RocketHideoutB4FRocket3Text
-	         $55c5 = RocketHideoutB4FRocket2BattleText
-	         $55ca = RocketHideoutB4FRocket2EndBattleText
-	         $55cf = RocketHideoutB4FRocket2AfterBattleText
-	         $55e9 = RocketHideoutB4FRocket2AfterBattleText.done
-	         $55ec = RocketHideoutB4FRocket2AfterBattleText.Text
+	         $55c5 = RocketHideoutB4FRocket3BattleText
+	         $55ca = RocketHideoutB4FRocket3EndBattleText
+	         $55cf = RocketHideoutB4FRocket3AfterBattleText
+	         $55e9 = RocketHideoutB4FRocket3AfterBattleText.done
+	         $55ec = RocketHideoutB4FRocket3AfterBattleText.Text
 	         $55f1 = RocketHideoutB4F_Object
 	         $5650 = RocketHideoutB4F_Blocks
 	         $5704 = RocketHideoutElevator_h
@@ -8249,7 +8249,7 @@ ROMX bank #17:
 	         $572c = RocketHideoutElevatorStoreWarpEntriesScript
 	         $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 	         $5741 = RocketHideoutElevatorScript
-	         $5754 = RocketHideoutElavatorFloors
+	         $5754 = RocketHideoutElevatorFloors
 	         $5759 = RocketHideoutElevatorWarpMaps
 	         $575f = RocketHideoutElevatorShakeScript
 	         $575f = RocketHideoutElevatorWarpMaps.End
@@ -10716,7 +10716,7 @@ ROMX bank #22:
 	         $5296 = Route8SuperNerd2AfterBattleText
 	         $529b = Route8CooltrainerF1Text
 	         $52a5 = Route8CooltrainerF1BattleText
-	         $52aa = Route8CooltrainerF21EndBattleText
+	         $52aa = Route8CooltrainerF1EndBattleText
 	         $52af = Route8CooltrainerF1AfterBattleText
 	         $52b4 = Route8SuperNerd3Text
 	         $52be = Route8SuperNerd3BattleText
@@ -15288,9 +15288,9 @@ ROMX bank #32:
 	         $6047 = _RocketHideoutB1FRocket4AfterBattleText
 	         $6078 = _RocketHideoutB1FRocket5BattleText
 	         $6097 = _RocketHideoutB1FRocket5AfterBattleText
-	         $60bb = _RocketHideoutB1FRocketBattleText
-	         $60ef = _RocketHideoutB1FRocketEndBattleText
-	         $60fd = _RocketHideoutB1FRocketAfterBattleText
+	         $60bb = _RocketHideoutB2FRocketBattleText
+	         $60ef = _RocketHideoutB2FRocketEndBattleText
+	         $60fd = _RocketHideoutB2FRocketAfterBattleText
 	         $6140 = _RocketHideoutB3FRocket1BattleText
 	         $6168 = _RocketHideoutB3FRocket1EndBattleText
 	         $617a = _RocketHideoutB3FRocket1AfterBattleText
@@ -15300,15 +15300,15 @@ ROMX bank #32:
 	         $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText
 	         $626c = _RocketHideoutB4FGiovanniWhatCannotBeText
 	         $6283 = _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-	         $6326 = _RocketHideoutB4FGiovanniBattleText
-	         $6354 = _RocketHideoutB4FGiovanniEndBattleText
-	         $6363 = _RocketHideoutB4FGiovanniAfterBattleText
-	         $638f = _RocketHideoutB4FRocket1BattleText
-	         $63bc = _RocketHideoutB4FRocket1EndBattleText
-	         $63c4 = _RocketHideoutB4FRocket1AfterBattleText
-	         $63e2 = _RocketHideoutB4FRocket2BattleText
-	         $6413 = _RocketHideoutB4FRocket2EndBattleText
-	         $6418 = _RocketHideoutB4FRocket2AfterBattleText
+	         $6326 = _RocketHideoutB4FRocket1BattleText
+	         $6354 = _RocketHideoutB4FRocket1EndBattleText
+	         $6363 = _RocketHideoutB4FRocket1AfterBattleText
+	         $638f = _RocketHideoutB4FRocket2BattleText
+	         $63bc = _RocketHideoutB4FRocket2EndBattleText
+	         $63c4 = _RocketHideoutB4FRocket2AfterBattleText
+	         $63e2 = _RocketHideoutB4FRocket3BattleText
+	         $6413 = _RocketHideoutB4FRocket3EndBattleText
+	         $6418 = _RocketHideoutB4FRocket3AfterBattleText
 	         $6438 = _RocketHideoutElevatorAppearsToNeedKeyText
 	         $6454 = SilphCo2FSilphWorkerFPleaseTakeThisText
 	         $64ba = _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15378,8 +15378,8 @@ ROMX bank #33:
 	         $42a7 = _SilphCo6FSilphWorkerM3TargetedSilphText
 	         $42dd = _SilphCo6FSilphWorkerM3WorkForSilphText
 	         $4306 = _SilphCo6FRocket1BattleText
-	         $432a = _SilphCo6Rocket1EndBattleText
-	         $4336 = _SilphCo6Rocket1AfterBattleText
+	         $432a = _SilphCo6FRocket1EndBattleText
+	         $4336 = _SilphCo6FRocket1AfterBattleText
 	         $435e = _SilphCo6FScientistBattleText
 	         $43a4 = _SilphCo6FScientistEndBattleText
 	         $43ac = _SilphCo6FScientistAfterBattleText
@@ -16063,7 +16063,7 @@ ROMX bank #35:
 	         $5f7e = _Route8SuperNerd2EndBattleText
 	         $5f90 = _Route8SuperNerd2AfterBattleText
 	         $5fc0 = _Route8CooltrainerF1BattleText
-	         $5fe4 = _Route8CooltrainerF21EndBattleText
+	         $5fe4 = _Route8CooltrainerF1EndBattleText
 	         $5ff0 = _Route8CooltrainerF1AfterBattleText
 	         $6028 = _Route8SuperNerd3BattleText
 	         $6049 = _Route8SuperNerd3EndBattleText
--- a/pokered.sym
+++ b/pokered.sym
@@ -4257,8 +4257,8 @@
 06:62ab SilphCo6FSilphWorkerM3Text.WorkForSilphText
 06:62b0 SilphCo6FRocket1Text
 06:62ba SilphCo6FRocket1BattleText
-06:62bf SilphCo6Rocket1EndBattleText
-06:62c4 SilphCo6Rocket1AfterBattleText
+06:62bf SilphCo6FRocket1EndBattleText
+06:62c4 SilphCo6FRocket1AfterBattleText
 06:62c9 SilphCo6FScientistText
 06:62d3 SilphCo6FScientistBattleText
 06:62d8 SilphCo6FScientistEndBattleText
@@ -8035,9 +8035,9 @@
 11:50d1 RocketHideout2TrainerHeaders
 11:50d1 RocketHideout2TrainerHeader0
 11:50de RocketHideoutB2FRocketText
-11:50e8 RocketHideoutB1FRocketBattleText
-11:50ed RocketHideoutB1FRocketEndBattleText
-11:50f2 RocketHideoutB1FRocketAfterBattleText
+11:50e8 RocketHideoutB2FRocketBattleText
+11:50ed RocketHideoutB2FRocketEndBattleText
+11:50f2 RocketHideoutB2FRocketAfterBattleText
 11:50f7 RocketHideoutB2F_Object
 11:5147 RocketHideoutB2F_Blocks
 11:5219 RocketHideoutB3F_h
@@ -8093,19 +8093,19 @@
 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText
 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText
 11:5589 RocketHideoutB4FRocket1Text
-11:5593 RocketHideoutB4FGiovanniBattleText
-11:5598 RocketHideoutB4FGiovanniEndBattleText
-11:559d RocketHideoutB4FGiovanniAfterBattleText
+11:5593 RocketHideoutB4FRocket1BattleText
+11:5598 RocketHideoutB4FRocket1EndBattleText
+11:559d RocketHideoutB4FRocket1AfterBattleText
 11:55a2 RocketHideoutB4FRocket2Text
-11:55ac RocketHideoutB4FRocket1BattleText
-11:55b1 RocketHideoutB4FRocket1EndBattleText
-11:55b6 RocketHideoutB4FRocket1AfterBattleText
+11:55ac RocketHideoutB4FRocket2BattleText
+11:55b1 RocketHideoutB4FRocket2EndBattleText
+11:55b6 RocketHideoutB4FRocket2AfterBattleText
 11:55bb RocketHideoutB4FRocket3Text
-11:55c5 RocketHideoutB4FRocket2BattleText
-11:55ca RocketHideoutB4FRocket2EndBattleText
-11:55cf RocketHideoutB4FRocket2AfterBattleText
-11:55e9 RocketHideoutB4FRocket2AfterBattleText.done
-11:55ec RocketHideoutB4FRocket2AfterBattleText.Text
+11:55c5 RocketHideoutB4FRocket3BattleText
+11:55ca RocketHideoutB4FRocket3EndBattleText
+11:55cf RocketHideoutB4FRocket3AfterBattleText
+11:55e9 RocketHideoutB4FRocket3AfterBattleText.done
+11:55ec RocketHideoutB4FRocket3AfterBattleText.Text
 11:55f1 RocketHideoutB4F_Object
 11:5650 RocketHideoutB4F_Blocks
 11:5704 RocketHideoutElevator_h
@@ -8113,7 +8113,7 @@
 11:572c RocketHideoutElevatorStoreWarpEntriesScript
 11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 11:5741 RocketHideoutElevatorScript
-11:5754 RocketHideoutElavatorFloors
+11:5754 RocketHideoutElevatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
 11:575f RocketHideoutElevatorWarpMaps.End
 11:575f RocketHideoutElevatorShakeScript
@@ -10542,7 +10542,7 @@
 16:5296 Route8SuperNerd2AfterBattleText
 16:529b Route8CooltrainerF1Text
 16:52a5 Route8CooltrainerF1BattleText
-16:52aa Route8CooltrainerF21EndBattleText
+16:52aa Route8CooltrainerF1EndBattleText
 16:52af Route8CooltrainerF1AfterBattleText
 16:52b4 Route8SuperNerd3Text
 16:52be Route8SuperNerd3BattleText
@@ -15048,9 +15048,9 @@
 20:6047 _RocketHideoutB1FRocket4AfterBattleText
 20:6078 _RocketHideoutB1FRocket5BattleText
 20:6097 _RocketHideoutB1FRocket5AfterBattleText
-20:60bb _RocketHideoutB1FRocketBattleText
-20:60ef _RocketHideoutB1FRocketEndBattleText
-20:60fd _RocketHideoutB1FRocketAfterBattleText
+20:60bb _RocketHideoutB2FRocketBattleText
+20:60ef _RocketHideoutB2FRocketEndBattleText
+20:60fd _RocketHideoutB2FRocketAfterBattleText
 20:6140 _RocketHideoutB3FRocket1BattleText
 20:6168 _RocketHideoutB3FRocket1EndBattleText
 20:617a _RocketHideoutB3FRocket1AfterBattleText
@@ -15060,15 +15060,15 @@
 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText
 20:626c _RocketHideoutB4FGiovanniWhatCannotBeText
 20:6283 _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-20:6326 _RocketHideoutB4FGiovanniBattleText
-20:6354 _RocketHideoutB4FGiovanniEndBattleText
-20:6363 _RocketHideoutB4FGiovanniAfterBattleText
-20:638f _RocketHideoutB4FRocket1BattleText
-20:63bc _RocketHideoutB4FRocket1EndBattleText
-20:63c4 _RocketHideoutB4FRocket1AfterBattleText
-20:63e2 _RocketHideoutB4FRocket2BattleText
-20:6413 _RocketHideoutB4FRocket2EndBattleText
-20:6418 _RocketHideoutB4FRocket2AfterBattleText
+20:6326 _RocketHideoutB4FRocket1BattleText
+20:6354 _RocketHideoutB4FRocket1EndBattleText
+20:6363 _RocketHideoutB4FRocket1AfterBattleText
+20:638f _RocketHideoutB4FRocket2BattleText
+20:63bc _RocketHideoutB4FRocket2EndBattleText
+20:63c4 _RocketHideoutB4FRocket2AfterBattleText
+20:63e2 _RocketHideoutB4FRocket3BattleText
+20:6413 _RocketHideoutB4FRocket3EndBattleText
+20:6418 _RocketHideoutB4FRocket3AfterBattleText
 20:6438 _RocketHideoutElevatorAppearsToNeedKeyText
 20:6454 SilphCo2FSilphWorkerFPleaseTakeThisText
 20:64ba _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15133,8 +15133,8 @@
 21:42a7 _SilphCo6FSilphWorkerM3TargetedSilphText
 21:42dd _SilphCo6FSilphWorkerM3WorkForSilphText
 21:4306 _SilphCo6FRocket1BattleText
-21:432a _SilphCo6Rocket1EndBattleText
-21:4336 _SilphCo6Rocket1AfterBattleText
+21:432a _SilphCo6FRocket1EndBattleText
+21:4336 _SilphCo6FRocket1AfterBattleText
 21:435e _SilphCo6FScientistBattleText
 21:43a4 _SilphCo6FScientistEndBattleText
 21:43ac _SilphCo6FScientistAfterBattleText
@@ -15808,7 +15808,7 @@
 23:5f7e _Route8SuperNerd2EndBattleText
 23:5f90 _Route8SuperNerd2AfterBattleText
 23:5fc0 _Route8CooltrainerF1BattleText
-23:5fe4 _Route8CooltrainerF21EndBattleText
+23:5fe4 _Route8CooltrainerF1EndBattleText
 23:5ff0 _Route8CooltrainerF1AfterBattleText
 23:6028 _Route8SuperNerd3BattleText
 23:6049 _Route8SuperNerd3EndBattleText
--- a/pokered_vc.map
+++ b/pokered_vc.map
@@ -4337,8 +4337,8 @@ ROMX bank #6:
 	         $62ab = SilphCo6FSilphWorkerM3Text.WorkForSilphText
 	         $62b0 = SilphCo6FRocket1Text
 	         $62ba = SilphCo6FRocket1BattleText
-	         $62bf = SilphCo6Rocket1EndBattleText
-	         $62c4 = SilphCo6Rocket1AfterBattleText
+	         $62bf = SilphCo6FRocket1EndBattleText
+	         $62c4 = SilphCo6FRocket1AfterBattleText
 	         $62c9 = SilphCo6FScientistText
 	         $62d3 = SilphCo6FScientistBattleText
 	         $62d8 = SilphCo6FScientistEndBattleText
@@ -8200,9 +8200,9 @@ ROMX bank #17:
 	         $50d1 = RocketHideout2TrainerHeaders
 	         $50d1 = RocketHideout2TrainerHeader0
 	         $50de = RocketHideoutB2FRocketText
-	         $50e8 = RocketHideoutB1FRocketBattleText
-	         $50ed = RocketHideoutB1FRocketEndBattleText
-	         $50f2 = RocketHideoutB1FRocketAfterBattleText
+	         $50e8 = RocketHideoutB2FRocketBattleText
+	         $50ed = RocketHideoutB2FRocketEndBattleText
+	         $50f2 = RocketHideoutB2FRocketAfterBattleText
 	         $50f7 = RocketHideoutB2F_Object
 	         $5147 = RocketHideoutB2F_Blocks
 	         $5219 = RocketHideoutB3F_h
@@ -8258,19 +8258,19 @@ ROMX bank #17:
 	         $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText
 	         $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	         $5589 = RocketHideoutB4FRocket1Text
-	         $5593 = RocketHideoutB4FGiovanniBattleText
-	         $5598 = RocketHideoutB4FGiovanniEndBattleText
-	         $559d = RocketHideoutB4FGiovanniAfterBattleText
+	         $5593 = RocketHideoutB4FRocket1BattleText
+	         $5598 = RocketHideoutB4FRocket1EndBattleText
+	         $559d = RocketHideoutB4FRocket1AfterBattleText
 	         $55a2 = RocketHideoutB4FRocket2Text
-	         $55ac = RocketHideoutB4FRocket1BattleText
-	         $55b1 = RocketHideoutB4FRocket1EndBattleText
-	         $55b6 = RocketHideoutB4FRocket1AfterBattleText
+	         $55ac = RocketHideoutB4FRocket2BattleText
+	         $55b1 = RocketHideoutB4FRocket2EndBattleText
+	         $55b6 = RocketHideoutB4FRocket2AfterBattleText
 	         $55bb = RocketHideoutB4FRocket3Text
-	         $55c5 = RocketHideoutB4FRocket2BattleText
-	         $55ca = RocketHideoutB4FRocket2EndBattleText
-	         $55cf = RocketHideoutB4FRocket2AfterBattleText
-	         $55e9 = RocketHideoutB4FRocket2AfterBattleText.done
-	         $55ec = RocketHideoutB4FRocket2AfterBattleText.Text
+	         $55c5 = RocketHideoutB4FRocket3BattleText
+	         $55ca = RocketHideoutB4FRocket3EndBattleText
+	         $55cf = RocketHideoutB4FRocket3AfterBattleText
+	         $55e9 = RocketHideoutB4FRocket3AfterBattleText.done
+	         $55ec = RocketHideoutB4FRocket3AfterBattleText.Text
 	         $55f1 = RocketHideoutB4F_Object
 	         $5650 = RocketHideoutB4F_Blocks
 	         $5704 = RocketHideoutElevator_h
@@ -8278,7 +8278,7 @@ ROMX bank #17:
 	         $572c = RocketHideoutElevatorStoreWarpEntriesScript
 	         $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 	         $5741 = RocketHideoutElevatorScript
-	         $5754 = RocketHideoutElavatorFloors
+	         $5754 = RocketHideoutElevatorFloors
 	         $5759 = RocketHideoutElevatorWarpMaps
 	         $575f = RocketHideoutElevatorShakeScript
 	         $575f = RocketHideoutElevatorWarpMaps.End
@@ -10745,7 +10745,7 @@ ROMX bank #22:
 	         $5296 = Route8SuperNerd2AfterBattleText
 	         $529b = Route8CooltrainerF1Text
 	         $52a5 = Route8CooltrainerF1BattleText
-	         $52aa = Route8CooltrainerF21EndBattleText
+	         $52aa = Route8CooltrainerF1EndBattleText
 	         $52af = Route8CooltrainerF1AfterBattleText
 	         $52b4 = Route8SuperNerd3Text
 	         $52be = Route8SuperNerd3BattleText
@@ -15341,9 +15341,9 @@ ROMX bank #32:
 	         $6047 = _RocketHideoutB1FRocket4AfterBattleText
 	         $6078 = _RocketHideoutB1FRocket5BattleText
 	         $6097 = _RocketHideoutB1FRocket5AfterBattleText
-	         $60bb = _RocketHideoutB1FRocketBattleText
-	         $60ef = _RocketHideoutB1FRocketEndBattleText
-	         $60fd = _RocketHideoutB1FRocketAfterBattleText
+	         $60bb = _RocketHideoutB2FRocketBattleText
+	         $60ef = _RocketHideoutB2FRocketEndBattleText
+	         $60fd = _RocketHideoutB2FRocketAfterBattleText
 	         $6140 = _RocketHideoutB3FRocket1BattleText
 	         $6168 = _RocketHideoutB3FRocket1EndBattleText
 	         $617a = _RocketHideoutB3FRocket1AfterBattleText
@@ -15353,15 +15353,15 @@ ROMX bank #32:
 	         $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText
 	         $626c = _RocketHideoutB4FGiovanniWhatCannotBeText
 	         $6283 = _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-	         $6326 = _RocketHideoutB4FGiovanniBattleText
-	         $6354 = _RocketHideoutB4FGiovanniEndBattleText
-	         $6363 = _RocketHideoutB4FGiovanniAfterBattleText
-	         $638f = _RocketHideoutB4FRocket1BattleText
-	         $63bc = _RocketHideoutB4FRocket1EndBattleText
-	         $63c4 = _RocketHideoutB4FRocket1AfterBattleText
-	         $63e2 = _RocketHideoutB4FRocket2BattleText
-	         $6413 = _RocketHideoutB4FRocket2EndBattleText
-	         $6418 = _RocketHideoutB4FRocket2AfterBattleText
+	         $6326 = _RocketHideoutB4FRocket1BattleText
+	         $6354 = _RocketHideoutB4FRocket1EndBattleText
+	         $6363 = _RocketHideoutB4FRocket1AfterBattleText
+	         $638f = _RocketHideoutB4FRocket2BattleText
+	         $63bc = _RocketHideoutB4FRocket2EndBattleText
+	         $63c4 = _RocketHideoutB4FRocket2AfterBattleText
+	         $63e2 = _RocketHideoutB4FRocket3BattleText
+	         $6413 = _RocketHideoutB4FRocket3EndBattleText
+	         $6418 = _RocketHideoutB4FRocket3AfterBattleText
 	         $6438 = _RocketHideoutElevatorAppearsToNeedKeyText
 	         $6454 = SilphCo2FSilphWorkerFPleaseTakeThisText
 	         $64ba = _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15431,8 +15431,8 @@ ROMX bank #33:
 	         $42a7 = _SilphCo6FSilphWorkerM3TargetedSilphText
 	         $42dd = _SilphCo6FSilphWorkerM3WorkForSilphText
 	         $4306 = _SilphCo6FRocket1BattleText
-	         $432a = _SilphCo6Rocket1EndBattleText
-	         $4336 = _SilphCo6Rocket1AfterBattleText
+	         $432a = _SilphCo6FRocket1EndBattleText
+	         $4336 = _SilphCo6FRocket1AfterBattleText
 	         $435e = _SilphCo6FScientistBattleText
 	         $43a4 = _SilphCo6FScientistEndBattleText
 	         $43ac = _SilphCo6FScientistAfterBattleText
@@ -16116,7 +16116,7 @@ ROMX bank #35:
 	         $5f7e = _Route8SuperNerd2EndBattleText
 	         $5f90 = _Route8SuperNerd2AfterBattleText
 	         $5fc0 = _Route8CooltrainerF1BattleText
-	         $5fe4 = _Route8CooltrainerF21EndBattleText
+	         $5fe4 = _Route8CooltrainerF1EndBattleText
 	         $5ff0 = _Route8CooltrainerF1AfterBattleText
 	         $6028 = _Route8SuperNerd3BattleText
 	         $6049 = _Route8SuperNerd3EndBattleText
--- a/pokered_vc.sym
+++ b/pokered_vc.sym
@@ -4273,8 +4273,8 @@
 06:62ab SilphCo6FSilphWorkerM3Text.WorkForSilphText
 06:62b0 SilphCo6FRocket1Text
 06:62ba SilphCo6FRocket1BattleText
-06:62bf SilphCo6Rocket1EndBattleText
-06:62c4 SilphCo6Rocket1AfterBattleText
+06:62bf SilphCo6FRocket1EndBattleText
+06:62c4 SilphCo6FRocket1AfterBattleText
 06:62c9 SilphCo6FScientistText
 06:62d3 SilphCo6FScientistBattleText
 06:62d8 SilphCo6FScientistEndBattleText
@@ -8064,9 +8064,9 @@
 11:50d1 RocketHideout2TrainerHeaders
 11:50d1 RocketHideout2TrainerHeader0
 11:50de RocketHideoutB2FRocketText
-11:50e8 RocketHideoutB1FRocketBattleText
-11:50ed RocketHideoutB1FRocketEndBattleText
-11:50f2 RocketHideoutB1FRocketAfterBattleText
+11:50e8 RocketHideoutB2FRocketBattleText
+11:50ed RocketHideoutB2FRocketEndBattleText
+11:50f2 RocketHideoutB2FRocketAfterBattleText
 11:50f7 RocketHideoutB2F_Object
 11:5147 RocketHideoutB2F_Blocks
 11:5219 RocketHideoutB3F_h
@@ -8122,19 +8122,19 @@
 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText
 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText
 11:5589 RocketHideoutB4FRocket1Text
-11:5593 RocketHideoutB4FGiovanniBattleText
-11:5598 RocketHideoutB4FGiovanniEndBattleText
-11:559d RocketHideoutB4FGiovanniAfterBattleText
+11:5593 RocketHideoutB4FRocket1BattleText
+11:5598 RocketHideoutB4FRocket1EndBattleText
+11:559d RocketHideoutB4FRocket1AfterBattleText
 11:55a2 RocketHideoutB4FRocket2Text
-11:55ac RocketHideoutB4FRocket1BattleText
-11:55b1 RocketHideoutB4FRocket1EndBattleText
-11:55b6 RocketHideoutB4FRocket1AfterBattleText
+11:55ac RocketHideoutB4FRocket2BattleText
+11:55b1 RocketHideoutB4FRocket2EndBattleText
+11:55b6 RocketHideoutB4FRocket2AfterBattleText
 11:55bb RocketHideoutB4FRocket3Text
-11:55c5 RocketHideoutB4FRocket2BattleText
-11:55ca RocketHideoutB4FRocket2EndBattleText
-11:55cf RocketHideoutB4FRocket2AfterBattleText
-11:55e9 RocketHideoutB4FRocket2AfterBattleText.done
-11:55ec RocketHideoutB4FRocket2AfterBattleText.Text
+11:55c5 RocketHideoutB4FRocket3BattleText
+11:55ca RocketHideoutB4FRocket3EndBattleText
+11:55cf RocketHideoutB4FRocket3AfterBattleText
+11:55e9 RocketHideoutB4FRocket3AfterBattleText.done
+11:55ec RocketHideoutB4FRocket3AfterBattleText.Text
 11:55f1 RocketHideoutB4F_Object
 11:5650 RocketHideoutB4F_Blocks
 11:5704 RocketHideoutElevator_h
@@ -8142,7 +8142,7 @@
 11:572c RocketHideoutElevatorStoreWarpEntriesScript
 11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry
 11:5741 RocketHideoutElevatorScript
-11:5754 RocketHideoutElavatorFloors
+11:5754 RocketHideoutElevatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
 11:575f RocketHideoutElevatorWarpMaps.End
 11:575f RocketHideoutElevatorShakeScript
@@ -10571,7 +10571,7 @@
 16:5296 Route8SuperNerd2AfterBattleText
 16:529b Route8CooltrainerF1Text
 16:52a5 Route8CooltrainerF1BattleText
-16:52aa Route8CooltrainerF21EndBattleText
+16:52aa Route8CooltrainerF1EndBattleText
 16:52af Route8CooltrainerF1AfterBattleText
 16:52b4 Route8SuperNerd3Text
 16:52be Route8SuperNerd3BattleText
@@ -15101,9 +15101,9 @@
 20:6047 _RocketHideoutB1FRocket4AfterBattleText
 20:6078 _RocketHideoutB1FRocket5BattleText
 20:6097 _RocketHideoutB1FRocket5AfterBattleText
-20:60bb _RocketHideoutB1FRocketBattleText
-20:60ef _RocketHideoutB1FRocketEndBattleText
-20:60fd _RocketHideoutB1FRocketAfterBattleText
+20:60bb _RocketHideoutB2FRocketBattleText
+20:60ef _RocketHideoutB2FRocketEndBattleText
+20:60fd _RocketHideoutB2FRocketAfterBattleText
 20:6140 _RocketHideoutB3FRocket1BattleText
 20:6168 _RocketHideoutB3FRocket1EndBattleText
 20:617a _RocketHideoutB3FRocket1AfterBattleText
@@ -15113,15 +15113,15 @@
 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText
 20:626c _RocketHideoutB4FGiovanniWhatCannotBeText
 20:6283 _RocketHideoutB4FGiovanniHopeWeMeetAgainText
-20:6326 _RocketHideoutB4FGiovanniBattleText
-20:6354 _RocketHideoutB4FGiovanniEndBattleText
-20:6363 _RocketHideoutB4FGiovanniAfterBattleText
-20:638f _RocketHideoutB4FRocket1BattleText
-20:63bc _RocketHideoutB4FRocket1EndBattleText
-20:63c4 _RocketHideoutB4FRocket1AfterBattleText
-20:63e2 _RocketHideoutB4FRocket2BattleText
-20:6413 _RocketHideoutB4FRocket2EndBattleText
-20:6418 _RocketHideoutB4FRocket2AfterBattleText
+20:6326 _RocketHideoutB4FRocket1BattleText
+20:6354 _RocketHideoutB4FRocket1EndBattleText
+20:6363 _RocketHideoutB4FRocket1AfterBattleText
+20:638f _RocketHideoutB4FRocket2BattleText
+20:63bc _RocketHideoutB4FRocket2EndBattleText
+20:63c4 _RocketHideoutB4FRocket2AfterBattleText
+20:63e2 _RocketHideoutB4FRocket3BattleText
+20:6413 _RocketHideoutB4FRocket3EndBattleText
+20:6418 _RocketHideoutB4FRocket3AfterBattleText
 20:6438 _RocketHideoutElevatorAppearsToNeedKeyText
 20:6454 SilphCo2FSilphWorkerFPleaseTakeThisText
 20:64ba _SilphCo2FSilphWorkerFReceivedTM36Text
@@ -15186,8 +15186,8 @@
 21:42a7 _SilphCo6FSilphWorkerM3TargetedSilphText
 21:42dd _SilphCo6FSilphWorkerM3WorkForSilphText
 21:4306 _SilphCo6FRocket1BattleText
-21:432a _SilphCo6Rocket1EndBattleText
-21:4336 _SilphCo6Rocket1AfterBattleText
+21:432a _SilphCo6FRocket1EndBattleText
+21:4336 _SilphCo6FRocket1AfterBattleText
 21:435e _SilphCo6FScientistBattleText
 21:43a4 _SilphCo6FScientistEndBattleText
 21:43ac _SilphCo6FScientistAfterBattleText
@@ -15861,7 +15861,7 @@
 23:5f7e _Route8SuperNerd2EndBattleText
 23:5f90 _Route8SuperNerd2AfterBattleText
 23:5fc0 _Route8CooltrainerF1BattleText
-23:5fe4 _Route8CooltrainerF21EndBattleText
+23:5fe4 _Route8CooltrainerF1EndBattleText
 23:5ff0 _Route8CooltrainerF1AfterBattleText
 23:6028 _Route8SuperNerd3BattleText
 23:6049 _Route8SuperNerd3EndBattleText