diff --git a/data/event_scripts.s b/data/event_scripts.s index a7c2dc93f1..a01ec67633 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}$" -gUnknown_0827ECBC:: @ 27ECBC +gTrickHouse_Mechadoll1_Q1A1:: @ 27ECBC .string "ODDISH$" -gUnknown_0827ECC3:: @ 27ECC3 +gTrickHouse_Mechadoll1_Q1A2:: @ 27ECC3 .string "POOCHYENA$" -gUnknown_0827ECCD:: @ 27ECCD +gTrickHouse_Mechadoll1_Q1A3:: @ 27ECCD .string "TAILLOW$" -gUnknown_0827ECD5:: @ 27ECD5 +gTrickHouse_Mechadoll1_Q2A1:: @ 27ECD5 .string "AZURILL$" -gUnknown_0827ECDD:: @ 27ECDD +gTrickHouse_Mechadoll1_Q2A2:: @ 27ECDD .string "LOTAD$" -gUnknown_0827ECE3:: @ 27ECE3 +gTrickHouse_Mechadoll1_Q2A3:: @ 27ECE3 .string "WINGULL$" -gUnknown_0827ECEB:: @ 27ECEB +gTrickHouse_Mechadoll1_Q3A1:: @ 27ECEB .string "DUSTOX$" -gUnknown_0827ECF2:: @ 27ECF2 +gTrickHouse_Mechadoll1_Q3A2:: @ 27ECF2 .string "ZUBAT$" -gUnknown_0827ECF8:: @ 27ECF8 +gTrickHouse_Mechadoll1_Q3A3:: @ 27ECF8 .string "NINCADA$" -gUnknown_0827ED00:: @ 27ED00 +gTrickHouse_Mechadoll2_Q1A1:: @ 27ED00 .string "RALTS$" -gUnknown_0827ED06:: @ 27ED06 +gTrickHouse_Mechadoll2_Q1A2:: @ 27ED06 .string "ZIGZAGOON$" -gUnknown_0827ED10:: @ 27ED10 +gTrickHouse_Mechadoll2_Q1A3:: @ 27ED10 .string "SLAKOTH$" -gUnknown_0827ED18:: @ 27ED18 +gTrickHouse_Mechadoll2_Q2A1:: @ 27ED18 .string "POOCHYENA$" -gUnknown_0827ED22:: @ 27ED22 +gTrickHouse_Mechadoll2_Q2A2:: @ 27ED22 .string "SHROOMISH$" -gUnknown_0827ED2C:: @ 27ED2C +gTrickHouse_Mechadoll2_Q2A3:: @ 27ED2C .string "ZIGZAGOON$" -gUnknown_0827ED36:: @ 27ED36 +gTrickHouse_Mechadoll2_Q3A1:: @ 27ED36 .string "POOCHYENA$" -gUnknown_0827ED40:: @ 27ED40 +gTrickHouse_Mechadoll2_Q3A2:: @ 27ED40 .string "ZUBAT$" -gUnknown_0827ED46:: @ 27ED46 +gTrickHouse_Mechadoll2_Q3A3:: @ 27ED46 .string "CARVANHA$" -gUnknown_0827ED4F:: @ 27ED4F +gTrickHouse_Mechadoll3_Q1A1:: @ 27ED4F .string "BURN HEAL$" -gUnknown_0827ED59:: @ 27ED59 +gTrickHouse_Mechadoll3_Q1A2:: @ 27ED59 .string "HARBOR MAIL$" -gUnknown_0827ED65:: @ 27ED65 +gTrickHouse_Mechadoll3_Q1A3:: @ 27ED65 .string "Same price$" -gUnknown_0827ED70:: @ 27ED70 +gTrickHouse_Mechadoll3_Q2A1:: @ 27ED70 .string "¥60$" -gUnknown_0827ED74:: @ 27ED74 +gTrickHouse_Mechadoll3_Q2A2:: @ 27ED74 .string "¥55$" -gUnknown_0827ED78:: @ 27ED78 +gTrickHouse_Mechadoll3_Q2A3:: @ 27ED78 .string "Nothing$" -gUnknown_0827ED80:: @ 27ED80 +gTrickHouse_Mechadoll3_Q3A1:: @ 27ED80 .string "They will cost more.$" -gUnknown_0827ED95:: @ 27ED95 +gTrickHouse_Mechadoll3_Q3A2:: @ 27ED95 .string "They will cost less.$" -gUnknown_0827EDAA:: @ 27EDAA +gTrickHouse_Mechadoll3_Q3A3:: @ 27EDAA .string "Same price$" -gUnknown_0827EDB5:: @ 27EDB5 +gTrickHouse_Mechadoll4_Q1A1:: @ 27EDB5 .string "Male$" -gUnknown_0827EDBA:: @ 27EDBA +gTrickHouse_Mechadoll4_Q1A2:: @ 27EDBA .string "Female$" -gUnknown_0827EDC1:: @ 27EDC1 +gTrickHouse_Mechadoll4_Q1A3:: @ 27EDC1 .string "Neither$" -gUnknown_0827EDC9:: @ 27EDC9 +gTrickHouse_Mechadoll4_Q2A1:: @ 27EDC9 .string "Elderly men$" -gUnknown_0827EDD5:: @ 27EDD5 +gTrickHouse_Mechadoll4_Q2A2:: @ 27EDD5 .string "Elderly ladies$" -gUnknown_0827EDE4:: @ 27EDE4 +gTrickHouse_Mechadoll4_Q2A3:: @ 27EDE4 .string "Same number$" -gUnknown_0827EDF0:: @ 27EDF0 +gTrickHouse_Mechadoll4_Q3A1:: @ 27EDF0 .string "None$" -gUnknown_0827EDF5:: @ 27EDF5 +gTrickHouse_Mechadoll4_Q3A2:: @ 27EDF5 .string "1$" -gUnknown_0827EDF7:: @ 27EDF7 +gTrickHouse_Mechadoll4_Q3A3:: @ 27EDF7 .string "2$" -gUnknown_0827EDF9:: @ 27EDF9 +gTrickHouse_Mechadoll5_Q1A1:: @ 27EDF9 .string "2$" -gUnknown_0827EDFB:: @ 27EDFB +gTrickHouse_Mechadoll5_Q1A2:: @ 27EDFB .string "3$" -gUnknown_0827EDFD:: @ 27EDFD +gTrickHouse_Mechadoll5_Q1A3:: @ 27EDFD .string "4$" -gUnknown_0827EDFF:: @ 27EDFF +gTrickHouse_Mechadoll5_Q2A1:: @ 27EDFF .string "6$" -gUnknown_0827EE01:: @ 27EE01 +gTrickHouse_Mechadoll5_Q2A2:: @ 27EE01 .string "7$" -gUnknown_0827EE03:: @ 27EE03 +gTrickHouse_Mechadoll5_Q2A3:: @ 27EE03 .string "8$" -gUnknown_0827EE05:: @ 27EE05 +gTrickHouse_Mechadoll5_Q3A1:: @ 27EE05 .string "6$" -gUnknown_0827EE07:: @ 27EE07 +gTrickHouse_Mechadoll5_Q3A2:: @ 27EE07 .string "7$" -gUnknown_0827EE09:: @ 27EE09 +gTrickHouse_Mechadoll5_Q3A3:: @ 27EE09 .string "8$" .include "data/scripts/tv.inc" diff --git a/include/strings.h b/include/strings.h index 78ae2c1402..8626471880 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1054,51 +1054,51 @@ extern const u8 gText_Yes[]; extern const u8 gText_No[]; extern const u8 gUnknown_085EAEA2[]; extern const u8 gUnknown_085EAEAC[]; -extern const u8 gUnknown_0827ECBC[]; -extern const u8 gUnknown_0827ECC3[]; -extern const u8 gUnknown_0827ECCD[]; -extern const u8 gUnknown_0827ECD5[]; -extern const u8 gUnknown_0827ECDD[]; -extern const u8 gUnknown_0827ECE3[]; -extern const u8 gUnknown_0827ECEB[]; -extern const u8 gUnknown_0827ECF2[]; -extern const u8 gUnknown_0827ECF8[]; -extern const u8 gUnknown_0827ED00[]; -extern const u8 gUnknown_0827ED06[]; -extern const u8 gUnknown_0827ED10[]; -extern const u8 gUnknown_0827ED18[]; -extern const u8 gUnknown_0827ED22[]; -extern const u8 gUnknown_0827ED2C[]; -extern const u8 gUnknown_0827ED36[]; -extern const u8 gUnknown_0827ED40[]; -extern const u8 gUnknown_0827ED46[]; -extern const u8 gUnknown_0827ED4F[]; -extern const u8 gUnknown_0827ED59[]; -extern const u8 gUnknown_0827ED65[]; -extern const u8 gUnknown_0827ED70[]; -extern const u8 gUnknown_0827ED74[]; -extern const u8 gUnknown_0827ED78[]; -extern const u8 gUnknown_0827ED80[]; -extern const u8 gUnknown_0827ED95[]; -extern const u8 gUnknown_0827EDAA[]; -extern const u8 gUnknown_0827EDB5[]; -extern const u8 gUnknown_0827EDBA[]; -extern const u8 gUnknown_0827EDC1[]; -extern const u8 gUnknown_0827EDC9[]; -extern const u8 gUnknown_0827EDD5[]; -extern const u8 gUnknown_0827EDE4[]; -extern const u8 gUnknown_0827EDF0[]; -extern const u8 gUnknown_0827EDF5[]; -extern const u8 gUnknown_0827EDF7[]; -extern const u8 gUnknown_0827EDF9[]; -extern const u8 gUnknown_0827EDFB[]; -extern const u8 gUnknown_0827EDFD[]; -extern const u8 gUnknown_0827EDFF[]; -extern const u8 gUnknown_0827EE01[]; -extern const u8 gUnknown_0827EE03[]; -extern const u8 gUnknown_0827EE05[]; -extern const u8 gUnknown_0827EE07[]; -extern const u8 gUnknown_0827EE09[]; +extern const u8 gTrickHouse_Mechadoll1_Q1A1[]; +extern const u8 gTrickHouse_Mechadoll1_Q1A2[]; +extern const u8 gTrickHouse_Mechadoll1_Q1A3[]; +extern const u8 gTrickHouse_Mechadoll1_Q2A1[]; +extern const u8 gTrickHouse_Mechadoll1_Q2A2[]; +extern const u8 gTrickHouse_Mechadoll1_Q2A3[]; +extern const u8 gTrickHouse_Mechadoll1_Q3A1[]; +extern const u8 gTrickHouse_Mechadoll1_Q3A2[]; +extern const u8 gTrickHouse_Mechadoll1_Q3A3[]; +extern const u8 gTrickHouse_Mechadoll2_Q1A1[]; +extern const u8 gTrickHouse_Mechadoll2_Q1A2[]; +extern const u8 gTrickHouse_Mechadoll2_Q1A3[]; +extern const u8 gTrickHouse_Mechadoll2_Q2A1[]; +extern const u8 gTrickHouse_Mechadoll2_Q2A2[]; +extern const u8 gTrickHouse_Mechadoll2_Q2A3[]; +extern const u8 gTrickHouse_Mechadoll2_Q3A1[]; +extern const u8 gTrickHouse_Mechadoll2_Q3A2[]; +extern const u8 gTrickHouse_Mechadoll2_Q3A3[]; +extern const u8 gTrickHouse_Mechadoll3_Q1A1[]; +extern const u8 gTrickHouse_Mechadoll3_Q1A2[]; +extern const u8 gTrickHouse_Mechadoll3_Q1A3[]; +extern const u8 gTrickHouse_Mechadoll3_Q2A1[]; +extern const u8 gTrickHouse_Mechadoll3_Q2A2[]; +extern const u8 gTrickHouse_Mechadoll3_Q2A3[]; +extern const u8 gTrickHouse_Mechadoll3_Q3A1[]; +extern const u8 gTrickHouse_Mechadoll3_Q3A2[]; +extern const u8 gTrickHouse_Mechadoll3_Q3A3[]; +extern const u8 gTrickHouse_Mechadoll4_Q1A1[]; +extern const u8 gTrickHouse_Mechadoll4_Q1A2[]; +extern const u8 gTrickHouse_Mechadoll4_Q1A3[]; +extern const u8 gTrickHouse_Mechadoll4_Q2A1[]; +extern const u8 gTrickHouse_Mechadoll4_Q2A2[]; +extern const u8 gTrickHouse_Mechadoll4_Q2A3[]; +extern const u8 gTrickHouse_Mechadoll4_Q3A1[]; +extern const u8 gTrickHouse_Mechadoll4_Q3A2[]; +extern const u8 gTrickHouse_Mechadoll4_Q3A3[]; +extern const u8 gTrickHouse_Mechadoll5_Q1A1[]; +extern const u8 gTrickHouse_Mechadoll5_Q1A2[]; +extern const u8 gTrickHouse_Mechadoll5_Q1A3[]; +extern const u8 gTrickHouse_Mechadoll5_Q2A1[]; +extern const u8 gTrickHouse_Mechadoll5_Q2A2[]; +extern const u8 gTrickHouse_Mechadoll5_Q2A3[]; +extern const u8 gTrickHouse_Mechadoll5_Q3A1[]; +extern const u8 gTrickHouse_Mechadoll5_Q3A2[]; +extern const u8 gTrickHouse_Mechadoll5_Q3A3[]; // Pokedex strings extern const u8 gUnknown_085E87A5[]; diff --git a/src/script_menu.c b/src/script_menu.c index b0e0ec9201..a56e7fbd67 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -121,109 +121,109 @@ const struct MenuAction MultichoiceList_024[] = {gText_Exit, NULL}, }; -const struct MenuAction MultichoiceList_025[] = +const struct MenuAction MultichoiceList_025[] = //Trick House Mechadoll 1, Question 1 { - {gUnknown_0827ECBC, NULL}, - {gUnknown_0827ECC3, NULL}, - {gUnknown_0827ECCD, NULL}, + {gTrickHouse_Mechadoll1_Q1A1, NULL}, + {gTrickHouse_Mechadoll1_Q1A2, NULL}, + {gTrickHouse_Mechadoll1_Q1A3, NULL}, }; -const struct MenuAction MultichoiceList_026[] = +const struct MenuAction MultichoiceList_026[] = //Trick House Mechadoll 1, Question 2 { - {gUnknown_0827ECD5, NULL}, - {gUnknown_0827ECDD, NULL}, - {gUnknown_0827ECE3, NULL}, + {gTrickHouse_Mechadoll1_Q2A1, NULL}, + {gTrickHouse_Mechadoll1_Q2A2, NULL}, + {gTrickHouse_Mechadoll1_Q2A3, NULL}, }; -const struct MenuAction MultichoiceList_027[] = +const struct MenuAction MultichoiceList_027[] = //Trick House Mechadoll 1, Question 3 { - {gUnknown_0827ECEB, NULL}, - {gUnknown_0827ECF2, NULL}, - {gUnknown_0827ECF8, NULL}, + {gTrickHouse_Mechadoll1_Q3A1, NULL}, + {gTrickHouse_Mechadoll1_Q3A2, NULL}, + {gTrickHouse_Mechadoll1_Q3A3, NULL}, }; -const struct MenuAction MultichoiceList_028[] = +const struct MenuAction MultichoiceList_028[] = //Trick House Mechadoll 2, Question 1 { - {gUnknown_0827ED00, NULL}, - {gUnknown_0827ED06, NULL}, - {gUnknown_0827ED10, NULL}, + {gTrickHouse_Mechadoll2_Q1A1, NULL}, + {gTrickHouse_Mechadoll2_Q1A2, NULL}, + {gTrickHouse_Mechadoll2_Q1A3, NULL}, }; -const struct MenuAction MultichoiceList_029[] = +const struct MenuAction MultichoiceList_029[] = //Trick House Mechadoll 2, Question 2 { - {gUnknown_0827ED18, NULL}, - {gUnknown_0827ED22, NULL}, - {gUnknown_0827ED2C, NULL}, + {gTrickHouse_Mechadoll2_Q2A1, NULL}, + {gTrickHouse_Mechadoll2_Q2A2, NULL}, + {gTrickHouse_Mechadoll2_Q2A3, NULL}, }; -const struct MenuAction MultichoiceList_030[] = +const struct MenuAction MultichoiceList_030[] = //Trick House Mechadoll 2, Question 3 { - {gUnknown_0827ED36, NULL}, - {gUnknown_0827ED40, NULL}, - {gUnknown_0827ED46, NULL}, + {gTrickHouse_Mechadoll2_Q3A1, NULL}, + {gTrickHouse_Mechadoll2_Q3A2, NULL}, + {gTrickHouse_Mechadoll2_Q3A3, NULL}, }; -const struct MenuAction MultichoiceList_031[] = +const struct MenuAction MultichoiceList_031[] = //Trick House Mechadoll 3, Question 1 { - {gUnknown_0827ED4F, NULL}, - {gUnknown_0827ED59, NULL}, - {gUnknown_0827ED65, NULL}, + {gTrickHouse_Mechadoll3_Q1A1, NULL}, + {gTrickHouse_Mechadoll3_Q1A2, NULL}, + {gTrickHouse_Mechadoll3_Q1A3, NULL}, }; -const struct MenuAction MultichoiceList_032[] = +const struct MenuAction MultichoiceList_032[] = //Trick House Mechadoll 3, Question 2 { - {gUnknown_0827ED70, NULL}, - {gUnknown_0827ED74, NULL}, - {gUnknown_0827ED78, NULL}, + {gTrickHouse_Mechadoll3_Q2A1, NULL}, + {gTrickHouse_Mechadoll3_Q2A2, NULL}, + {gTrickHouse_Mechadoll3_Q2A3, NULL}, }; -const struct MenuAction MultichoiceList_033[] = +const struct MenuAction MultichoiceList_033[] = //Trick House Mechadoll 3, Question 3 { - {gUnknown_0827ED80, NULL}, - {gUnknown_0827ED95, NULL}, - {gUnknown_0827EDAA, NULL}, + {gTrickHouse_Mechadoll3_Q3A1, NULL}, + {gTrickHouse_Mechadoll3_Q3A2, NULL}, + {gTrickHouse_Mechadoll3_Q3A3, NULL}, }; -const struct MenuAction MultichoiceList_034[] = +const struct MenuAction MultichoiceList_034[] = //Trick House Mechadoll 4, Question 1 { - {gUnknown_0827EDB5, NULL}, - {gUnknown_0827EDBA, NULL}, - {gUnknown_0827EDC1, NULL}, + {gTrickHouse_Mechadoll4_Q1A1, NULL}, + {gTrickHouse_Mechadoll4_Q1A2, NULL}, + {gTrickHouse_Mechadoll4_Q1A3, NULL}, }; -const struct MenuAction MultichoiceList_035[] = +const struct MenuAction MultichoiceList_035[] = //Trick House Mechadoll 4, Question 2 { - {gUnknown_0827EDC9, NULL}, - {gUnknown_0827EDD5, NULL}, - {gUnknown_0827EDE4, NULL}, + {gTrickHouse_Mechadoll4_Q2A1, NULL}, + {gTrickHouse_Mechadoll4_Q2A2, NULL}, + {gTrickHouse_Mechadoll4_Q2A3, NULL}, }; -const struct MenuAction MultichoiceList_036[] = +const struct MenuAction MultichoiceList_036[] = //Trick House Mechadoll 4, Question 3 { - {gUnknown_0827EDF0, NULL}, - {gUnknown_0827EDF5, NULL}, - {gUnknown_0827EDF7, NULL}, + {gTrickHouse_Mechadoll4_Q3A1, NULL}, + {gTrickHouse_Mechadoll4_Q3A2, NULL}, + {gTrickHouse_Mechadoll4_Q3A3, NULL}, }; -const struct MenuAction MultichoiceList_037[] = +const struct MenuAction MultichoiceList_037[] = //Trick House Mechadoll 5, Question 1 { - {gUnknown_0827EDF9, NULL}, - {gUnknown_0827EDFB, NULL}, - {gUnknown_0827EDFD, NULL}, + {gTrickHouse_Mechadoll5_Q1A1, NULL}, + {gTrickHouse_Mechadoll5_Q1A2, NULL}, + {gTrickHouse_Mechadoll5_Q1A3, NULL}, }; -const struct MenuAction MultichoiceList_038[] = +const struct MenuAction MultichoiceList_038[] = //Trick House Mechadoll 5, Question 2 { - {gUnknown_0827EDFF, NULL}, - {gUnknown_0827EE01, NULL}, - {gUnknown_0827EE03, NULL}, + {gTrickHouse_Mechadoll5_Q2A1, NULL}, + {gTrickHouse_Mechadoll5_Q2A2, NULL}, + {gTrickHouse_Mechadoll5_Q2A3, NULL}, }; -const struct MenuAction MultichoiceList_039[] = +const struct MenuAction MultichoiceList_039[] = //Trick House Mechadoll 5, Question 3 { - {gUnknown_0827EE05, NULL}, - {gUnknown_0827EE07, NULL}, - {gUnknown_0827EE09, NULL}, + {gTrickHouse_Mechadoll5_Q3A1, NULL}, + {gTrickHouse_Mechadoll5_Q3A2, NULL}, + {gTrickHouse_Mechadoll5_Q3A3, NULL}, }; const struct MenuAction MultichoiceList_042[] =