Merge branch 'master' into document-eventscripts

1 files changed, 129 insertions, 128 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index b081ac234..412d68eff 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,6 +1,7 @@
 #include "constants/global.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_setup.h"
+#include "constants/berry.h"
 #include "constants/contest.h"
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
@@ -633,86 +634,86 @@ Std_MsgboxAutoclose:: @ 8271494
 	return
 
 EventScript_ResetAllBerries:: @ 827149D
-	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
-	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
-	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
-	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
-	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
-	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
-	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
-	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
-	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
-	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
-	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
-	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
-	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
-	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
-	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
-	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
-	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
-	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
-	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
-	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
-	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
-	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
-	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
-	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
-	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
-	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
-	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
-	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
-	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
-	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), 5
+	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
 	return
 
 EventScript_ResetAllMapFlags:: @ 82715DE
@@ -3241,139 +3242,139 @@ gContestPaintingTough3::
 	.string "The mighty tough\n"
 	.string "hyper POKéMON {STR_VAR_1}$"
 
-gUnknown_0827ECBC:: @ 27ECBC
+gTrickHouse_Mechadoll_Oddish:: @ 27ECBC
 	.string "ODDISH$"
 
-gUnknown_0827ECC3:: @ 27ECC3
+gTrickHouse_Mechadoll_Poochyena:: @ 27ECC3
 	.string "POOCHYENA$"
 
-gUnknown_0827ECCD:: @ 27ECCD
+gTrickHouse_Mechadoll_Taillow:: @ 27ECCD
 	.string "TAILLOW$"
 
-gUnknown_0827ECD5:: @ 27ECD5
+gTrickHouse_Mechadoll_Azurill:: @ 27ECD5
 	.string "AZURILL$"
 
-gUnknown_0827ECDD:: @ 27ECDD
+gTrickHouse_Mechadoll_Lotad:: @ 27ECDD
 	.string "LOTAD$"
 
-gUnknown_0827ECE3:: @ 27ECE3
+gTrickHouse_Mechadoll_Wingull:: @ 27ECE3
 	.string "WINGULL$"
 
-gUnknown_0827ECEB:: @ 27ECEB
+gTrickHouse_Mechadoll_Dustox:: @ 27ECEB
 	.string "DUSTOX$"
 
-gUnknown_0827ECF2:: @ 27ECF2
+gTrickHouse_Mechadoll_Zubat:: @ 27ECF2
 	.string "ZUBAT$"
 
-gUnknown_0827ECF8:: @ 27ECF8
+gTrickHouse_Mechadoll_Nincada:: @ 27ECF8
 	.string "NINCADA$"
 
-gUnknown_0827ED00:: @ 27ED00
+gTrickHouse_Mechadoll_Ralts:: @ 27ED00
 	.string "RALTS$"
 
-gUnknown_0827ED06:: @ 27ED06
+gTrickHouse_Mechadoll_Zigzagoon:: @ 27ED06
 	.string "ZIGZAGOON$"
 
-gUnknown_0827ED10:: @ 27ED10
+gTrickHouse_Mechadoll_Slakoth:: @ 27ED10
 	.string "SLAKOTH$"
 
-gUnknown_0827ED18:: @ 27ED18
+gTrickHouse_Mechadoll_Poochyena2:: @ 27ED18
 	.string "POOCHYENA$"
 
-gUnknown_0827ED22:: @ 27ED22
+gTrickHouse_Mechadoll_Shroomish:: @ 27ED22
 	.string "SHROOMISH$"
 
-gUnknown_0827ED2C:: @ 27ED2C
+gTrickHouse_Mechadoll_Zigzagoon2:: @ 27ED2C
 	.string "ZIGZAGOON$"
 
-gUnknown_0827ED36:: @ 27ED36
+gTrickHouse_Mechadoll_Poochyena3:: @ 27ED36
 	.string "POOCHYENA$"
 
-gUnknown_0827ED40:: @ 27ED40
+gTrickHouse_Mechadoll_Zubat2:: @ 27ED40
 	.string "ZUBAT$"
 
-gUnknown_0827ED46:: @ 27ED46
+gTrickHouse_Mechadoll_Carvanha:: @ 27ED46
 	.string "CARVANHA$"
 
-gUnknown_0827ED4F:: @ 27ED4F
+gTrickHouse_Mechadoll_BurnHeal:: @ 27ED4F
 	.string "BURN HEAL$"
 
-gUnknown_0827ED59:: @ 27ED59
+gTrickHouse_Mechadoll_HarborMail:: @ 27ED59
 	.string "HARBOR MAIL$"
 
-gUnknown_0827ED65:: @ 27ED65
+gTrickHouse_Mechadoll_SamePrice:: @ 27ED65
 	.string "Same price$"
 
-gUnknown_0827ED70:: @ 27ED70
+gTrickHouse_Mechadoll_60Yen:: @ 27ED70
 	.string "¥60$"
 
-gUnknown_0827ED74:: @ 27ED74
+gTrickHouse_Mechadoll_55Yen:: @ 27ED74
 	.string "¥55$"
 
-gUnknown_0827ED78:: @ 27ED78
+gTrickHouse_Mechadoll_Nothing:: @ 27ED78
 	.string "Nothing$"
 
-gUnknown_0827ED80:: @ 27ED80
+gTrickHouse_Mechadoll_CostMore:: @ 27ED80
 	.string "They will cost more.$"
 
-gUnknown_0827ED95:: @ 27ED95
+gTrickHouse_Mechadoll_CostLess:: @ 27ED95
 	.string "They will cost less.$"
 
-gUnknown_0827EDAA:: @ 27EDAA
+gTrickHouse_Mechadoll_SamePrice2:: @ 27EDAA
 	.string "Same price$"
 
-gUnknown_0827EDB5:: @ 27EDB5
+gTrickHouse_Mechadoll_Male:: @ 27EDB5
 	.string "Male$"
 
-gUnknown_0827EDBA:: @ 27EDBA
+gTrickHouse_Mechadoll_Female:: @ 27EDBA
 	.string "Female$"
 
-gUnknown_0827EDC1:: @ 27EDC1
+gTrickHouse_Mechadoll_Neither:: @ 27EDC1
 	.string "Neither$"
 
-gUnknown_0827EDC9:: @ 27EDC9
+gTrickHouse_Mechadoll_ElderlyMen:: @ 27EDC9
 	.string "Elderly men$"
 
-gUnknown_0827EDD5:: @ 27EDD5
+gTrickHouse_Mechadoll_ElderlyLadies:: @ 27EDD5
 	.string "Elderly ladies$"
 
-gUnknown_0827EDE4:: @ 27EDE4
+gTrickHouse_Mechadoll_SameNumber:: @ 27EDE4
 	.string "Same number$"
 
-gUnknown_0827EDF0:: @ 27EDF0
+gTrickHouse_Mechadoll_None:: @ 27EDF0
 	.string "None$"
 
-gUnknown_0827EDF5:: @ 27EDF5
+gTrickHouse_Mechadoll_One:: @ 27EDF5
 	.string "1$"
 
-gUnknown_0827EDF7:: @ 27EDF7
+gTrickHouse_Mechadoll_Two:: @ 27EDF7
 	.string "2$"
 
-gUnknown_0827EDF9:: @ 27EDF9
+gTrickHouse_Mechadoll_Two2:: @ 27EDF9
 	.string "2$"
 
-gUnknown_0827EDFB:: @ 27EDFB
+gTrickHouse_Mechadoll_Three:: @ 27EDFB
 	.string "3$"
 
-gUnknown_0827EDFD:: @ 27EDFD
+gTrickHouse_Mechadoll_Four:: @ 27EDFD
 	.string "4$"
 
-gUnknown_0827EDFF:: @ 27EDFF
+gTrickHouse_Mechadoll_Six:: @ 27EDFF
 	.string "6$"
 
-gUnknown_0827EE01:: @ 27EE01
+gTrickHouse_Mechadoll_Seven:: @ 27EE01
 	.string "7$"
 
-gUnknown_0827EE03:: @ 27EE03
+gTrickHouse_Mechadoll_Eight:: @ 27EE03
 	.string "8$"
 
-gUnknown_0827EE05:: @ 27EE05
+gTrickHouse_Mechadoll_Six2:: @ 27EE05
 	.string "6$"
 
-gUnknown_0827EE07:: @ 27EE07
+gTrickHouse_Mechadoll_Seven2:: @ 27EE07
 	.string "7$"
 
-gUnknown_0827EE09:: @ 27EE09
+gTrickHouse_Mechadoll_Eight2:: @ 27EE09
 	.string "8$"
 
 	.include "data/scripts/tv.inc"
@@ -4338,17 +4339,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
 	goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F
 	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	end