mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +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

6
src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
View file

@ -41,7 +41,7 @@ void ObjRoomtimer_Init(ObjRoomtimer* this, GlobalContext* globalCtx) {
}
}
this->updateFunc = (ActorFunc)func_80B9D054;
this->actionFunc = (ActorFunc)func_80B9D054;
}
void ObjRoomtimer_Destroy(ObjRoomtimer* this, GlobalContext* globalCtx) {
@ -58,7 +58,7 @@ void func_80B9D054(ObjRoomtimer* this, GlobalContext* globalCtx) {
}
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_PROP);
this->updateFunc = (ActorFunc)func_80B9D0B0;
this->actionFunc = (ActorFunc)func_80B9D0B0;
}
void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
@ -83,5 +83,5 @@ void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
}
void ObjRoomtimer_Update(ObjRoomtimer* this, GlobalContext* globalCtx) {
this->updateFunc(this, globalCtx);
this->actionFunc(this, globalCtx);
}

2
src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
View file

@ -7,7 +7,7 @@
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ ActorFunc updateFunc;
/* 0x014C */ ActorFunc actionFunc;
/* 0x0150 */ u32 switchFlag;
} ObjRoomtimer; // size = 0x0154