diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-04-09 18:05:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-09 18:05:11 -0700 |
| commit | e50351df20adf608771d91bfe6aa736b094e75a8 (patch) | |
| tree | 3afee4e5362389b16fce5783b30685e65d0d709e /include | |
| parent | c4d18cf682acfd413201acb5b0630bb367d1298f (diff) | |
| parent | 2bdde94eda51a539d898c5b281f20fb7fb5e4a5e (diff) | |
Merge pull request #488 from hatal175/subtask4
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 15 | ||||
| -rw-r--r-- | include/menu.h | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 62f3acba..4a899e72 100644 --- a/include/common.h +++ b/include/common.h @@ -17,6 +17,20 @@ typedef struct { } Input; extern Input gInput; /**< Input instance. */ +typedef struct { + u8 evt_type; + u8 entity_idx; + u8 _2[6]; + u16 x; + u16 y; + u16 _c; + u16 _e; + u8 _10; + u8 _11; + u16 flag; +} struct_080FE320; +extern struct_080FE320 gUnk_080FE320[]; + void LoadPalettes(const u8*, s32, s32); /** @@ -122,5 +136,6 @@ void sub_0801E1B8(u32, u32); void sub_0801E738(u32); void sub_0801DFB4(struct Entity_*, u32, u32, u32); u32 sub_0801E00C(void); +bool32 sub_0801E810(u32); #endif // COMMON_H diff --git a/include/menu.h b/include/menu.h index 2549e327..609aad82 100644 --- a/include/menu.h +++ b/include/menu.h @@ -65,7 +65,7 @@ typedef struct { /*0x18*/ u16 unk18; /*0x1a*/ union SplitHWord unk1a; /*0x1c*/ u8 unk1c; - /*0x1s*/ u8 unk1d; + /*0x1d*/ u8 unk1d; /*0x1e*/ u8 unk1e; /*0x1f*/ s8 unk1f; /*0x20*/ u8 unk20; |