diff --git a/pokecrystal.map b/pokecrystal.map
index d909c97998..3d2912e969 100644
--- a/pokecrystal.map
+++ b/pokecrystal.map
@@ -8650,7 +8650,7 @@ ROMX bank #14:
 	         $4ad3 = AI_Smart_Unused2B.discourage
 	         $4ad5 = AI_Smart_Unused2B.dismiss
 	         $4adb = AI_Smart_Confuse
-	         $4ae7 = AI_Smart_Confuse.skipdiscourage
+	         $4ae7 = AI_Smart_Confuse.discourage
 	         $4aed = AI_Smart_SpDefenseUp2
 	         $4b09 = AI_Smart_SpDefenseUp2.encourage
 	         $4b10 = AI_Smart_SpDefenseUp2.discourage
@@ -8663,11 +8663,11 @@ ROMX bank #14:
 	         $4b63 = AI_Smart_HyperBeam
 	         $4b72 = AI_Smart_HyperBeam.discourage
 	         $4b7f = AI_Smart_Rage
-	         $4b8c = AI_Smart_Rage.skipencourage
+	         $4b8c = AI_Smart_Rage.encourage
 	         $4b9b = AI_Smart_Rage.notbuilding
 	         $4ba6 = AI_Smart_Rage.discourage
 	         $4ba8 = AI_Smart_Mimic
-	         $4bd4 = AI_Smart_Mimic.skip_encourage
+	         $4bd4 = AI_Smart_Mimic.encourage
 	         $4be9 = AI_Smart_Mimic.dismiss
 	         $4bef = AI_Smart_Mimic.discourage
 	         $4bf1 = AI_Smart_Counter
diff --git a/pokecrystal.sym b/pokecrystal.sym
index 293dc33d5a..290de0550c 100644
--- a/pokecrystal.sym
+++ b/pokecrystal.sym
@@ -8540,7 +8540,7 @@
 0e:4ad3 AI_Smart_Unused2B.discourage
 0e:4ad5 AI_Smart_Unused2B.dismiss
 0e:4adb AI_Smart_Confuse
-0e:4ae7 AI_Smart_Confuse.skipdiscourage
+0e:4ae7 AI_Smart_Confuse.discourage
 0e:4aed AI_Smart_SpDefenseUp2
 0e:4b09 AI_Smart_SpDefenseUp2.encourage
 0e:4b10 AI_Smart_SpDefenseUp2.discourage
@@ -8553,11 +8553,11 @@
 0e:4b63 AI_Smart_HyperBeam
 0e:4b72 AI_Smart_HyperBeam.discourage
 0e:4b7f AI_Smart_Rage
-0e:4b8c AI_Smart_Rage.skipencourage
+0e:4b8c AI_Smart_Rage.encourage
 0e:4b9b AI_Smart_Rage.notbuilding
 0e:4ba6 AI_Smart_Rage.discourage
 0e:4ba8 AI_Smart_Mimic
-0e:4bd4 AI_Smart_Mimic.skip_encourage
+0e:4bd4 AI_Smart_Mimic.encourage
 0e:4be9 AI_Smart_Mimic.dismiss
 0e:4bef AI_Smart_Mimic.discourage
 0e:4bf1 AI_Smart_Counter
diff --git a/pokecrystal11.map b/pokecrystal11.map
index 71db2c4534..8501e65dbe 100644
--- a/pokecrystal11.map
+++ b/pokecrystal11.map
@@ -8650,7 +8650,7 @@ ROMX bank #14:
 	         $4ad3 = AI_Smart_Unused2B.discourage
 	         $4ad5 = AI_Smart_Unused2B.dismiss
 	         $4adb = AI_Smart_Confuse
-	         $4ae7 = AI_Smart_Confuse.skipdiscourage
+	         $4ae7 = AI_Smart_Confuse.discourage
 	         $4aed = AI_Smart_SpDefenseUp2
 	         $4b09 = AI_Smart_SpDefenseUp2.encourage
 	         $4b10 = AI_Smart_SpDefenseUp2.discourage
@@ -8663,11 +8663,11 @@ ROMX bank #14:
 	         $4b63 = AI_Smart_HyperBeam
 	         $4b72 = AI_Smart_HyperBeam.discourage
 	         $4b7f = AI_Smart_Rage
-	         $4b8c = AI_Smart_Rage.skipencourage
+	         $4b8c = AI_Smart_Rage.encourage
 	         $4b9b = AI_Smart_Rage.notbuilding
 	         $4ba6 = AI_Smart_Rage.discourage
 	         $4ba8 = AI_Smart_Mimic
-	         $4bd4 = AI_Smart_Mimic.skip_encourage
+	         $4bd4 = AI_Smart_Mimic.encourage
 	         $4be9 = AI_Smart_Mimic.dismiss
 	         $4bef = AI_Smart_Mimic.discourage
 	         $4bf1 = AI_Smart_Counter
diff --git a/pokecrystal11.sym b/pokecrystal11.sym
index cca5d3e53a..2094b9c086 100644
--- a/pokecrystal11.sym
+++ b/pokecrystal11.sym
@@ -8540,7 +8540,7 @@
 0e:4ad3 AI_Smart_Unused2B.discourage
 0e:4ad5 AI_Smart_Unused2B.dismiss
 0e:4adb AI_Smart_Confuse
-0e:4ae7 AI_Smart_Confuse.skipdiscourage
+0e:4ae7 AI_Smart_Confuse.discourage
 0e:4aed AI_Smart_SpDefenseUp2
 0e:4b09 AI_Smart_SpDefenseUp2.encourage
 0e:4b10 AI_Smart_SpDefenseUp2.discourage
@@ -8553,11 +8553,11 @@
 0e:4b63 AI_Smart_HyperBeam
 0e:4b72 AI_Smart_HyperBeam.discourage
 0e:4b7f AI_Smart_Rage
-0e:4b8c AI_Smart_Rage.skipencourage
+0e:4b8c AI_Smart_Rage.encourage
 0e:4b9b AI_Smart_Rage.notbuilding
 0e:4ba6 AI_Smart_Rage.discourage
 0e:4ba8 AI_Smart_Mimic
-0e:4bd4 AI_Smart_Mimic.skip_encourage
+0e:4bd4 AI_Smart_Mimic.encourage
 0e:4be9 AI_Smart_Mimic.dismiss
 0e:4bef AI_Smart_Mimic.discourage
 0e:4bf1 AI_Smart_Counter
diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map
index 65ddfe04c2..94e3754e1a 100644
--- a/pokecrystal11_debug.map
+++ b/pokecrystal11_debug.map
@@ -8656,7 +8656,7 @@ ROMX bank #14:
 	         $4ad3 = AI_Smart_Unused2B.discourage
 	         $4ad5 = AI_Smart_Unused2B.dismiss
 	         $4adb = AI_Smart_Confuse
-	         $4ae7 = AI_Smart_Confuse.skipdiscourage
+	         $4ae7 = AI_Smart_Confuse.discourage
 	         $4aed = AI_Smart_SpDefenseUp2
 	         $4b09 = AI_Smart_SpDefenseUp2.encourage
 	         $4b10 = AI_Smart_SpDefenseUp2.discourage
@@ -8669,11 +8669,11 @@ ROMX bank #14:
 	         $4b63 = AI_Smart_HyperBeam
 	         $4b72 = AI_Smart_HyperBeam.discourage
 	         $4b7f = AI_Smart_Rage
-	         $4b8c = AI_Smart_Rage.skipencourage
+	         $4b8c = AI_Smart_Rage.encourage
 	         $4b9b = AI_Smart_Rage.notbuilding
 	         $4ba6 = AI_Smart_Rage.discourage
 	         $4ba8 = AI_Smart_Mimic
-	         $4bd4 = AI_Smart_Mimic.skip_encourage
+	         $4bd4 = AI_Smart_Mimic.encourage
 	         $4be9 = AI_Smart_Mimic.dismiss
 	         $4bef = AI_Smart_Mimic.discourage
 	         $4bf1 = AI_Smart_Counter
diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym
index 762035113d..0f2bcd3319 100644
--- a/pokecrystal11_debug.sym
+++ b/pokecrystal11_debug.sym
@@ -8546,7 +8546,7 @@
 0e:4ad3 AI_Smart_Unused2B.discourage
 0e:4ad5 AI_Smart_Unused2B.dismiss
 0e:4adb AI_Smart_Confuse
-0e:4ae7 AI_Smart_Confuse.skipdiscourage
+0e:4ae7 AI_Smart_Confuse.discourage
 0e:4aed AI_Smart_SpDefenseUp2
 0e:4b09 AI_Smart_SpDefenseUp2.encourage
 0e:4b10 AI_Smart_SpDefenseUp2.discourage
@@ -8559,11 +8559,11 @@
 0e:4b63 AI_Smart_HyperBeam
 0e:4b72 AI_Smart_HyperBeam.discourage
 0e:4b7f AI_Smart_Rage
-0e:4b8c AI_Smart_Rage.skipencourage
+0e:4b8c AI_Smart_Rage.encourage
 0e:4b9b AI_Smart_Rage.notbuilding
 0e:4ba6 AI_Smart_Rage.discourage
 0e:4ba8 AI_Smart_Mimic
-0e:4bd4 AI_Smart_Mimic.skip_encourage
+0e:4bd4 AI_Smart_Mimic.encourage
 0e:4be9 AI_Smart_Mimic.dismiss
 0e:4bef AI_Smart_Mimic.discourage
 0e:4bf1 AI_Smart_Counter
diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map
index b915634cc6..9f4d87b235 100644
--- a/pokecrystal11_vc.map
+++ b/pokecrystal11_vc.map
@@ -8691,7 +8691,7 @@ ROMX bank #14:
 	         $4ad3 = AI_Smart_Unused2B.discourage
 	         $4ad5 = AI_Smart_Unused2B.dismiss
 	         $4adb = AI_Smart_Confuse
-	         $4ae7 = AI_Smart_Confuse.skipdiscourage
+	         $4ae7 = AI_Smart_Confuse.discourage
 	         $4aed = AI_Smart_SpDefenseUp2
 	         $4b09 = AI_Smart_SpDefenseUp2.encourage
 	         $4b10 = AI_Smart_SpDefenseUp2.discourage
@@ -8704,11 +8704,11 @@ ROMX bank #14:
 	         $4b63 = AI_Smart_HyperBeam
 	         $4b72 = AI_Smart_HyperBeam.discourage
 	         $4b7f = AI_Smart_Rage
-	         $4b8c = AI_Smart_Rage.skipencourage
+	         $4b8c = AI_Smart_Rage.encourage
 	         $4b9b = AI_Smart_Rage.notbuilding
 	         $4ba6 = AI_Smart_Rage.discourage
 	         $4ba8 = AI_Smart_Mimic
-	         $4bd4 = AI_Smart_Mimic.skip_encourage
+	         $4bd4 = AI_Smart_Mimic.encourage
 	         $4be9 = AI_Smart_Mimic.dismiss
 	         $4bef = AI_Smart_Mimic.discourage
 	         $4bf1 = AI_Smart_Counter
diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym
index ed9e9d64e2..f23e463b31 100644
--- a/pokecrystal11_vc.sym
+++ b/pokecrystal11_vc.sym
@@ -8581,7 +8581,7 @@
 0e:4ad3 AI_Smart_Unused2B.discourage
 0e:4ad5 AI_Smart_Unused2B.dismiss
 0e:4adb AI_Smart_Confuse
-0e:4ae7 AI_Smart_Confuse.skipdiscourage
+0e:4ae7 AI_Smart_Confuse.discourage
 0e:4aed AI_Smart_SpDefenseUp2
 0e:4b09 AI_Smart_SpDefenseUp2.encourage
 0e:4b10 AI_Smart_SpDefenseUp2.discourage
@@ -8594,11 +8594,11 @@
 0e:4b63 AI_Smart_HyperBeam
 0e:4b72 AI_Smart_HyperBeam.discourage
 0e:4b7f AI_Smart_Rage
-0e:4b8c AI_Smart_Rage.skipencourage
+0e:4b8c AI_Smart_Rage.encourage
 0e:4b9b AI_Smart_Rage.notbuilding
 0e:4ba6 AI_Smart_Rage.discourage
 0e:4ba8 AI_Smart_Mimic
-0e:4bd4 AI_Smart_Mimic.skip_encourage
+0e:4bd4 AI_Smart_Mimic.encourage
 0e:4be9 AI_Smart_Mimic.dismiss
 0e:4bef AI_Smart_Mimic.discourage
 0e:4bf1 AI_Smart_Counter
diff --git a/pokecrystal_au.map b/pokecrystal_au.map
index c0903199f6..5f1f19893a 100644
--- a/pokecrystal_au.map
+++ b/pokecrystal_au.map
@@ -8650,7 +8650,7 @@ ROMX bank #14:
 	         $4ad3 = AI_Smart_Unused2B.discourage
 	         $4ad5 = AI_Smart_Unused2B.dismiss
 	         $4adb = AI_Smart_Confuse
-	         $4ae7 = AI_Smart_Confuse.skipdiscourage
+	         $4ae7 = AI_Smart_Confuse.discourage
 	         $4aed = AI_Smart_SpDefenseUp2
 	         $4b09 = AI_Smart_SpDefenseUp2.encourage
 	         $4b10 = AI_Smart_SpDefenseUp2.discourage
@@ -8663,11 +8663,11 @@ ROMX bank #14:
 	         $4b63 = AI_Smart_HyperBeam
 	         $4b72 = AI_Smart_HyperBeam.discourage
 	         $4b7f = AI_Smart_Rage
-	         $4b8c = AI_Smart_Rage.skipencourage
+	         $4b8c = AI_Smart_Rage.encourage
 	         $4b9b = AI_Smart_Rage.notbuilding
 	         $4ba6 = AI_Smart_Rage.discourage
 	         $4ba8 = AI_Smart_Mimic
-	         $4bd4 = AI_Smart_Mimic.skip_encourage
+	         $4bd4 = AI_Smart_Mimic.encourage
 	         $4be9 = AI_Smart_Mimic.dismiss
 	         $4bef = AI_Smart_Mimic.discourage
 	         $4bf1 = AI_Smart_Counter
diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym
index b684dbd592..ac1e15f5d5 100644
--- a/pokecrystal_au.sym
+++ b/pokecrystal_au.sym
@@ -8540,7 +8540,7 @@
 0e:4ad3 AI_Smart_Unused2B.discourage
 0e:4ad5 AI_Smart_Unused2B.dismiss
 0e:4adb AI_Smart_Confuse
-0e:4ae7 AI_Smart_Confuse.skipdiscourage
+0e:4ae7 AI_Smart_Confuse.discourage
 0e:4aed AI_Smart_SpDefenseUp2
 0e:4b09 AI_Smart_SpDefenseUp2.encourage
 0e:4b10 AI_Smart_SpDefenseUp2.discourage
@@ -8553,11 +8553,11 @@
 0e:4b63 AI_Smart_HyperBeam
 0e:4b72 AI_Smart_HyperBeam.discourage
 0e:4b7f AI_Smart_Rage
-0e:4b8c AI_Smart_Rage.skipencourage
+0e:4b8c AI_Smart_Rage.encourage
 0e:4b9b AI_Smart_Rage.notbuilding
 0e:4ba6 AI_Smart_Rage.discourage
 0e:4ba8 AI_Smart_Mimic
-0e:4bd4 AI_Smart_Mimic.skip_encourage
+0e:4bd4 AI_Smart_Mimic.encourage
 0e:4be9 AI_Smart_Mimic.dismiss
 0e:4bef AI_Smart_Mimic.discourage
 0e:4bf1 AI_Smart_Counter
diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map
index 64a4c1b266..b6ad61dffd 100644
--- a/pokecrystal_debug.map
+++ b/pokecrystal_debug.map
@@ -8656,7 +8656,7 @@ ROMX bank #14:
 	         $4ad3 = AI_Smart_Unused2B.discourage
 	         $4ad5 = AI_Smart_Unused2B.dismiss
 	         $4adb = AI_Smart_Confuse
-	         $4ae7 = AI_Smart_Confuse.skipdiscourage
+	         $4ae7 = AI_Smart_Confuse.discourage
 	         $4aed = AI_Smart_SpDefenseUp2
 	         $4b09 = AI_Smart_SpDefenseUp2.encourage
 	         $4b10 = AI_Smart_SpDefenseUp2.discourage
@@ -8669,11 +8669,11 @@ ROMX bank #14:
 	         $4b63 = AI_Smart_HyperBeam
 	         $4b72 = AI_Smart_HyperBeam.discourage
 	         $4b7f = AI_Smart_Rage
-	         $4b8c = AI_Smart_Rage.skipencourage
+	         $4b8c = AI_Smart_Rage.encourage
 	         $4b9b = AI_Smart_Rage.notbuilding
 	         $4ba6 = AI_Smart_Rage.discourage
 	         $4ba8 = AI_Smart_Mimic
-	         $4bd4 = AI_Smart_Mimic.skip_encourage
+	         $4bd4 = AI_Smart_Mimic.encourage
 	         $4be9 = AI_Smart_Mimic.dismiss
 	         $4bef = AI_Smart_Mimic.discourage
 	         $4bf1 = AI_Smart_Counter
diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym
index 9541ce89f6..74899da07b 100644
--- a/pokecrystal_debug.sym
+++ b/pokecrystal_debug.sym
@@ -8546,7 +8546,7 @@
 0e:4ad3 AI_Smart_Unused2B.discourage
 0e:4ad5 AI_Smart_Unused2B.dismiss
 0e:4adb AI_Smart_Confuse
-0e:4ae7 AI_Smart_Confuse.skipdiscourage
+0e:4ae7 AI_Smart_Confuse.discourage
 0e:4aed AI_Smart_SpDefenseUp2
 0e:4b09 AI_Smart_SpDefenseUp2.encourage
 0e:4b10 AI_Smart_SpDefenseUp2.discourage
@@ -8559,11 +8559,11 @@
 0e:4b63 AI_Smart_HyperBeam
 0e:4b72 AI_Smart_HyperBeam.discourage
 0e:4b7f AI_Smart_Rage
-0e:4b8c AI_Smart_Rage.skipencourage
+0e:4b8c AI_Smart_Rage.encourage
 0e:4b9b AI_Smart_Rage.notbuilding
 0e:4ba6 AI_Smart_Rage.discourage
 0e:4ba8 AI_Smart_Mimic
-0e:4bd4 AI_Smart_Mimic.skip_encourage
+0e:4bd4 AI_Smart_Mimic.encourage
 0e:4be9 AI_Smart_Mimic.dismiss
 0e:4bef AI_Smart_Mimic.discourage
 0e:4bf1 AI_Smart_Counter