MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-07-02 09:03:36 +00:00
Code Releases Wiki Activity

Merge pull request #120 from DaMarkov/fix-dampe

Browse Source 
Fix Dampe not spawning
This commit is contained in:
Blake Warner 2022-02-11 09:19:01 -05:00 committed by GitHub
commit 1daf897486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
View File

@ -82,8 +82,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 30, 52, 0, { 0, 0, 0 } },
};
static s32 D_80AD8D24 = 0;
static InitChainEntry sInitChain[] = {
ICHAIN_S8(naviEnemyId, 0x4F, ICHAIN_CONTINUE),
ICHAIN_F32(targetArrowOffset, 1500, ICHAIN_STOP),
@ -103,7 +101,6 @@ static void* sEyesTextures[] = {
void EnPoRelay_Init(Actor* thisx, GlobalContext* globalCtx) {
EnPoRelay* this = (EnPoRelay*)thisx;
s32 temp;
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 42.0f);
@ -115,15 +112,11 @@ void EnPoRelay_Init(Actor* thisx, GlobalContext* globalCtx) {
Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z,
255, 255, 255, 200);
this->lightColor.a = 255;
temp = 1;
if (D_80AD8D24 != 0) {
Actor_Kill(&this->actor);
} else {
D_80AD8D24 = temp;
Actor_SetTextWithPrefix(globalCtx, &this->actor, 65);
this->textId = this->actor.textId;
EnPoRelay_SetupIdle(this);
}
Actor_SetTextWithPrefix(globalCtx, &this->actor, 65);
this->textId = this->actor.textId;
EnPoRelay_SetupIdle(this);
this->actor.params &= 0x3F;
}