diff options
| author | Behemoth <Luisscheurenbrand@gmail.com> | 2020-08-21 22:51:29 +0200 |
|---|---|---|
| committer | Behemoth <Luisscheurenbrand@gmail.com> | 2020-08-22 14:53:10 +0200 |
| commit | 7af023e11f51f4ec9fe6992f1b4341d125e950ff (patch) | |
| tree | c32c4ea8f1669a69e66013c59a3ca1cb2b382a75 /include | |
| parent | 6784ec9e62af989ac1f186f24bb0ce86deb21577 (diff) | |
finish decompile townMinish
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 7 | ||||
| -rw-r--r-- | include/npc.h | 1 | ||||
| -rw-r--r-- | include/structures.h | 5 |
3 files changed, 8 insertions, 5 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..7878db75 100644 --- a/include/structures.h +++ b/include/structures.h @@ -160,4 +160,9 @@ typedef struct { } struct_02034480; extern struct_02034480 gUnk_02034480; +typedef struct { + u32 field_0x0; + u32 field_0x4; +} Dialog; + #endif |