mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-15 06:06:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
Sirius902 2020-09-30 14:08:15 -07:00
parent e645bc6f70
commit c0bdcfbe45
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -54,6 +54,13 @@ const ActorInit En_Ik_InitVars = {
}; };
*/ */
/*
static ColliderTrisInit sTrisInit = {
{ COLTYPE_METAL_SHIELD, 0x00, 0x0D, 0x00, 0x00, COLSHAPE_TRIS },
2, D_80A7836C,
};
*/
void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS; EnIk* this = THIS;
@ -198,7 +205,7 @@ void func_80A7489C(EnIk* this) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s")
// starts middle boss bgm // starts middle boss bgm
void func_80A76BF4() { void func_80A76BF4(void) {
// NA_BGM_MIDDLE_BOSS // NA_BGM_MIDDLE_BOSS
func_800F5ACC(0x38); func_800F5ACC(0x38);
} }
@ -304,7 +311,7 @@ void func_80A78160(EnIk* this, GlobalContext* globalCtx) {
this->actor.draw = func_80A76798; this->actor.draw = func_80A76798;
this->actor.flags |= 5; this->actor.flags |= 5;
gSaveContext.eventChkInf[3] |= 0x800; gSaveContext.eventChkInf[3] |= 0x800;
Actor_SetScale(this, 0.012f); Actor_SetScale(&this->actor, 0.012f);
func_80A7489C(this); func_80A7489C(this);
} }

2
src/overlays/actors/ovl_En_Ik/z_en_ik.h
View file

@ -23,7 +23,7 @@ typedef struct EnIk {
/* 0x0320 */ ColliderCylinder unk_320; /* 0x0320 */ ColliderCylinder unk_320;
/* 0x036C */ ColliderQuad unk_36C; /* 0x036C */ ColliderQuad unk_36C;
/* 0x03EC */ ColliderTris unk_3EC; /* 0x03EC */ ColliderTris unk_3EC;
/* 0x040C */ char unk_40C[0xB8]; /* 0x040C */ ColliderTrisItem unk_40C[2];
/* 0x04C4 */ s32 blureIdx; /* 0x04C4 */ s32 blureIdx;
/* 0x04C8 */ s32 action; /* 0x04C8 */ s32 action;
/* 0x04CC */ s32 drawMode; /* 0x04CC */ s32 drawMode;