mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

Actor Cleanups (#177)

Browse source 
* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions
This commit is contained in:
fig02 2020-05-31 05:55:48 -04:00 • committed by GitHub
parent 13a94482e5
commit 78d0883f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 786 additions and 869 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/*
* File: z_item_inbox.c
* Overlay: ovl_Item_Inbox
* Description: Zelda's magic to open gates.
* Description: Zelda's magic effect when opening gates in castle collapse
*/
#include "z_item_inbox.h"
@ -15,7 +15,7 @@ void ItemInbox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ItemInbox_Update(Actor* thisx, GlobalContext* globalCtx);
void ItemInbox_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80B86020(ItemInbox* this, GlobalContext* globalCtx);
void ItemInbox_Wait(ItemInbox* this, GlobalContext* globalCtx);
const ActorInit Item_Inbox_InitVars = {
ACTOR_ITEM_INBOX,
@ -32,14 +32,14 @@ const ActorInit Item_Inbox_InitVars = {
void ItemInbox_Init(Actor* thisx, GlobalContext* globalCtx) {
ItemInbox* this = THIS;
this->actionFunc = func_80B86020;
this->actionFunc = ItemInbox_Wait;
Actor_SetScale(&this->actor, 0.2);
}
void ItemInbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80B86020(ItemInbox* this, GlobalContext* globalCtx) {
void ItemInbox_Wait(ItemInbox* this, GlobalContext* globalCtx) {
if (Flags_GetTreasure(globalCtx, (this->actor.params >> 8) & 0x1F)) {
Actor_Kill(&this->actor);
}