Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-04-26 02:14:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Converted Mechadoll text to COMPOUND_STRINGs (#5276)

Browse Source
This commit is contained in:
Frank DeBlasio 2024-09-04 14:56:19 -04:00 committed by GitHub
parent 6e3ce9db2f
commit 3aa24f527e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 45 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/event_scripts.s
View File

@ -1103,7 +1103,6 @@ EventScript_VsSeekerChargingDone::
.include "data/text/contest_strings.inc"
.include "data/text/contest_link.inc"
.include "data/text/contest_painting.inc"
.include "data/text/trick_house_mechadolls.inc"
.include "data/scripts/tv.inc"
.include "data/text/tv.inc"
.include "data/scripts/interview.inc"

134
data/text/trick_house_mechadolls.inc
View File

@ -1,134 +0,0 @@
gTrickHouse_Mechadoll_Oddish::
.string "ODDISH$"
gTrickHouse_Mechadoll_Poochyena::
.string "POOCHYENA$"
gTrickHouse_Mechadoll_Taillow::
.string "TAILLOW$"
gTrickHouse_Mechadoll_Azurill::
.string "AZURILL$"
gTrickHouse_Mechadoll_Lotad::
.string "LOTAD$"
gTrickHouse_Mechadoll_Wingull::
.string "WINGULL$"
gTrickHouse_Mechadoll_Dustox::
.string "DUSTOX$"
gTrickHouse_Mechadoll_Zubat::
.string "ZUBAT$"
gTrickHouse_Mechadoll_Nincada::
.string "NINCADA$"
gTrickHouse_Mechadoll_Ralts::
.string "RALTS$"
gTrickHouse_Mechadoll_Zigzagoon::
.string "ZIGZAGOON$"
gTrickHouse_Mechadoll_Slakoth::
.string "SLAKOTH$"
gTrickHouse_Mechadoll_Poochyena2::
.string "POOCHYENA$"
gTrickHouse_Mechadoll_Shroomish::
.string "SHROOMISH$"
gTrickHouse_Mechadoll_Zigzagoon2::
.string "ZIGZAGOON$"
gTrickHouse_Mechadoll_Poochyena3::
.string "POOCHYENA$"
gTrickHouse_Mechadoll_Zubat2::
.string "ZUBAT$"
gTrickHouse_Mechadoll_Carvanha::
.string "CARVANHA$"
gTrickHouse_Mechadoll_BurnHeal::
.string "BURN HEAL$"
gTrickHouse_Mechadoll_HarborMail::
.string "HARBOR MAIL$"
gTrickHouse_Mechadoll_SamePrice::
.string "Same price$"
gTrickHouse_Mechadoll_60Yen::
.string "¥60$"
gTrickHouse_Mechadoll_55Yen::
.string "¥55$"
gTrickHouse_Mechadoll_Nothing::
.string "Nothing$"
gTrickHouse_Mechadoll_CostMore::
.string "They will cost more.$"
gTrickHouse_Mechadoll_CostLess::
.string "They will cost less.$"
gTrickHouse_Mechadoll_SamePrice2::
.string "Same price$"
gTrickHouse_Mechadoll_Male::
.string "Male$"
gTrickHouse_Mechadoll_Female::
.string "Female$"
gTrickHouse_Mechadoll_Neither::
.string "Neither$"
gTrickHouse_Mechadoll_ElderlyMen::
.string "Elderly men$"
gTrickHouse_Mechadoll_ElderlyLadies::
.string "Elderly ladies$"
gTrickHouse_Mechadoll_SameNumber::
.string "Same number$"
gTrickHouse_Mechadoll_None::
.string "None$"
gTrickHouse_Mechadoll_One::
.string "1$"
gTrickHouse_Mechadoll_Two::
.string "2$"
gTrickHouse_Mechadoll_Two2::
.string "2$"
gTrickHouse_Mechadoll_Three::
.string "3$"
gTrickHouse_Mechadoll_Four::
.string "4$"
gTrickHouse_Mechadoll_Six::
.string "6$"
gTrickHouse_Mechadoll_Seven::
.string "7$"
gTrickHouse_Mechadoll_Eight::
.string "8$"
gTrickHouse_Mechadoll_Six2::
.string "6$"
gTrickHouse_Mechadoll_Seven2::
.string "7$"
gTrickHouse_Mechadoll_Eight2::
.string "8$"

45
include/strings.h
View File

@ -1011,51 +1011,6 @@ extern const u8 gText_Yes[];
extern const u8 gText_No[];
extern const u8 gText_Challenge[];
extern const u8 gText_Info3[];
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[];
// Pokédex strings
extern const u8 gText_SearchForPkmnBasedOnParameters[];

90
src/data/script_menu.h
View File

@ -105,107 +105,107 @@ static const struct MenuAction MultichoiceList_LevelMode[] =
static const struct MenuAction MultichoiceList_Mechadoll1_Q1[] =
{
{gTrickHouse_Mechadoll_Oddish},
{gTrickHouse_Mechadoll_Poochyena},
{gTrickHouse_Mechadoll_Taillow},
{COMPOUND_STRING("ODDISH")},
{COMPOUND_STRING("POOCHYENA")},
{COMPOUND_STRING("TAILLOW")},
};
static const struct MenuAction MultichoiceList_Mechadoll1_Q2[] =
{
{gTrickHouse_Mechadoll_Azurill},
{gTrickHouse_Mechadoll_Lotad},
{gTrickHouse_Mechadoll_Wingull},
{COMPOUND_STRING("AZURILL")},
{COMPOUND_STRING("LOTAD")},
{COMPOUND_STRING("WINGULL")},
};
static const struct MenuAction MultichoiceList_Mechadoll1_Q3[] =
{
{gTrickHouse_Mechadoll_Dustox},
{gTrickHouse_Mechadoll_Zubat},
{gTrickHouse_Mechadoll_Nincada},
{COMPOUND_STRING("DUSTOX")},
{COMPOUND_STRING("ZUBAT")},
{COMPOUND_STRING("NINCADA")},
};
static const struct MenuAction MultichoiceList_Mechadoll2_Q1[] =
{
{gTrickHouse_Mechadoll_Ralts},
{gTrickHouse_Mechadoll_Zigzagoon},
{gTrickHouse_Mechadoll_Slakoth},
{COMPOUND_STRING("RALTS")},
{COMPOUND_STRING("ZIGZAGOON")},
{COMPOUND_STRING("SLAKOTH")},
};
static const struct MenuAction MultichoiceList_Mechadoll2_Q2[] =
{
{gTrickHouse_Mechadoll_Poochyena2},
{gTrickHouse_Mechadoll_Shroomish},
{gTrickHouse_Mechadoll_Zigzagoon2},
{COMPOUND_STRING("POOCHYENA")},
{COMPOUND_STRING("SHROOMISH")},
{COMPOUND_STRING("ZIGZAGOON")},
};
static const struct MenuAction MultichoiceList_Mechadoll2_Q3[] =
{
{gTrickHouse_Mechadoll_Poochyena3},
{gTrickHouse_Mechadoll_Zubat2},
{gTrickHouse_Mechadoll_Carvanha},
{COMPOUND_STRING("POOCHYENA")},
{COMPOUND_STRING("ZUBAT")},
{COMPOUND_STRING("CARVANHA")},
};
static const struct MenuAction MultichoiceList_Mechadoll3_Q1[] =
{
{gTrickHouse_Mechadoll_BurnHeal},
{gTrickHouse_Mechadoll_HarborMail},
{gTrickHouse_Mechadoll_SamePrice},
{COMPOUND_STRING("BURN HEAL")},
{COMPOUND_STRING("HARBOR MAIL")},
{COMPOUND_STRING("Same price")},
};
static const struct MenuAction MultichoiceList_Mechadoll3_Q2[] =
{
{gTrickHouse_Mechadoll_60Yen},
{gTrickHouse_Mechadoll_55Yen},
{gTrickHouse_Mechadoll_Nothing},
{COMPOUND_STRING("¥60")},
{COMPOUND_STRING("¥55")},
{COMPOUND_STRING("Nothing")},
};
static const struct MenuAction MultichoiceList_Mechadoll3_Q3[] =
{
{gTrickHouse_Mechadoll_CostMore},
{gTrickHouse_Mechadoll_CostLess},
{gTrickHouse_Mechadoll_SamePrice2},
{COMPOUND_STRING("They will cost more.")},
{COMPOUND_STRING("They will cost less.")},
{COMPOUND_STRING("Same price")},
};
static const struct MenuAction MultichoiceList_Mechadoll4_Q1[] =
{
{gTrickHouse_Mechadoll_Male},
{gTrickHouse_Mechadoll_Female},
{gTrickHouse_Mechadoll_Neither},
{COMPOUND_STRING("Male")},
{COMPOUND_STRING("Female")},
{COMPOUND_STRING("Neither")},
};
static const struct MenuAction MultichoiceList_Mechadoll4_Q2[] =
{
{gTrickHouse_Mechadoll_ElderlyMen},
{gTrickHouse_Mechadoll_ElderlyLadies},
{gTrickHouse_Mechadoll_SameNumber},
{COMPOUND_STRING("Elderly men")},
{COMPOUND_STRING("Elderly ladies")},
{COMPOUND_STRING("Same number")},
};
static const struct MenuAction MultichoiceList_Mechadoll4_Q3[] =
{
{gTrickHouse_Mechadoll_None},
{gTrickHouse_Mechadoll_One},
{gTrickHouse_Mechadoll_Two},
{COMPOUND_STRING("None")},
{COMPOUND_STRING("1")},
{COMPOUND_STRING("2")},
};
static const struct MenuAction MultichoiceList_Mechadoll5_Q1[] =
{
{gTrickHouse_Mechadoll_Two2},
{gTrickHouse_Mechadoll_Three},
{gTrickHouse_Mechadoll_Four},
{COMPOUND_STRING("2")},
{COMPOUND_STRING("3")},
{COMPOUND_STRING("4")},
};
static const struct MenuAction MultichoiceList_Mechadoll5_Q2[] =
{
{gTrickHouse_Mechadoll_Six},
{gTrickHouse_Mechadoll_Seven},
{gTrickHouse_Mechadoll_Eight},
{COMPOUND_STRING("6")},
{COMPOUND_STRING("7")},
{COMPOUND_STRING("8")},
};
static const struct MenuAction MultichoiceList_Mechadoll5_Q3[] =
{
{gTrickHouse_Mechadoll_Six2},
{gTrickHouse_Mechadoll_Seven2},
{gTrickHouse_Mechadoll_Eight2},
{COMPOUND_STRING("6")},
{COMPOUND_STRING("7")},
{COMPOUND_STRING("8")},
};
static const struct MenuAction MultichoiceList_VendingMachine[] =