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

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

31
src/overlays/actors/ovl_En_Guest/z_en_guest.c
View file

@ -1,3 +1,9 @@
/*
* File: z_en_guest.c
* Overlay: ovl_En_Guest
* Description: Happy Mask Shop Customer
*/
#include "z_en_guest.h"
#include <vt.h>
@ -14,13 +20,6 @@ void func_80A50518(EnGuest* this, GlobalContext* globalCtx);
void func_80A5057C(EnGuest* this, GlobalContext* globalCtx);
void func_80A505CC(Actor* thisx, GlobalContext* globalCtx);
extern SkeletonHeader D_060000F0;
extern AnimationHeader D_060042AC;
extern UNK_TYPE D_060005FC;
extern UNK_TYPE D_060006FC;
extern UNK_TYPE D_060007FC;
extern Gfx D_060059B0[];
const ActorInit En_Guest_InitVars = {
ACTOR_EN_GUEST,
ACTORTYPE_NPC,
@ -33,7 +32,7 @@ const ActorInit En_Guest_InitVars = {
NULL,
};
static ColliderCylinderInit_Set3 sColliderInit = {
static ColliderCylinderInit_Set3 sCylinderInit = {
{ COLTYPE_UNK10, 0x00, 0x00, 0x39, COLSHAPE_CYLINDER },
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
{ 10, 60, 0, { 0, 0, 0 } },
@ -45,11 +44,15 @@ static InitChainEntry sInitChain[] = {
};
UNK_PTR D_80A50BA4[] = {
&D_060005FC,
&D_060006FC,
&D_060007FC,
0x060005FC,
0x060006FC,
0x060007FC,
};
extern SkeletonHeader D_060000F0;
extern AnimationHeader D_060042AC;
extern Gfx D_060059B0[];
void EnGuest_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGuest* this = THIS;
@ -75,7 +78,7 @@ void EnGuest_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnGuest_Update(Actor* thisx, GlobalContext* globalCtx) {
EnGuest* this = THIS;
u32 padding;
u32 pad;
if (Object_IsLoaded(&globalCtx->objectCtx, this->osAnimeBankIndex) != 0) {
this->actor.flags &= ~0x10;
@ -91,7 +94,7 @@ void EnGuest_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actor.update = func_80A505CC;
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder_Set3(globalCtx, &this->collider, &this->actor, &sColliderInit);
Collider_SetCylinder_Set3(globalCtx, &this->collider, &this->actor, &sCylinderInit);
Actor_SetHeight(&this->actor, 60.0f);
@ -144,7 +147,7 @@ void func_80A5057C(EnGuest* this, GlobalContext* globalCtx) {
void func_80A505CC(Actor* thisx, GlobalContext* globalCtx) {
EnGuest* this = THIS;
u32 padding;
u32 pad;
Player* player;
player = PLAYER;