diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm
index 61184a1b..5c5bcd4e 100644
--- a/data/maps/objects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
@@ -11,7 +11,7 @@ SSAnne1F_Object:
 	warp_event 11,  8, SS_ANNE_1F_ROOMS, 5
 	warp_event  7,  8, SS_ANNE_1F_ROOMS, 6
 	warp_event  2,  6, SS_ANNE_2F, 7
-	warp_event 37, 15, SS_ANNE_B1F, 6
+	warp_event 37, 15, SS_ANNE_B1F, 7
 	warp_event  3, 16, SS_ANNE_KITCHEN, 1
 
 	def_bg_events
diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm
index fc633f67..75f883a1 100644
--- a/data/maps/objects/SSAnne2FRooms.asm
+++ b/data/maps/objects/SSAnne2FRooms.asm
@@ -23,7 +23,7 @@ SSAnne2FRooms_Object:
 	object_event  0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
 	object_event  2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12
 	object_event  1,  2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
-	object_event 12,  1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER
+	; object_event 12,  1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER
 	object_event 21,  2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person
 	object_event 22,  1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person
 	object_event  0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY
diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
index 7a2d7203..7d81b60c 100644
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -26,11 +26,11 @@ SSAnneB1FRooms_Object:
 	object_event  0,  4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
 	object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person
 	object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person
-	object_event 20,  2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
+	; object_event 20,  2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
 	object_event 10,  2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
 	object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
-	object_event 23, 14, SPRITE_ROCKER, STAY, LEFT, 15 ; Tauros C Trader
-	object_event 20, 13, SPRITE_ROCKER, STAY, RIGHT, 16 ; Tauros A Trader
-	object_event 22, 11, SPRITE_ROCKER, STAY, DOWN, 17 ; Tauros B Trader
+	object_event 23, 14, SPRITE_ROCKER, STAY, LEFT, 12 ; Tauros C Trader
+	object_event 20, 13, SPRITE_ROCKER, STAY, RIGHT, 13 ; Tauros A Trader
+	object_event 22, 11, SPRITE_ROCKER, STAY, DOWN, 14 ; Tauros B Trader
 
 	def_warps_to SS_ANNE_B1F_ROOMS
diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
index fd0aa757..2afcff65 100644
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -209,7 +209,7 @@ MonsterPalettes:
 	db PAL_GREYMON   ; TRAMPEL
 	db PAL_BROWNMON  ; TAUROS
 	db PAL_GREYMON   ; TAUROS_P
-	db PAL_BLUEMON   ; TAUROS_PA
+	db PAL_CYANMON   ; TAUROS_PA
 	db PAL_REDMON    ; TAUROS_PB
 	db PAL_PINKMON   ; CHANSEY
 	db PAL_PINKMON   ; BLISSEY
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
index 724478f3..6374546a 100644
--- a/data/text/text_7.asm
+++ b/data/text/text_7.asm
@@ -226,7 +226,7 @@ _WannaTrade7Text::
 	line "The Aqua Breed"
 	cont "is superior."
 
-	text "Surely you agree."
+	para "Surely you agree."
 	line "Trade me your"
 	cont "TAUROS!"
 	done
diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm
index 1afe08b5..066da706 100644
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -1,7 +1,5 @@
 VermilionDock_Script:
 	call EnableAutoTextBoxDrawing
-	ld de, VermilionDock_ScriptPointers
-	call ExecuteCurMapScriptInTable
 	CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
 	jr nz, .asm_1db8d
 	CheckEventReuseHL EVENT_GOT_HM01
@@ -38,11 +36,6 @@ VermilionDock_Script:
 	SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK
 	ret
 
-VermilionDock_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-
 VermilionDock_1db9b:
 	ld a, [wObtainedBadges]
 	bit 4, a ; after obtaining 4 badges the ship returns