Merge branch 'master' into pokenav_unk_2

1 files changed, 10 insertions, 9 deletions

diff --git a/src/pokenav_unk_3.c b/src/pokenav_unk_3.c
index dfef062df..9b62bea78 100755
--- a/src/pokenav_unk_3.c
+++ b/src/pokenav_unk_3.c
@@ -34,12 +34,13 @@ static u32 sub_81CABFC(struct Pokenav3Struct *);
 static u32 sub_81CAC04(struct Pokenav3Struct *);
 static u32 sub_81CACB8(struct Pokenav3Struct *);
 static u32 sub_81CACF8(struct Pokenav3Struct *);
-static u32 sub_81CAD20(int);
+static u32 sub_81CAD20(s32);
 static bool32 sub_81CB1D0(void);
 
-extern const u8 gUnknown_08622508[];
-extern const u8 gUnknown_0862250A[];
-extern const u8 *const gUnknown_08622028[][4];
+#include "data/text/match_call_messages.h"
+
+const u8 gUnknown_08622508[] = {0, 2};
+const u8 gUnknown_0862250A[] = {0, 1, 2};
 
 bool32 sub_81CAAE8(void)
 {
@@ -190,7 +191,7 @@ static u32 sub_81CACF8(struct Pokenav3Struct *state)
     return 0;
 }
 
-static u32 sub_81CAD20(int taskState)
+static u32 sub_81CAD20(s32 taskState)
 {
     int i, j;
     struct Pokenav3Struct *state = GetSubstructPtr(5);
@@ -207,7 +208,7 @@ static u32 sub_81CAD20(int taskState)
             {
                 state->unk1C[state->unkA].unk2 = j;
                 state->unk1C[state->unkA].unk0 = 1;
-                state->unk1C[state->unkA].unk1 = sub_81D16DC(j);
+                state->unk1C[state->unkA].unk1 = MatchCallMapSecGetByIndex(j);
                 state->unkA++;
             }
 
@@ -282,7 +283,7 @@ int unref_sub_81CAE6C(int arg0)
     arg0 += state->unkC;
     if (arg0 >= state->unkA)
         return REMATCH_TABLE_ENTRIES;
-    
+
     return state->unk1C[arg0].unk2;
 }
 
@@ -321,7 +322,7 @@ int sub_81CAF04(int index)
         index = GetTrainerIdxByRematchIdx(state->unk1C[index].unk2);
         return gTrainers[index].trainerPic;
     }
-    
+
     var0 = state->unk1C[index].unk2;
     index = MatchCall_GetRematchTableIdx(var0);
     if (index != REMATCH_TABLE_ENTRIES)
@@ -364,7 +365,7 @@ const u8 *sub_81CAFD8(int index, int textType)
         var0 = state->unk1C[index].unk2;
     }
 
-    return gUnknown_08622028[var0][textType];
+    return gMatchCallMessages[var0][textType];
 }
 
 u16 sub_81CB01C(void)