diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 7 | ||||
| -rw-r--r-- | include/npc.h | 1 | ||||
| -rw-r--r-- | include/structures.h | 20 |
3 files changed, 20 insertions, 8 deletions
diff --git a/include/functions.h b/include/functions.h index 11382f48..585d8518 100644 --- a/include/functions.h +++ b/include/functions.h @@ -13,7 +13,7 @@ // Identified - to be sorted into header files extern u32 Random(void); extern void PlaySFX(u32); -extern void ShowNPCDialogue(Entity*, u32*); +extern void ShowNPCDialogue(Entity*, Dialog*); extern u32 UpdateFuseInteraction(); extern void DeleteEntity(Entity*); extern u32 __modsi3(u32, u32); @@ -46,7 +46,7 @@ extern void ExecuteScriptCommandSet(Entity*, void *); extern void _DmaFill32(u32, void*, u32); // Unidentified -extern void sub_0806ED78(Entity*); +extern u32 sub_0806ED78(Entity*); extern void sub_0806920C(Entity*); extern u32 sub_0805ACC0(Entity*); extern u32 sub_0801E99C(Entity*); @@ -78,7 +78,6 @@ extern s32 sub_0806ED9C(Entity*, u32, u32); extern void sub_0807000C(Entity*); extern void sub_0805E47C(Entity*); extern void sub_0805E584(Entity*); -extern void sub_0806ED78(Entity*); extern void sub_08068BEC(Entity*, u32); extern void sub_08078778(Entity*); extern s32 sub_0806ED9C(Entity*, u32, u32); @@ -103,7 +102,7 @@ extern u32 sub_08049EE4(Entity*); extern Entity *sub_0804A98C(Entity *, u32, u32); extern u32 sub_080544DC(u8); extern void sub_08077E54(Entity*); -extern void sub_080042BA(Entity*); +extern void sub_080042BA(Entity*, u32); extern void _DmaZero(void*, u32); extern void sub_08077F24(ItemBehavior*, u32); extern void sub_08079184(); diff --git a/include/npc.h b/include/npc.h index 4551b756..b6288ff2 100644 --- a/include/npc.h +++ b/include/npc.h @@ -171,7 +171,6 @@ extern void NPC58(Entity*); extern void NPC58_Head(Entity*); extern u32 UpdateFuseInteraction(Entity*); -extern void ShowNPCDialogue(Entity*, u32*); #endif
\ No newline at end of file diff --git a/include/structures.h b/include/structures.h index 01456a44..b6d348a9 100644 --- a/include/structures.h +++ b/include/structures.h @@ -23,7 +23,7 @@ typedef struct { } struct_0807D1C4; #define gUnk_02000000 ((struct_02000000*)(0x2000000)) -//extern struct_02000000 gUnk_02000000; +// extern struct_02000000 gUnk_02000000; typedef struct { u8 filler0[0x4]; @@ -57,7 +57,7 @@ typedef struct { extern SaveFile gUnk_02002A40; typedef struct { - u32 frameCount; // regular frame count? does anything reset it? + u32 frameCount; // regular frame count? does anything reset it? u8 field_0x4[0x4]; bool8 transitioningOut; u8 transitionType; // transition when changing areas @@ -123,7 +123,7 @@ typedef struct { u8 field_0x2; u8 field_0x3; u32 field_0x4; - u16 fadeType; // fade in or out, are there others? + u16 fadeType; // fade in or out, are there others? u16 fadeSpeed; // subtracted from duration u16 fadeDuration; u16 field_0xe; @@ -160,4 +160,18 @@ typedef struct { } struct_02034480; extern struct_02034480 gUnk_02034480; +typedef struct { + u32 flag : 12; + u32 flagType : 4; + u32 type : 4; + u32 unk : 1; + union { + struct { + u16 a; + u16 b; + } indices; + void (*func)(Entity*); + } data; +} Dialog; + #endif |