diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-05-20 22:51:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 22:51:06 +0300 |
| commit | dace495d47de9479f031f34f948151595acbca13 (patch) | |
| tree | 4f31107f4446b69106acb0673a383dfdaf88473e /include | |
| parent | de389305733545e2b6fac6c8dcb33d76a7446481 (diff) | |
| parent | d1d3fce4b6be10ed7186a6c36bc27fe575b593db (diff) | |
Merge pull request #97 from PikalaxALT/pikalax_work
Split code
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/main.h | 14 | ||||
| -rw-r--r-- | include/structs.h | 35 |
3 files changed, 50 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index 54397f45..b872b96c 100644 --- a/include/global.h +++ b/include/global.h @@ -4,4 +4,6 @@ #include "function_target.h" #include "nitro.h" +extern void ErrorHandling(void); + #endif //GUARD_GLOBAL_H diff --git a/include/main.h b/include/main.h index 23059702..92456092 100644 --- a/include/main.h +++ b/include/main.h @@ -3,6 +3,7 @@ #include "FS_overlay.h" #include "SPI_pm.h" +#include "structs.h" struct Unk21DBE18 { @@ -19,7 +20,7 @@ struct Unk2106FA0 struct Unk21DBE18 * unk14; s32 unk18; s32 unk1C; - s32 unk20; + struct UnkStruct_021C59C8 * unk20; }; struct Unk21C4818 @@ -60,6 +61,17 @@ struct Unk21C48B8 s32 unk6C; }; +struct UnkStruct_021C4918 { + s32 unk0; + u8 unk4; + u8 unk5; + u8 unk6; + u8 unk7; + u8 unk8; +}; + +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... diff --git a/include/structs.h b/include/structs.h index 8a34d299..8c9657be 100644 --- a/include/structs.h +++ b/include/structs.h @@ -4,4 +4,39 @@ #include "pokemon.h" #include "map.h" +// MATH +typedef u16 MATHCRC16Table[256]; + +struct UnkStruct_021C59C8_Sub20224 { + int unk_0; + int unk_4; + int unk_8; + u16 unk_C; + u16 unk_E; +}; + +struct UnkStruct_021C59C8_Sub_20464 { + u8 unk_0; + int unk_4; + int unk_8; + u8 unk_C; + u8 unk_D; + u8 unk_E; +}; + +struct UnkStruct_021C59C8 { + /* 0x00000 */ int unk_00000; + /* 0x00004 */ int unk_00004; + /* 0x00008 */ int unk_00008; + /* 0x0000C */ int unk_0000C; + /* 0x00010 */ int unk_00010; + /* 0x00014 */ MATHCRC16Table unk_00014; + /* 0x00214 */ u8 filler_00214[0x2004]; + /* 0x20218 */ u8 unk_20218[8]; + /* 0x20220 */ int unk_20220; + /* 0x20224 */ struct UnkStruct_021C59C8_Sub20224 unk_20224[36]; + /* 0x20464 */ struct UnkStruct_021C59C8_Sub_20464 unk_20464[4]; + /* 0x204A4 */ int unk_204A4; +}; + #endif //POKEDIAMOND_STRUCTS_H |