Changed names.

1 files changed, 45 insertions, 45 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index a01ec6763..0641cfe3e 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -3595,139 +3595,139 @@ gContestPaintingTough3::
 	.string "The mighty tough\n"
 	.string "hyper POKéMON {STR_VAR_1}$"
 
-gTrickHouse_Mechadoll1_Q1A1:: @ 27ECBC
+gTrickHouse_Mechadoll_Oddish:: @ 27ECBC
 	.string "ODDISH$"
 
-gTrickHouse_Mechadoll1_Q1A2:: @ 27ECC3
+gTrickHouse_Mechadoll_Poochyena:: @ 27ECC3
 	.string "POOCHYENA$"
 
-gTrickHouse_Mechadoll1_Q1A3:: @ 27ECCD
+gTrickHouse_Mechadoll_Taillow:: @ 27ECCD
 	.string "TAILLOW$"
 
-gTrickHouse_Mechadoll1_Q2A1:: @ 27ECD5
+gTrickHouse_Mechadoll_Azurill:: @ 27ECD5
 	.string "AZURILL$"
 
-gTrickHouse_Mechadoll1_Q2A2:: @ 27ECDD
+gTrickHouse_Mechadoll_Lotad:: @ 27ECDD
 	.string "LOTAD$"
 
-gTrickHouse_Mechadoll1_Q2A3:: @ 27ECE3
+gTrickHouse_Mechadoll_Wingull:: @ 27ECE3
 	.string "WINGULL$"
 
-gTrickHouse_Mechadoll1_Q3A1:: @ 27ECEB
+gTrickHouse_Mechadoll_Dustox:: @ 27ECEB
 	.string "DUSTOX$"
 
-gTrickHouse_Mechadoll1_Q3A2:: @ 27ECF2
+gTrickHouse_Mechadoll_Zubat:: @ 27ECF2
 	.string "ZUBAT$"
 
-gTrickHouse_Mechadoll1_Q3A3:: @ 27ECF8
+gTrickHouse_Mechadoll_Nincada:: @ 27ECF8
 	.string "NINCADA$"
 
-gTrickHouse_Mechadoll2_Q1A1:: @ 27ED00
+gTrickHouse_Mechadoll_Ralts:: @ 27ED00
 	.string "RALTS$"
 
-gTrickHouse_Mechadoll2_Q1A2:: @ 27ED06
+gTrickHouse_Mechadoll_Zigzagoon:: @ 27ED06
 	.string "ZIGZAGOON$"
 
-gTrickHouse_Mechadoll2_Q1A3:: @ 27ED10
+gTrickHouse_Mechadoll_Slakoth:: @ 27ED10
 	.string "SLAKOTH$"
 
-gTrickHouse_Mechadoll2_Q2A1:: @ 27ED18
+gTrickHouse_Mechadoll_Poochyena2:: @ 27ED18
 	.string "POOCHYENA$"
 
-gTrickHouse_Mechadoll2_Q2A2:: @ 27ED22
+gTrickHouse_Mechadoll_Shroomish:: @ 27ED22
 	.string "SHROOMISH$"
 
-gTrickHouse_Mechadoll2_Q2A3:: @ 27ED2C
+gTrickHouse_Mechadoll_Zigzagoon2:: @ 27ED2C
 	.string "ZIGZAGOON$"
 
-gTrickHouse_Mechadoll2_Q3A1:: @ 27ED36
+gTrickHouse_Mechadoll_Poochyena3:: @ 27ED36
 	.string "POOCHYENA$"
 
-gTrickHouse_Mechadoll2_Q3A2:: @ 27ED40
+gTrickHouse_Mechadoll_Zubat2:: @ 27ED40
 	.string "ZUBAT$"
 
-gTrickHouse_Mechadoll2_Q3A3:: @ 27ED46
+gTrickHouse_Mechadoll_Carvanha:: @ 27ED46
 	.string "CARVANHA$"
 
-gTrickHouse_Mechadoll3_Q1A1:: @ 27ED4F
+gTrickHouse_Mechadoll_BurnHeal:: @ 27ED4F
 	.string "BURN HEAL$"
 
-gTrickHouse_Mechadoll3_Q1A2:: @ 27ED59
+gTrickHouse_Mechadoll_HarborMail:: @ 27ED59
 	.string "HARBOR MAIL$"
 
-gTrickHouse_Mechadoll3_Q1A3:: @ 27ED65
+gTrickHouse_Mechadoll_SamePrice:: @ 27ED65
 	.string "Same price$"
 
-gTrickHouse_Mechadoll3_Q2A1:: @ 27ED70
+gTrickHouse_Mechadoll_60Yen:: @ 27ED70
 	.string "¥60$"
 
-gTrickHouse_Mechadoll3_Q2A2:: @ 27ED74
+gTrickHouse_Mechadoll_55Yen:: @ 27ED74
 	.string "¥55$"
 
-gTrickHouse_Mechadoll3_Q2A3:: @ 27ED78
+gTrickHouse_Mechadoll_Nothing:: @ 27ED78
 	.string "Nothing$"
 
-gTrickHouse_Mechadoll3_Q3A1:: @ 27ED80
+gTrickHouse_Mechadoll_CostMore:: @ 27ED80
 	.string "They will cost more.$"
 
-gTrickHouse_Mechadoll3_Q3A2:: @ 27ED95
+gTrickHouse_Mechadoll_CostLess:: @ 27ED95
 	.string "They will cost less.$"
 
-gTrickHouse_Mechadoll3_Q3A3:: @ 27EDAA
+gTrickHouse_Mechadoll_SamePrice2:: @ 27EDAA
 	.string "Same price$"
 
-gTrickHouse_Mechadoll4_Q1A1:: @ 27EDB5
+gTrickHouse_Mechadoll_Male:: @ 27EDB5
 	.string "Male$"
 
-gTrickHouse_Mechadoll4_Q1A2:: @ 27EDBA
+gTrickHouse_Mechadoll_Female:: @ 27EDBA
 	.string "Female$"
 
-gTrickHouse_Mechadoll4_Q1A3:: @ 27EDC1
+gTrickHouse_Mechadoll_Neither:: @ 27EDC1
 	.string "Neither$"
 
-gTrickHouse_Mechadoll4_Q2A1:: @ 27EDC9
+gTrickHouse_Mechadoll_ElderlyMen:: @ 27EDC9
 	.string "Elderly men$"
 
-gTrickHouse_Mechadoll4_Q2A2:: @ 27EDD5
+gTrickHouse_Mechadoll_ElderlyLadies:: @ 27EDD5
 	.string "Elderly ladies$"
 
-gTrickHouse_Mechadoll4_Q2A3:: @ 27EDE4
+gTrickHouse_Mechadoll_SameNumber:: @ 27EDE4
 	.string "Same number$"
 
-gTrickHouse_Mechadoll4_Q3A1:: @ 27EDF0
+gTrickHouse_Mechadoll_None:: @ 27EDF0
 	.string "None$"
 
-gTrickHouse_Mechadoll4_Q3A2:: @ 27EDF5
+gTrickHouse_Mechadoll_One:: @ 27EDF5
 	.string "1$"
 
-gTrickHouse_Mechadoll4_Q3A3:: @ 27EDF7
+gTrickHouse_Mechadoll_Two:: @ 27EDF7
 	.string "2$"
 
-gTrickHouse_Mechadoll5_Q1A1:: @ 27EDF9
+gTrickHouse_Mechadoll_Two2:: @ 27EDF9
 	.string "2$"
 
-gTrickHouse_Mechadoll5_Q1A2:: @ 27EDFB
+gTrickHouse_Mechadoll_Three:: @ 27EDFB
 	.string "3$"
 
-gTrickHouse_Mechadoll5_Q1A3:: @ 27EDFD
+gTrickHouse_Mechadoll_Four:: @ 27EDFD
 	.string "4$"
 
-gTrickHouse_Mechadoll5_Q2A1:: @ 27EDFF
+gTrickHouse_Mechadoll_Six:: @ 27EDFF
 	.string "6$"
 
-gTrickHouse_Mechadoll5_Q2A2:: @ 27EE01
+gTrickHouse_Mechadoll_Seven:: @ 27EE01
 	.string "7$"
 
-gTrickHouse_Mechadoll5_Q2A3:: @ 27EE03
+gTrickHouse_Mechadoll_Eight:: @ 27EE03
 	.string "8$"
 
-gTrickHouse_Mechadoll5_Q3A1:: @ 27EE05
+gTrickHouse_Mechadoll_Six2:: @ 27EE05
 	.string "6$"
 
-gTrickHouse_Mechadoll5_Q3A2:: @ 27EE07
+gTrickHouse_Mechadoll_Seven2:: @ 27EE07
 	.string "7$"
 
-gTrickHouse_Mechadoll5_Q3A3:: @ 27EE09
+gTrickHouse_Mechadoll_Eight2:: @ 27EE09
 	.string "8$"
 
 	.include "data/scripts/tv.inc"