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

Cleanup and create menews_jisan header

Browse Source
This commit is contained in:
PikalaxALT
2018-10-08 16:02:11 -04:00
parent eda4a9f940
commit 1d50bcb0b9
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/event_data.h
+2
View File
@@ -51,4 +51,6 @@ extern u16 gSpecialVar_MonBoxId;
extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_MonBoxPos;
extern u16 gSpecialVar_0x8014; extern u16 gSpecialVar_0x8014;
extern u16 gUnknown_20370D0;
#endif // GUARD_EVENT_DATA_H #endif // GUARD_EVENT_DATA_H
include/gba/defines.h
+1
View File
@@ -69,5 +69,6 @@
#define WIN_RANGE(a, b) (((a) << 8) | (b)) #define WIN_RANGE(a, b) (((a) << 8) | (b))
#define NAKED __attribute__((naked)) #define NAKED __attribute__((naked))
#define UNUSED __attribute__((unused))
#endif // GUARD_GBA_DEFINES #endif // GUARD_GBA_DEFINES
include/menews_jisan.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_MENEWS_JISAN_H
#define GUARD_MENEWS_JISAN_H
void sub_8146C30(u32 a0);
void sub_8146C88(void);
void sub_8146CA4(void);
#endif //GUARD_MENEWS_JISAN_H
src/menews_jisan.c
+11 -12
View File
@@ -2,14 +2,13 @@
#include "mevent.h" #include "mevent.h"
#include "random.h" #include "random.h"
#include "event_data.h" #include "event_data.h"
#include "menews_jisan.h"
extern EWRAM_DATA u16 gUnknown_20370D0; static u32 sub_8146D74(struct MysteryEventStruct *);
static void sub_8146DD8(struct MysteryEventStruct *);
u32 sub_8146D74(struct MysteryEventStruct *); static u32 sub_8146E0C(struct MysteryEventStruct *);
void sub_8146DD8(struct MysteryEventStruct *); static void sub_8146DA0(struct MysteryEventStruct *);
u32 sub_8146E0C(struct MysteryEventStruct *); static void sub_8146D94(struct MysteryEventStruct *);
void sub_8146DA0(struct MysteryEventStruct *);
void sub_8146D94(struct MysteryEventStruct *);
#ifdef NONMATCHING #ifdef NONMATCHING
void sub_8146C30(u32 a0) void sub_8146C30(u32 a0)
@@ -144,7 +143,7 @@ u16 sub_8146CE8(void)
return r5; return r5;
} }
u32 sub_8146D74(struct MysteryEventStruct *a0) static u32 sub_8146D74(struct MysteryEventStruct *a0)
{ {
u32 r4; u32 r4;
@@ -155,26 +154,26 @@ u32 sub_8146D74(struct MysteryEventStruct *a0)
return r4; return r4;
} }
void sub_8146D94(struct MysteryEventStruct *a0) static void sub_8146D94(struct MysteryEventStruct *a0)
{ {
a0->unk_0_2 = 0; a0->unk_0_2 = 0;
} }
void sub_8146DA0(struct MysteryEventStruct *a0) static void sub_8146DA0(struct MysteryEventStruct *a0)
{ {
a0->unk_0_2++; a0->unk_0_2++;
if ((u8)a0->unk_0_2 > 4) if ((u8)a0->unk_0_2 > 4)
a0->unk_0_2 = 4; a0->unk_0_2 = 4;
} }
void sub_8146DD8(struct MysteryEventStruct *a0) static void sub_8146DD8(struct MysteryEventStruct *a0)
{ {
a0->unk_0_5++; a0->unk_0_5++;
if ((u8)a0->unk_0_5 > 5) if ((u8)a0->unk_0_5 > 5)
a0->unk_0_5 = 5; a0->unk_0_5 = 5;
} }
u32 sub_8146E0C(struct MysteryEventStruct *a0) static u32 sub_8146E0C(struct MysteryEventStruct *a0)
{ {
struct MysteryEventStruct r0; struct MysteryEventStruct r0;
if ((u8)a0->unk_0_5 == 5) if ((u8)a0->unk_0_5 == 5)