diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-01-31 21:22:13 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-01-31 21:25:43 +0100 |
| commit | 5ab94436796e846a40943d4e4117987a03ce2279 (patch) | |
| tree | 58d5affb1fc1106fbfd7d0b12775ca73edc83f3f /include | |
| parent | 2b8d880ffc0a4548d25dc613d53a908d36362d84 (diff) | |
Decompile Wizzrobes
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 2 | ||||
| -rw-r--r-- | include/enemy.h | 6 | ||||
| -rw-r--r-- | include/enemy/wizzrobe.h | 27 |
3 files changed, 31 insertions, 4 deletions
diff --git a/include/asm.h b/include/asm.h index b889ab88..ef1511d2 100644 --- a/include/asm.h +++ b/include/asm.h @@ -27,7 +27,7 @@ extern void sub_08004484(struct Entity_*, struct Entity_*); extern void ResetCollisionLayer(struct Entity_*); extern void sub_08004596(struct Entity_*, u32); extern u32 sub_080045B4(struct Entity_*, u32, u32); -extern u32 sub_080045D4(u32, u32, u32, u32); +extern u32 CalculateDirectionTo(u32, u32, u32, u32); extern u32 sub_080045DA(s32, s32); extern u32 sub_080086B4(u32, u32, u8*); extern u32 ResolveCollisionLayer(struct Entity_*); diff --git a/include/enemy.h b/include/enemy.h index f1e96b6f..8e9a741b 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -171,9 +171,9 @@ void WallMaster2(Entity*); void Gleerok(Entity*); void VaatiEyesMacro(Entity*); void Tektite(Entity*); -void WizzrobeWind(Entity*); -void WizzrobeFire(Entity*); -void WizzrobeIce(Entity*); +void WizzrobeWind(); +void WizzrobeFire(); +void WizzrobeIce(); void Armos(Entity*); void Eyegore(Entity*); void Rope(Entity*); diff --git a/include/enemy/wizzrobe.h b/include/enemy/wizzrobe.h new file mode 100644 index 00000000..0c8e0f0a --- /dev/null +++ b/include/enemy/wizzrobe.h @@ -0,0 +1,27 @@ +#ifndef ENEMY_WIZZROBE_H +#define ENEMY_WIZZROBE_H +#include "enemy.h" + +typedef struct { + /*0x00*/ Entity base; + /*0x68*/ u8 unk_68[6]; + /*0x6e*/ u8 unk_6e; + /*0x6f*/ u8 unk_6f; + /*0x70*/ u16 unk_70; + /*0x72*/ u16 unk_72; + /*0x74*/ u8 unk_74[4]; + /*0x78*/ u16 targetX; + /*0x7a*/ u16 targetY; + /*0x7c*/ u8 unk_7c[4]; + /*0x80*/ u8 targetIndex; + /*0x81*/ u8 timer1; + /*0x82*/ u8 timer2; + /*0x83*/ u8 unk_83; + /*0x84*/ u16 tilePosition; + /*0x86*/ u16 tileIndex; +} WizzrobeEntity; + +extern void sub_0802F888(WizzrobeEntity*); +extern void sub_0802F8E4(WizzrobeEntity*); +extern void sub_0802F9C8(WizzrobeEntity*); +#endif
\ No newline at end of file |