diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-02-02 12:34:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 12:34:37 -0800 |
| commit | db8dfd44b2bacd521204de7e8a45efa4f1a182e8 (patch) | |
| tree | 062710fa135d63250a00f89db767b167e02b82ad /include | |
| parent | c0f68e9056b24d1413984346da71aafafde9f332 (diff) | |
| parent | 99076969de26f2fb32ffd10254e42c070f84a0ae (diff) | |
Merge pull request #345 from octorock/object97
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 1 | ||||
| -rw-r--r-- | include/object.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/functions.h b/include/functions.h index 769b053f..b0dfbee0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -171,4 +171,5 @@ extern void sub_08000148(u32, u32, u32); extern void sub_0805457C(Entity*, s32); extern Entity* sub_080A2A3C(Entity*, u32, u32, u32); extern void sub_0806FCF4(Entity*, s32, s32, s32); +extern u32 sub_080041DC(Entity*, u32, u32); #endif diff --git a/include/object.h b/include/object.h index da910632..d6fe25f1 100644 --- a/include/object.h +++ b/include/object.h @@ -181,7 +181,7 @@ typedef enum { WIND_TRIBE_FLAG, BIRD, OBJECT_96, - OBJECT_97, + KEY_STEALING_TAKKURI, OBJECT_98, OBJECT_99, HUGE_ACORN, @@ -377,7 +377,7 @@ void Lamp(Entity*); void WindTribeFlag(Entity*); void Bird(Entity*); void Object96(Entity*); -void Object97(Entity*); +void KeyStealingTakkuri(); void Object98(Entity*); void Object99(Entity*); void MacroAcorn(Entity*); |