diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/fileselect.h | 5 | ||||
| -rw-r--r-- | include/flags.h | 18 | ||||
| -rw-r--r-- | include/functions.h | 1 | ||||
| -rw-r--r-- | include/object.h | 2 | ||||
| -rw-r--r-- | include/structures.h | 5 |
5 files changed, 16 insertions, 15 deletions
diff --git a/include/fileselect.h b/include/fileselect.h index eb37d549..627c8778 100644 --- a/include/fileselect.h +++ b/include/fileselect.h @@ -39,11 +39,6 @@ typedef struct { u8 filler12[0x6]; } struct_080FC844; -typedef struct { - union SplitWord _0; - union SplitWord _4; -} struct_020227E8; - extern struct_020227E8 gUnk_020227E8[]; typedef struct { diff --git a/include/flags.h b/include/flags.h index b08a5908..f0e2056a 100644 --- a/include/flags.h +++ b/include/flags.h @@ -3,15 +3,15 @@ #include "global.h" -u32 CheckFlags(u32); -u32 CheckGlobalFlag(u32); -u32 CheckGlobalFlags(u32, u32); -extern u32 CheckLocalFlag(u32); -extern u32 CheckLocalFlagByBank(u32, u32); -u32 CheckLocalFlags(u32, u32); -u32 CheckLocalFlagsByBank(u32, u32, u32); -u32 CheckRoomFlag(u32); -u32 CheckRoomFlags(u32, u32); +bool32 CheckFlags(u32); +bool32 CheckGlobalFlag(u32); +bool32 CheckGlobalFlags(u32, u32); +extern bool32 CheckLocalFlag(u32); +extern bool32 CheckLocalFlagByBank(u32, u32); +bool32 CheckLocalFlags(u32, u32); +bool32 CheckLocalFlagsByBank(u32, u32, u32); +bool32 CheckRoomFlag(u32); +bool32 CheckRoomFlags(u32, u32); void ClearFlag(u32); void ClearGlobalFlag(u32); diff --git a/include/functions.h b/include/functions.h index 2273b938..4766fbec 100644 --- a/include/functions.h +++ b/include/functions.h @@ -114,6 +114,7 @@ extern u32 sub_080542AC(u32); extern void sub_08054564(); extern void sub_08054570(void); extern s32 sub_08056338(void); +extern void sub_08057044(u32, struct_020227E8*, u32); extern void sub_080575C8(u32); extern void sub_08057688(void); extern void sub_080580B0(u32); diff --git a/include/object.h b/include/object.h index 83933d73..65575e33 100644 --- a/include/object.h +++ b/include/object.h @@ -260,7 +260,7 @@ void Object1E(Entity*); void Object1F(Entity*); void Object20(Entity*); void Object21(Entity*); -void FigurineDevice(Entity*); +void FigurineDevice(); void EyeSwitch(Entity*); void PressurePlate(); void BigBarrel(Entity*); diff --git a/include/structures.h b/include/structures.h index eba95243..a9c77886 100644 --- a/include/structures.h +++ b/include/structures.h @@ -146,4 +146,9 @@ typedef struct { } OAMControls; extern OAMControls gOAMControls; +typedef struct { + union SplitWord _0; + union SplitWord _4; +} struct_020227E8; + #endif |