diff --git a/Pokemon White Crystal ChangeLog README.txt b/Pokemon White Crystal ChangeLog README.txt
index ab63176..1bd99f7 100755
--- a/Pokemon White Crystal ChangeLog README.txt	
+++ b/Pokemon White Crystal ChangeLog README.txt	
@@ -157,14 +157,11 @@ Version 1.0 ToDo List
 -Mandatory 'Set' battle style
 -Create 1/3 Recoil effect
 -Berry Pocket
--Adjust Moo Moo Farm TM Given
--Is TM Psych Up Unobtainable?
 -Increase size of Ball Pocket
 -Viridian Forest
 -Safari Zone
 -Adjust Growth Rates
 -Check Celebi Event Unlocks Correctly
--Improve twister tm giver (spin)
 -Sandstorm/Hail stat bonus
 
 
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 0d2ebff..50d6dca 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -65,7 +65,7 @@
 	const EVENT_03B
 	const EVENT_03C
 	const EVENT_HEALED_MOOMOO
-	const EVENT_GOT_TM13_ENERGY_BALL_FROM_MOOMOO_FARM
+	const EVENT_GOT_TM12_QUICK_ATTACK_FROM_MOOMOO_FARM
 	const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
 	const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST ; 040
 	const EVENT_DUDE_TALKED_TO_YOU
@@ -125,7 +125,7 @@
 	const EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
 	const EVENT_GOT_CLEAR_BELL
 	const EVENT_GOT_SILVER_WING
-	const EVENT_GOT_TM12_SWEET_SCENT
+	const EVENT_GOT_TM09_PSYCH_UP
 	const EVENT_RELEASED_THE_BEASTS
 	const EVENT_GOT_MASTER_BALL_FROM_ELM
 ; Johto Signpost Items
diff --git a/maps/Route32.asm b/maps/Route32.asm
index e9e7625..d5c1f10 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -965,6 +965,6 @@ Route32_MapEventHeader:
 	person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1
 	person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
 	person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
-	person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32TwisterTMGuyScript, -1
+	person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32TwisterTMGuyScript, -1
 	person_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
 	person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
\ No newline at end of file
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 5299c97..9abe451 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -50,13 +50,13 @@ TeacherScript_0x62d63:
 	opentext
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iftrue UnknownScript_0x62d84
-	checkevent EVENT_GOT_TM12_SWEET_SCENT
+	checkevent EVENT_GOT_TM09_PSYCH_UP
 	iftrue UnknownScript_0x62d7e
 	writetext UnknownText_0x62d9d
 	buttonsound
-	verbosegiveitem TM_QUICK_ATTACK
+	verbosegiveitem TM_PSYCH_UP
 	iffalse UnknownScript_0x62d82
-	setevent EVENT_GOT_TM12_SWEET_SCENT
+	setevent EVENT_GOT_TM09_PSYCH_UP
 UnknownScript_0x62d7e:
 	writetext UnknownText_0x62df6
 	waitbutton
@@ -92,24 +92,19 @@ MovementData_0x62d9a:
 	step_end
 
 UnknownText_0x62d9d:
-	text "Oh, honey. You're"
-	line "making a #DEX?"
+	text "Have you found"
+	line "opposing stat"
+	cont "boosts a problem?"
 
-	para "It must be hard if"
-	line "#MON won't"
-
-	para "appear. Try using"
-	line "this TM."
+	para "Try using this TM."
 	done
 
 UnknownText_0x62df6:
-	text "It's SWEET SCENT."
-
-	para "Use it wherever"
-	line "#MON appear."
+	text "It's PSYCH UP!"
 
-	para "#MON will be"
-	line "enticed by it."
+	para "Your #MON will"
+	line "copy all of the"
+	cont "opponents boosts!"
 	done
 
 UnknownText_0x62e41:
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 4d795d2..2dbad32 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -68,7 +68,7 @@ UnknownScript_0x9cf08:
 PokefanFScript_0x9cf0e:
 	faceplayer
 	opentext
-	checkevent EVENT_GOT_TM13_ENERGY_BALL_FROM_MOOMOO_FARM
+	checkevent EVENT_GOT_TM12_QUICK_ATTACK_FROM_MOOMOO_FARM
 	iftrue UnknownScript_0x9cf2f
 	checkevent EVENT_HEALED_MOOMOO
 	iftrue UnknownScript_0x9cf22
@@ -80,9 +80,9 @@ PokefanFScript_0x9cf0e:
 UnknownScript_0x9cf22:
 	writetext UnknownText_0x9d156
 	buttonsound
-	verbosegiveitem TM_ENERGY_BALL
+	verbosegiveitem TM_QUICK_ATTACK
 	iffalse UnknownScript_0x9cf33
-	setevent EVENT_GOT_TM13_ENERGY_BALL_FROM_MOOMOO_FARM
+	setevent EVENT_GOT_TM12_QUICK_ATTACK_FROM_MOOMOO_FARM
 UnknownScript_0x9cf2f:
 	writetext UnknownText_0x9d1c7
 	waitbutton
@@ -174,16 +174,16 @@ UnknownText_0x9d156:
 
 UnknownText_0x9d1b5:
 	text "<PLAYER> received"
-	line "TM13."
+	line "TM12."
 	done
 
 UnknownText_0x9d1c7:
 	text "That there's"
-	line "ENERGY BALL."
+	line "QUICK ATTACK."
 
-	para "You best think how"
-	line "you ought to use"
-	cont "it, hon."
+	para "For some reason,"
+	line "our MILTANK never"
+	cont "could use it."
 	done
 
 Route39Farmhouse_MapEventHeader:
@@ -206,4 +206,4 @@ Route39Farmhouse_MapEventHeader:
 .PersonEvents:
 	db 2
 	person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ceb4, -1
-	person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x9cf0e, -1
+	person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x9cf0e, -1
\ No newline at end of file