ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed names.

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2019-09-05 21:17:01 -04:00 committed by huderlem
parent e2689d2a27
commit de02805388
3 changed files with 135 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
data/event_scripts.s
View File

@ -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"

90
include/strings.h
View File

@ -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 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[];
extern const u8 gTrickHouse_Mechadoll_Oddish[];
extern const u8 gTrickHouse_Mechadoll_Poochyena[];
extern const u8 gTrickHouse_Mechadoll_Taillow[];
extern const u8 gTrickHouse_Mechadoll_Azurill[];
extern const u8 gTrickHouse_Mechadoll_Lotad[];
extern const u8 gTrickHouse_Mechadoll_Wingull[];
extern const u8 gTrickHouse_Mechadoll_Dustox[];
extern const u8 gTrickHouse_Mechadoll_Zubat[];
extern const u8 gTrickHouse_Mechadoll_Nincada[];
extern const u8 gTrickHouse_Mechadoll_Ralts[];
extern const u8 gTrickHouse_Mechadoll_Zigzagoon[];
extern const u8 gTrickHouse_Mechadoll_Slakoth[];
extern const u8 gTrickHouse_Mechadoll_Poochyena2[];
extern const u8 gTrickHouse_Mechadoll_Shroomish[];
extern const u8 gTrickHouse_Mechadoll_Zigzagoon2[];
extern const u8 gTrickHouse_Mechadoll_Poochyena3[];
extern const u8 gTrickHouse_Mechadoll_Zubat2[];
extern const u8 gTrickHouse_Mechadoll_Carvanha[];
extern const u8 gTrickHouse_Mechadoll_BurnHeal[];
extern const u8 gTrickHouse_Mechadoll_HarborMail[];
extern const u8 gTrickHouse_Mechadoll_SamePrice[];
extern const u8 gTrickHouse_Mechadoll_60Yen[];
extern const u8 gTrickHouse_Mechadoll_55Yen[];
extern const u8 gTrickHouse_Mechadoll_Nothing[];
extern const u8 gTrickHouse_Mechadoll_CostMore[];
extern const u8 gTrickHouse_Mechadoll_CostLess[];
extern const u8 gTrickHouse_Mechadoll_SamePrice2[];
extern const u8 gTrickHouse_Mechadoll_Male[];
extern const u8 gTrickHouse_Mechadoll_Female[];
extern const u8 gTrickHouse_Mechadoll_Neither[];
extern const u8 gTrickHouse_Mechadoll_ElderlyMen[];
extern const u8 gTrickHouse_Mechadoll_ElderlyLadies[];
extern const u8 gTrickHouse_Mechadoll_SameNumber[];
extern const u8 gTrickHouse_Mechadoll_None[];
extern const u8 gTrickHouse_Mechadoll_One[];
extern const u8 gTrickHouse_Mechadoll_Two[];
extern const u8 gTrickHouse_Mechadoll_Two2[];
extern const u8 gTrickHouse_Mechadoll_Three[];
extern const u8 gTrickHouse_Mechadoll_Four[];
extern const u8 gTrickHouse_Mechadoll_Six[];
extern const u8 gTrickHouse_Mechadoll_Seven[];
extern const u8 gTrickHouse_Mechadoll_Eight[];
extern const u8 gTrickHouse_Mechadoll_Six2[];
extern const u8 gTrickHouse_Mechadoll_Seven2[];
extern const u8 gTrickHouse_Mechadoll_Eight2[];
// Pokedex strings
extern const u8 gUnknown_085E87A5[];

90
src/script_menu.c
View File

@ -123,107 +123,107 @@ const struct MenuAction MultichoiceList_024[] =
const struct MenuAction MultichoiceList_025[] = //Trick House Mechadoll 1, Question 1
{
{gTrickHouse_Mechadoll1_Q1A1, NULL},
{gTrickHouse_Mechadoll1_Q1A2, NULL},
{gTrickHouse_Mechadoll1_Q1A3, NULL},
{gTrickHouse_Mechadoll_Oddish, NULL},
{gTrickHouse_Mechadoll_Poochyena, NULL},
{gTrickHouse_Mechadoll_Taillow, NULL},
};
const struct MenuAction MultichoiceList_026[] = //Trick House Mechadoll 1, Question 2
{
{gTrickHouse_Mechadoll1_Q2A1, NULL},
{gTrickHouse_Mechadoll1_Q2A2, NULL},
{gTrickHouse_Mechadoll1_Q2A3, NULL},
{gTrickHouse_Mechadoll_Azurill, NULL},
{gTrickHouse_Mechadoll_Lotad, NULL},
{gTrickHouse_Mechadoll_Wingull, NULL},
};
const struct MenuAction MultichoiceList_027[] = //Trick House Mechadoll 1, Question 3
{
{gTrickHouse_Mechadoll1_Q3A1, NULL},
{gTrickHouse_Mechadoll1_Q3A2, NULL},
{gTrickHouse_Mechadoll1_Q3A3, NULL},
{gTrickHouse_Mechadoll_Dustox, NULL},
{gTrickHouse_Mechadoll_Zubat, NULL},
{gTrickHouse_Mechadoll_Nincada, NULL},
};
const struct MenuAction MultichoiceList_028[] = //Trick House Mechadoll 2, Question 1
{
{gTrickHouse_Mechadoll2_Q1A1, NULL},
{gTrickHouse_Mechadoll2_Q1A2, NULL},
{gTrickHouse_Mechadoll2_Q1A3, NULL},
{gTrickHouse_Mechadoll_Ralts, NULL},
{gTrickHouse_Mechadoll_Zigzagoon, NULL},
{gTrickHouse_Mechadoll_Slakoth, NULL},
};
const struct MenuAction MultichoiceList_029[] = //Trick House Mechadoll 2, Question 2
{
{gTrickHouse_Mechadoll2_Q2A1, NULL},
{gTrickHouse_Mechadoll2_Q2A2, NULL},
{gTrickHouse_Mechadoll2_Q2A3, NULL},
{gTrickHouse_Mechadoll_Poochyena2, NULL},
{gTrickHouse_Mechadoll_Shroomish, NULL},
{gTrickHouse_Mechadoll_Zigzagoon2, NULL},
};
const struct MenuAction MultichoiceList_030[] = //Trick House Mechadoll 2, Question 3
{
{gTrickHouse_Mechadoll2_Q3A1, NULL},
{gTrickHouse_Mechadoll2_Q3A2, NULL},
{gTrickHouse_Mechadoll2_Q3A3, NULL},
{gTrickHouse_Mechadoll_Poochyena3, NULL},
{gTrickHouse_Mechadoll_Zubat2, NULL},
{gTrickHouse_Mechadoll_Carvanha, NULL},
};
const struct MenuAction MultichoiceList_031[] = //Trick House Mechadoll 3, Question 1
{
{gTrickHouse_Mechadoll3_Q1A1, NULL},
{gTrickHouse_Mechadoll3_Q1A2, NULL},
{gTrickHouse_Mechadoll3_Q1A3, NULL},
{gTrickHouse_Mechadoll_BurnHeal, NULL},
{gTrickHouse_Mechadoll_HarborMail, NULL},
{gTrickHouse_Mechadoll_SamePrice, NULL},
};
const struct MenuAction MultichoiceList_032[] = //Trick House Mechadoll 3, Question 2
{
{gTrickHouse_Mechadoll3_Q2A1, NULL},
{gTrickHouse_Mechadoll3_Q2A2, NULL},
{gTrickHouse_Mechadoll3_Q2A3, NULL},
{gTrickHouse_Mechadoll_60Yen, NULL},
{gTrickHouse_Mechadoll_55Yen, NULL},
{gTrickHouse_Mechadoll_Nothing, NULL},
};
const struct MenuAction MultichoiceList_033[] = //Trick House Mechadoll 3, Question 3
{
{gTrickHouse_Mechadoll3_Q3A1, NULL},
{gTrickHouse_Mechadoll3_Q3A2, NULL},
{gTrickHouse_Mechadoll3_Q3A3, NULL},
{gTrickHouse_Mechadoll_CostMore, NULL},
{gTrickHouse_Mechadoll_CostLess, NULL},
{gTrickHouse_Mechadoll_SamePrice2, NULL},
};
const struct MenuAction MultichoiceList_034[] = //Trick House Mechadoll 4, Question 1
{
{gTrickHouse_Mechadoll4_Q1A1, NULL},
{gTrickHouse_Mechadoll4_Q1A2, NULL},
{gTrickHouse_Mechadoll4_Q1A3, NULL},
{gTrickHouse_Mechadoll_Male, NULL},
{gTrickHouse_Mechadoll_Female, NULL},
{gTrickHouse_Mechadoll_Neither, NULL},
};
const struct MenuAction MultichoiceList_035[] = //Trick House Mechadoll 4, Question 2
{
{gTrickHouse_Mechadoll4_Q2A1, NULL},
{gTrickHouse_Mechadoll4_Q2A2, NULL},
{gTrickHouse_Mechadoll4_Q2A3, NULL},
{gTrickHouse_Mechadoll_ElderlyMen, NULL},
{gTrickHouse_Mechadoll_ElderlyLadies, NULL},
{gTrickHouse_Mechadoll_SameNumber, NULL},
};
const struct MenuAction MultichoiceList_036[] = //Trick House Mechadoll 4, Question 3
{
{gTrickHouse_Mechadoll4_Q3A1, NULL},
{gTrickHouse_Mechadoll4_Q3A2, NULL},
{gTrickHouse_Mechadoll4_Q3A3, NULL},
{gTrickHouse_Mechadoll_None, NULL},
{gTrickHouse_Mechadoll_One, NULL},
{gTrickHouse_Mechadoll_Two, NULL},
};
const struct MenuAction MultichoiceList_037[] = //Trick House Mechadoll 5, Question 1
{
{gTrickHouse_Mechadoll5_Q1A1, NULL},
{gTrickHouse_Mechadoll5_Q1A2, NULL},
{gTrickHouse_Mechadoll5_Q1A3, NULL},
{gTrickHouse_Mechadoll_Two2, NULL},
{gTrickHouse_Mechadoll_Three, NULL},
{gTrickHouse_Mechadoll_Four, NULL},
};
const struct MenuAction MultichoiceList_038[] = //Trick House Mechadoll 5, Question 2
{
{gTrickHouse_Mechadoll5_Q2A1, NULL},
{gTrickHouse_Mechadoll5_Q2A2, NULL},
{gTrickHouse_Mechadoll5_Q2A3, NULL},
{gTrickHouse_Mechadoll_Six, NULL},
{gTrickHouse_Mechadoll_Seven, NULL},
{gTrickHouse_Mechadoll_Eight, NULL},
};
const struct MenuAction MultichoiceList_039[] = //Trick House Mechadoll 5, Question 3
{
{gTrickHouse_Mechadoll5_Q3A1, NULL},
{gTrickHouse_Mechadoll5_Q3A2, NULL},
{gTrickHouse_Mechadoll5_Q3A3, NULL},
{gTrickHouse_Mechadoll_Six2, NULL},
{gTrickHouse_Mechadoll_Seven2, NULL},
{gTrickHouse_Mechadoll_Eight2, NULL},
};
const struct MenuAction MultichoiceList_042[] =