dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more usage of GENDER_COUNT

Browse Source
This commit is contained in:
GriffinR
2022-09-12 14:54:05 -04:00
parent 8fd8d21980
commit c9281e5a57
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/union_room_message.h
+2 -2
View File
@@ -32,7 +32,7 @@ extern const u8 gText_UR_LinkWithFriendDropped[];
extern const u8 *const gTexts_UR_LinkDropped[]; extern const u8 *const gTexts_UR_LinkDropped[];
extern const u8 gText_UR_AwaitingPlayersResponseAboutTrade[]; extern const u8 gText_UR_AwaitingPlayersResponseAboutTrade[];
extern const u8 *const gTexts_UR_CommunicatingWait[]; extern const u8 *const gTexts_UR_CommunicatingWait[];
extern const u8 *const gTexts_UR_HiDoSomething[][2]; extern const u8 *const gTexts_UR_HiDoSomething[][GENDER_COUNT];
extern const u8 *const gTexts_UR_PlayerContactedYou[]; extern const u8 *const gTexts_UR_PlayerContactedYou[];
extern const u8 *const gTexts_UR_AwaitingResponse[]; extern const u8 *const gTexts_UR_AwaitingResponse[];
extern const u8 gText_UR_ShowTrainerCard[]; extern const u8 gText_UR_ShowTrainerCard[];
@@ -44,7 +44,7 @@ extern const u8 gText_UR_ChatDropped[];
extern const u8 gText_UR_OfferDeclined1[]; extern const u8 gText_UR_OfferDeclined1[];
extern const u8 gText_UR_OfferDeclined2[]; extern const u8 gText_UR_OfferDeclined2[];
extern const u8 gText_UR_ChatEnded[]; extern const u8 gText_UR_ChatEnded[];
extern const u8 *const gTexts_UR_JoinChat[GENDER_COUNT][2]; extern const u8 *const gTexts_UR_JoinChat[][GENDER_COUNT];
extern const u8 gText_UR_TrainerAppearsBusy[]; extern const u8 gText_UR_TrainerAppearsBusy[];
extern const u8 *const gTexts_UR_WaitOrShowCard[GENDER_COUNT][4]; extern const u8 *const gTexts_UR_WaitOrShowCard[GENDER_COUNT][4];
extern const u8 *const gTexts_UR_StartActivity[][GENDER_COUNT][3]; extern const u8 *const gTexts_UR_StartActivity[][GENDER_COUNT][3];
src/union_room_message.c
+10 -7
View File
@@ -172,7 +172,7 @@ ALIGNED(4) static const u8 sText_HiDoSomethingFemale[] = _("Hello!\nWould you li
ALIGNED(4) static const u8 sText_HiDoSomethingAgainMale[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?"); ALIGNED(4) static const u8 sText_HiDoSomethingAgainMale[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?");
ALIGNED(4) static const u8 sText_HiDoSomethingAgainFemale[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?"); ALIGNED(4) static const u8 sText_HiDoSomethingAgainFemale[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?");
const u8 *const gTexts_UR_HiDoSomething[][2] = { const u8 *const gTexts_UR_HiDoSomething[][GENDER_COUNT] = {
{ {
sText_HiDoSomethingMale, sText_HiDoSomethingMale,
sText_HiDoSomethingFemale sText_HiDoSomethingFemale
@@ -188,11 +188,14 @@ ALIGNED(4) static const u8 sText_DoSomethingAgainMale[] = _("{STR_VAR_1}: What w
ALIGNED(4) static const u8 sText_DoSomethingAgainFemale[] = _("{STR_VAR_1}‘また なにかする？"); ALIGNED(4) static const u8 sText_DoSomethingAgainFemale[] = _("{STR_VAR_1}‘また なにかする？");
// Unused // Unused
static const u8 *const sDoSomethingTexts[] = { static const u8 *const sDoSomethingTexts[][GENDER_COUNT] = {
sText_DoSomethingMale, {
sText_DoSomethingFemale, sText_DoSomethingMale,
sText_DoSomethingAgainMale, sText_DoSomethingFemale
sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale }, {
sText_DoSomethingAgainMale,
sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale
}
}; };
ALIGNED(4) static const u8 sText_SomebodyHasContactedYou[] = _("Somebody has contacted you.{PAUSE 60}"); ALIGNED(4) static const u8 sText_SomebodyHasContactedYou[] = _("Somebody has contacted you.{PAUSE 60}");
@@ -236,7 +239,7 @@ ALIGNED(4) static const u8 sText_PlayerJoinChatMale[] = _("{STR_VAR_1}: Hey, {PL
ALIGNED(4) static const u8 sText_JoinChatFemale[] = _("Oh, hi! We're having a chat now.\nWould you like to join us?"); ALIGNED(4) static const u8 sText_JoinChatFemale[] = _("Oh, hi! We're having a chat now.\nWould you like to join us?");
ALIGNED(4) static const u8 sText_PlayerJoinChatFemale[] = _("{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?"); ALIGNED(4) static const u8 sText_PlayerJoinChatFemale[] = _("{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?");
const u8 *const gTexts_UR_JoinChat[GENDER_COUNT][2] = { const u8 *const gTexts_UR_JoinChat[][GENDER_COUNT] = {
{ {
sText_JoinChatMale, sText_JoinChatMale,
sText_JoinChatFemale sText_JoinChatFemale