diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
| commit | 8c8a5a07c5e6b1a2d0d0592a30be31ccd140fc1e (patch) | |
| tree | c23120a706d012bd19c4c2584af5009fd2016ecf /include/main.h | |
| parent | e643eddc0def8e4851a4195e8ed4de06c847f52d (diff) | |
| parent | 227da51c377f621f542ffdb52ef56bfb807f29ab (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'include/main.h')
| -rw-r--r-- | include/main.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/include/main.h b/include/main.h index 92456092..ff710655 100644 --- a/include/main.h +++ b/include/main.h @@ -51,7 +51,7 @@ struct Unk21C48B8 s32 unk20; s32 unk24; s32 unk28; - s32 unk2C; + u32 unk2C; s32 unk30; s32 unk34; s32 unk38; @@ -68,6 +68,7 @@ struct UnkStruct_021C4918 { u8 unk6; u8 unk7; u8 unk8; + u8 padding[3]; }; extern struct UnkStruct_021C4918 gUnk021C4918; @@ -75,4 +76,19 @@ extern struct UnkStruct_021C4918 gUnk021C4918; extern struct Unk2106FA0 gBacklightTop; extern struct Unk2106FA0 gBacklightTop_2; // same as the first one, it's referenced twice in the constant pool... +void NitroMain(void); + +extern struct Unk21C48B8 gUnknown21C48B8; + +void FUN_02000DF4(void); +void FUN_02000E0C(void); +void FUN_02000E7C(FSOverlayID id, struct Unk21DBE18 * arg1); +void FUN_02000E9C(void); +void FUN_02000EC8(u32 parameter); +void FUN_02000EE8(void); +void DoSoftReset(u32 parameter); +void FUN_02000F4C(u32 arg0, u32 arg1); +void InitializeMainRNG(void); +void FUN_02000FE8(void); + #endif //GUARD_MAIN_H |