mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-16 23:30:15 -05:00
Code Issues Projects Releases Wiki Activity

hi mom (#2261)

Browse Source 
Co-authored-by: aMannus <mannusmenting@gmail.com>
This commit is contained in:
briaguya 2022-12-24 00:45:02 -05:00 committed by GitHub
parent 9529cc1217
commit 013244560e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
View File

@ -113,9 +113,17 @@ void func_8087B938(BgHaka* this, PlayState* play) {
actor = actor->next; actor = actor->next;
} }
player->stateFlags2 &= ~0x10; player->stateFlags2 &= ~0x10;
if (this->dyna.actor.params == 1) { if (this->dyna.actor.params == 1) {
func_80078884(NA_SE_SY_CORRECT_CHIME); func_80078884(NA_SE_SY_CORRECT_CHIME);
} else if (play->sceneNum == SCENE_SPOT02 && allPulled) { } else if (!IS_DAY && play->sceneNum == SCENE_SPOT02) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x,
this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0,
1, true);
}
// un tss un tss
if (play->sceneNum == SCENE_SPOT02 && allPulled) {
func_80078884(NA_SE_SY_CORRECT_CHIME); func_80078884(NA_SE_SY_CORRECT_CHIME);
func_800F5ACC(NA_BGM_STAFF_2); func_800F5ACC(NA_BGM_STAFF_2);
Actor* actor2 = play->actorCtx.actorLists[ACTORCAT_BG].head; Actor* actor2 = play->actorCtx.actorLists[ACTORCAT_BG].head;
@ -126,11 +134,8 @@ void func_8087B938(BgHaka* this, PlayState* play) {
} }
actor2 = actor2->next; actor2 = actor2->next;
} }
} else if (!IS_DAY && play->sceneNum == SCENE_SPOT02) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x,
this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0,
1, true);
} }
this->actionFunc = func_8087BAAC; this->actionFunc = func_8087BAAC;
} }
func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG);