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

4
src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
View file

@ -27,7 +27,7 @@ const ActorInit Item_Inbox_InitVars = {
};
void ItemInbox_Init(ItemInbox* this, GlobalContext* globalCtx) {
this->updateFunc = func_80B86020;
this->actionFunc = func_80B86020;
Actor_SetScale(&this->actor, 0.2);
}
@ -41,7 +41,7 @@ void func_80B86020(ItemInbox* this, GlobalContext* globalCtx) {
}
void ItemInbox_Update(ItemInbox* this, GlobalContext* globalCtx) {
this->updateFunc(this, globalCtx);
this->actionFunc(this, globalCtx);
}
void ItemInbox_Draw(ItemInbox* this, GlobalContext* globalCtx) {

4
src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
View file

@ -6,8 +6,8 @@
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ ActorFunc updateFunc;
} ItemInbox; // size = 0x0154
/* 0x014C */ ActorFunc actionFunc;
} ItemInbox; // size = 0x0150
extern const ActorInit Item_Inbox_InitVars;