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

OK (#779)

Browse source 
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-04-15 11:29:58 -05:00 • committed by GitHub
parent 3c18de2f83
commit c8db3083f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -368,7 +368,6 @@ void EnSkj_SetNaviId(EnSkj* this) {
}
}
#ifdef NON_MATCHING
void EnSkj_Init(Actor* thisx, GlobalContext* globalCtx) {
s16 type = (thisx->params >> 0xA) & 0x3F;
EnSkj* this = (EnSkj*)thisx;
@ -445,8 +444,7 @@ void EnSkj_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &D_80B01678);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
Actor_SetScale(thisx, 0.01f);
this->textId = 0;
this->actor.textId = 0;
this->actor.textId = this->textId = 0;
this->multiuseTimer = 0;
this->backfilpFlag = 0;
this->needlesToShoot = 3;
@ -467,9 +465,6 @@ void EnSkj_Init(Actor* thisx, GlobalContext* globalCtx) {
break;
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s")
#endif
void EnSkj_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;