From c9281e5a577cf2856b24539b885350046e052512 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 12 Sep 2022 14:54:05 -0400
Subject: [PATCH] Add more usage of GENDER_COUNT

---
 include/union_room_message.h |  4 ++--
 src/union_room_message.c     | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/union_room_message.h b/include/union_room_message.h
index ad0011452..961b25bc1 100644
--- a/include/union_room_message.h
+++ b/include/union_room_message.h
@@ -32,7 +32,7 @@ extern const u8 gText_UR_LinkWithFriendDropped[];
 extern const u8 *const gTexts_UR_LinkDropped[];
 extern const u8 gText_UR_AwaitingPlayersResponseAboutTrade[];
 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_AwaitingResponse[];
 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_OfferDeclined2[];
 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 *const gTexts_UR_WaitOrShowCard[GENDER_COUNT][4];
 extern const u8 *const gTexts_UR_StartActivity[][GENDER_COUNT][3];
diff --git a/src/union_room_message.c b/src/union_room_message.c
index 16b0fc632..e84e666e1 100644
--- a/src/union_room_message.c
+++ b/src/union_room_message.c
@@ -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_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_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}‘また なにかする？");
 
 // Unused
-static const u8 *const sDoSomethingTexts[] = {
-    sText_DoSomethingMale,
-    sText_DoSomethingFemale,
-    sText_DoSomethingAgainMale,
-    sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale
+static const u8 *const sDoSomethingTexts[][GENDER_COUNT] = {
+    {
+        sText_DoSomethingMale,
+        sText_DoSomethingFemale
+    }, {
+        sText_DoSomethingAgainMale,
+        sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale
+    }
 };
 
 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_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_JoinChatFemale