mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

ovl_En_Ik (#461)

Browse source 
* merge upstream

* Merge upstream

* Progress

* Progress

* Fixes

* Migrate bss for now ig

* func_80A772EC

* Use rom reloc

* Cleanup

* Correct prototype

* Rename to _PlayBGM

* Eh revert to _StartMusic

* Match func_80A74398 more

* Fixes

* Work on func_80A74398

* Work on func_80A74398

* Match func_80A74398

* Use thisx

* Name, static, and move some stuff

* Match some graphics functions

* Rename asm for named functions

* Forgot one

* More graphics stuff

* Progress

* More progress

* Fix jump table

* Figure out types for a lot of data

* Fix data

* Type remaining data

* Work on func_80A7492C

* Ugly match for func_80A7492C

* Fix func_80A7492C

* Match some interesting stuff

* Move and remove forward declarations

* Sort declarations

* Progress

* Use quotes for vt import

* Slightly better diff

* Better diff again

* Fix stack on func_80A74BA4

* match func_80A74BA4

* func_80A74674

* Progress

* Progress

* Progress

* Progress

* Eh early return probably makes more sense here

* Progress

* Progress

* Progress

* Autocomplete sucks

* Name stuff in func_80A76E2C

* Work a bit on func_80A75C38

* Ugly match func_80A75FA0

* Name it prevInvincibilityTimer

* EnIk_PostLimbDraw3

* Use hex for line numbers in EnIk_PostLimbDraw3

* EnIk_PostLimbDraw2

* EnIk_PostLimbDraw1

* Use hex for line numbers in EnIk_PostLimbDraw1

* Use ACTORTYPE_ENEMY

* Progress

* Possible fake match of func_80A75C38

* Update spec and remove asm

* Cleanup forward declarations

* Move data to fun places

* Move data into func_80A76E2C

* Move data into func_80A75A38

* Make D_80A7847C an array

* Remove struct padding

* Revert "Remove struct padding"

This reverts commit 87b0bd73da.

* Name colliders

* Use else

* Name shieldColliderItems

* Use new graphics macros

* Cleanup
This commit is contained in:
Sirius902 2020-11-23 06:53:21 -07:00 • committed by GitHub
parent 9312c21c2f
commit 385c419aa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 1450 additions and 4947 deletions
Download patch file Download diff file Expand all files Collapse all files

1530
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

File diff suppressed because it is too large Load diff

28
src/overlays/actors/ovl_En_Ik/z_en_ik.h
View file

@ -6,9 +6,35 @@
struct EnIk;
typedef void (*EnIkActionFunc)(struct EnIk*, GlobalContext*);
typedef struct EnIk {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x390];
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s limbDrawTable[30];
/* 0x0244 */ Vec3s transitionDrawTable[30];
/* 0x02F8 */ u8 unk_2F8;
/* 0x02F9 */ u8 unk_2F9;
/* 0x02FA */ u8 unk_2FA;
/* 0x02FB */ u8 unk_2FB;
/* 0x02FC */ u8 unk_2FC;
/* 0x02FD */ u8 unk_2FD;
/* 0x02FE */ s8 unk_2FE;
/* 0x02FF */ s8 unk_2FF;
/* 0x0300 */ s16 unk_300;
/* 0x0302 */ s16 switchFlags;
/* 0x0304 */ EnIkActionFunc actionFunc;
/* 0x0308 */ struct_80032E24 unk_308;
/* 0x0320 */ ColliderCylinder bodyCollider;
/* 0x036C */ ColliderQuad axeCollider;
/* 0x03EC */ ColliderTris shieldCollider;
/* 0x040C */ ColliderTrisItem shieldColliderItems[2];
/* 0x04C4 */ s32 blureIdx;
/* 0x04C8 */ s32 action;
/* 0x04CC */ s32 drawMode;
/* 0x04D0 */ u32 npcAction;
/* 0x04D4 */ s32 unk_4D4;
/* 0x04D8 */ char unk_4D8[0x04];
} EnIk; // size = 0x04DC
extern const ActorInit En_Ik_InitVars;