diff options
| author | theo3 <theo.hyto@gmail.com> | 2020-06-14 00:17:37 -0700 |
|---|---|---|
| committer | theo3 <theo.hyto@gmail.com> | 2020-06-14 00:17:37 -0700 |
| commit | f0f3de254ff552429b84938ea90a88d7dd2e27fe (patch) | |
| tree | 6761d2c51ce372423e3f841be5dd4b960ec66643 /include | |
| parent | dd8cedb4c6a6fbc8d0db17c22d5e36aecb1c7609 (diff) | |
fix functions.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 15 | ||||
| -rw-r--r-- | include/greatFairy.h | 18 | ||||
| -rw-r--r-- | include/random.h | 8 |
3 files changed, 39 insertions, 2 deletions
diff --git a/include/functions.h b/include/functions.h index 16da6c58..02673254 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1,3 +1,4 @@ + #ifndef FUNCTIONS_H #define FUNCTIONS_H @@ -9,8 +10,8 @@ extern u32 Random(void); extern void PlaySFX(u32); extern void UpdateSpriteOrderAndFlip(Entity*); extern void LoadAnimation(Entity*, u32); -extern void ShowNPCDialogue(Entity*, u32*); -extern u32 UpdateFuseInteraction(Entity*); +extern void ShowNPCDialogue(); +extern u32 UpdateFuseInteraction(); extern void CopyPosition(Entity*, Entity*); extern void PositionRelative(Entity*, Entity*, u32, u32); extern void InitializeAnimation(Entity*, u32); @@ -46,4 +47,14 @@ extern void sub_0807DDE4(Entity*); extern void sub_0806D02C(Entity*); extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32); +extern u32 sub_080045C4(Entity*, Entity*); +extern u32 sub_0801E99C(Entity*); +extern void sub_0805E3A0(Entity*, u32); +extern Entity* sub_0805EB00(u32, u32, u32); +extern u32 sub_0806F5A4(u32); +extern void sub_08078778(Entity*); +extern void sub_08078784(Entity*, u32); +extern void sub_0807DD50(Entity*); +extern void sub_0807DD94(Entity*, u32); + #endif
\ No newline at end of file diff --git a/include/greatFairy.h b/include/greatFairy.h index c9a968b0..073f6a37 100644 --- a/include/greatFairy.h +++ b/include/greatFairy.h @@ -1,6 +1,24 @@ #ifndef GREATFAIRY_H #define GREATFAIRY_H +extern u32 __modsi3(u32, u32); +extern void InitializeAnimation(Entity*, u32); +extern void sub_08087380(); +extern u32 CheckRoomFlag(); +extern Entity* sub_080873AC(Entity*, u32, u32); +extern void PositionRelative(); +extern void CopyPosition(); +extern void DoFade(); +extern void PlaySFX(); +extern void sub_08004274(); +extern void sub_0805EC9C(); +extern void sub_0805EC60(); +extern void sub_080873D0(); +extern void DeleteEntity(); +extern void sub_080045D4(); +extern void sub_0806F69C(); +extern u32 Random(); + extern void (*gGreatFairy[11])(Entity*); extern void (*gGreatFairyBehaviors[6])(Entity*); extern void (*gGreatFairyWings[3])(Entity*); diff --git a/include/random.h b/include/random.h new file mode 100644 index 00000000..8d0356b3 --- /dev/null +++ b/include/random.h @@ -0,0 +1,8 @@ +#ifndef RANDOM_H +#define RANDOM_H + +extern u32 Random(void); + +extern u32 gRand; + +#endif
\ No newline at end of file |