Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mevent2.c b/src/mevent2.c
index 3209c585a..d2c020858 100755
--- a/src/mevent2.c
+++ b/src/mevent2.c
@@ -26,7 +26,7 @@ void sub_801AFD8(void)
 {
     CpuFill32(0, &gSaveBlock1Ptr->unk_322C, sizeof(gSaveBlock1Ptr->unk_322C));
     sub_801B180();
-    sub_811F8BC();
+    InitQuestionnaireWords();
 }
 
 struct WonderNews *GetSavedWonderNews(void)
@@ -49,9 +49,9 @@ struct MysteryEventStruct *sub_801B044(void)
     return &gSaveBlock1Ptr->unk_322C.unk_340;
 }
 
-u16 *sub_801B058(void)
+u16 *GetQuestionnaireWordsPtr(void)
 {
-    return gSaveBlock1Ptr->unk_322C.unk_338;
+    return gSaveBlock1Ptr->unk_322C.questionnaireWords;
 }
 
 void DestroyWonderNews(void)
@@ -364,8 +364,8 @@ void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1)
         data->unk_14 = 0;
     }
 
-    for (i = 0; i < 4; i++)
-        data->unk_16[i] = gSaveBlock1Ptr->unk_322C.unk_338[i];
+    for (i = 0; i < NUM_QUESTIONNAIRE_WORDS; i++)
+        data->unk_16[i] = gSaveBlock1Ptr->unk_322C.questionnaireWords[i];
 
     CopyTrainerId(data->unk_4C, gSaveBlock2Ptr->playerTrainerId);
     StringCopy(data->unk_45, gSaveBlock2Ptr->playerName);
@@ -425,7 +425,7 @@ u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const vo
 bool32 MEventStruct_Unk1442CC_CompareField_unk_16(const struct MEventStruct_Unk1442CC *a0, const u16 *a1)
 {
     int i;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_QUESTIONNAIRE_WORDS; i++)
     {
         if (a0->unk_16[i] != a1[i])
             return FALSE;