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

More actor cleanup Part 1 (#107)

Browse source 
* Fix naming and structs in z_en_item00.c and z_en_a_keep.c

* Decompile init vars in z_en_item00.c and z_en_a_keep.c

* Create missing .h files for the last few actors

* Fix some collider member names in actor structs

* Fix old actors not properly using "actionFunc" / "SetupAction"

* Remove some local temporary actor structs

* Fix some actor header includes to be absolute instead of relative
This commit is contained in:
Roman971 2020-05-01 20:26:16 +02:00 • committed by GitHub
parent 2b38920d7e
commit 3ca6082084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 625 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_It/z_en_it.c
View file

@ -38,21 +38,21 @@ void EnIt_Init(EnIt* this, GlobalContext* globalCtx) {
EnIt* it = this;
it->actor.params = 0x0D05;
Collider_InitCylinder(globalCtx, &it->cylinderCollider);
Collider_SetCylinder(globalCtx, &it->cylinderCollider, &it->actor, &cylinderInitData);
Collider_InitCylinder(globalCtx, &it->collider);
Collider_SetCylinder(globalCtx, &it->collider, &it->actor, &cylinderInitData);
func_80061EFC(&it->actor.colChkInfo, 0, &colChkInfoInit); // Init Damage Chart
}
void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx) {
EnIt* it = this;
Collider_DestroyCylinder(globalCtx, &it->cylinderCollider);
Collider_DestroyCylinder(globalCtx, &it->collider);
}
void EnIt_Update(EnIt* this, GlobalContext* globalCtx) {
s32 pad;
EnIt* it = this;
Collider_CylinderUpdate(&it->actor, &it->cylinderCollider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &it->cylinderCollider);
Collider_CylinderUpdate(&it->actor, &it->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &it->collider);
}

2
src/overlays/actors/ovl_En_It/z_en_it.h
View file

@ -7,7 +7,7 @@
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 unk_14C;
/* 0x0150 */ ColliderCylinder cylinderCollider;
/* 0x0150 */ ColliderCylinder collider;
} EnIt; // size = 0x019C
extern const ActorInit En_It_InitVars;