summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/vars.h2
-rw-r--r--include/global.h6
-rw-r--r--include/menews_jisan.h9
-rw-r--r--include/mevent.h2
4 files changed, 11 insertions, 8 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 6c38e5ea5..327dbabc0 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -79,7 +79,7 @@
// Bits 12-15 are the same for the player's party.
// Used by Quest Log.
#define VAR_QUEST_LOG_MON_COUNTS 0x4027
-#define VAR_0x4028 0x4028
+#define VAR_MENEWS_JISAN_STEP_COUNTER 0x4028
#define VAR_0x4029 0x4029
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
diff --git a/include/global.h b/include/global.h
index 596f6b1d9..57035ce30 100644
--- a/include/global.h
+++ b/include/global.h
@@ -493,12 +493,12 @@ struct RecordMixingDayCareMail
bool16 holdsItem[DAYCARE_MON_COUNT];
};
-struct MysteryEventStruct
+struct MENewsJisanStruct
{
u8 unk_0_0:2;
u8 unk_0_2:3;
u8 unk_0_5:3;
- u8 unk_1;
+ u8 berry;
};
struct QuestLogNPCData
@@ -674,7 +674,7 @@ struct MEventBuffers
/*0x1c0 0x32e0*/ struct MEventBuffer_32E0 buffer_1c0;
/*0x310 0x3430*/ struct MEventBuffer_3430 buffer_310;
/*0x338 0x3458*/ u16 unk_338[4];
- /*0x340 0x3460*/ struct MysteryEventStruct unk_340;
+ /*0x340 0x3460*/ struct MENewsJisanStruct unk_340;
/*0x344 0x3464*/ u32 unk_344[2][5];
}; // 0x36C 0x348C
diff --git a/include/menews_jisan.h b/include/menews_jisan.h
index ca09d4347..277c8162b 100644
--- a/include/menews_jisan.h
+++ b/include/menews_jisan.h
@@ -3,8 +3,11 @@
#include "global.h"
-void GenerateRandomNews(u32 a0);
-void sub_8146C88(void);
-void sub_8146CA4(void);
+#define MENEWS_JISAN_NO_NEWS 0
+#define MENEWS_JISAN_
+
+void MENewsJisan_SetRandomReward(u32 a0);
+void MENewsJisanReset(void);
+void MENewsJisanStepCounter(void);
#endif //GUARD_MENEWS_JISAN_H
diff --git a/include/mevent.h b/include/mevent.h
index cee88e403..08ee8c038 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -36,7 +36,7 @@ struct MEvent_Str_2
struct MEventBuffer_3120_Sub * GetSavedWonderNews(void);
struct MEventBuffer_32E0_Sub * GetSavedWonderCard(void);
struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void);
-struct MysteryEventStruct * sub_8143D94(void);
+struct MENewsJisanStruct * GetMENewsJisanStructPtr(void);
bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src);
bool32 ValidateReceivedWonderNews(void);
bool32 ValidateReceivedWonderCard(void);