summaryrefslogtreecommitdiff
path: root/include/main.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-08-05 17:47:00 -0500
committerMarcus Huderle <huderlem@gmail.com>2020-08-05 17:47:00 -0500
commitacdc85a61dce2edcfcf19face76b3376976db42d (patch)
tree876090bd7f7b1298d273aec4f206d859f0a3e491 /include/main.h
parent1cbdcf5a36f09f569e2a0925e050d1a065ff58a9 (diff)
Match MainLoop()
Diffstat (limited to 'include/main.h')
-rw-r--r--include/main.h43
1 files changed, 22 insertions, 21 deletions
diff --git a/include/main.h b/include/main.h
index 4cceb41e..c98a1e9a 100644
--- a/include/main.h
+++ b/include/main.h
@@ -17,13 +17,16 @@ typedef struct { // 0x03001000
typedef struct {
u8 interruptFlag;
u8 field_0x1;
+ u8 loadType;
u8 funcIndex;
- u8 field_0x3;
u8 transition;
u8 field_0x5;
u8 muteAudio;
- u8 field_0x8;
+ u8 field_0x7;
u8 countdown;
+ u8 field_0x9;
+ u8 field_0xa;
+ u16 ticks;
} Main;
typedef struct {
@@ -43,27 +46,25 @@ extern UI gUnk_02032EC0;
-extern s32 sub_08055F70();
-extern s32 sub_080A3204(s32);
-extern s32 sub_0807CE90(s32);
-extern s32 sub_080560B8(s32);
-extern void sub_08056208(s32);
-extern void sub_0804FFE4();
-extern s32 sub_08056418();
-extern void sub_080ADD30(s32);
+extern void sub_08055F70(void);
+extern void sub_080A3204(void);
+extern void sub_0807CE90(void);
+extern void sub_080560B8(void);
+extern void sub_08056208(void);
+extern void sub_0804FFE4(void);
+extern void sub_08056418(void);
+extern void sub_080ADD30(void);
-extern s32 sub_08056010(s32);
-extern s32 sub_08016E78(s32);
-extern s32 ReadKeyInput();
-extern s32 sub_08055FF4(u8);
-extern void sub_080560A8();
-extern s32 sub_08056260();
+extern void sub_08056010(u32);
+extern void sub_08016E78(void);
+extern void ReadKeyInput(void);
+extern u32 sub_08055FF4(void);
+extern void sub_080560A8(void);
+extern void sub_08056260(void);
extern void VBlankIntrWait();
extern s32 _call_via_r0(s32);
-extern s32 sub_08056458(s32);
-extern s32 sub_08050154(s32);
-extern s32 sub_080A3480(s32);
+extern void sub_08056458(void);
+extern void sub_08050154(void);
+extern void sub_080A3480(void);
-extern s32 gRand;
-extern s32 gUnk_08100CBC;
#endif \ No newline at end of file