mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 11:22:17 -05:00
Code Issues Projects Releases Wiki Activity

Fixes Barinade's set whenever boss fight is reloaded (#639)

Browse Source 
* Reimplements unused Barinade reset function.

* Removes the Jellyfish from Barinade's body on reset.
This commit is contained in:
Christopher Leggett 2022-07-10 21:40:57 -04:00 committed by GitHub
parent e3267a4e9b
commit 4ccc2bb12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View File

@ -121,6 +121,7 @@ void BossVa_Init(Actor* thisx, GlobalContext* globalCtx);
void BossVa_Destroy(Actor* thisx, GlobalContext* globalCtx); void BossVa_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BossVa_Update(Actor* thisx, GlobalContext* globalCtx); void BossVa_Update(Actor* thisx, GlobalContext* globalCtx);
void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx); void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx);
void BossVa_Reset(void);
void BossVa_UpdateEffects(GlobalContext* globalCtx); void BossVa_UpdateEffects(GlobalContext* globalCtx);
void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx); void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx);
@ -204,7 +205,7 @@ const ActorInit Boss_Va_InitVars = {
(ActorFunc)BossVa_Destroy, (ActorFunc)BossVa_Destroy,
(ActorFunc)BossVa_Update, (ActorFunc)BossVa_Update,
(ActorFunc)BossVa_Draw, (ActorFunc)BossVa_Draw,
NULL, (ActorResetFunc)BossVa_Reset,
}; };
static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit sCylinderInit = {
@ -593,6 +594,8 @@ void BossVa_Init(Actor* thisx, GlobalContext* globalCtx2) {
switch (this->actor.params) { switch (this->actor.params) {
case BOSSVA_BODY: case BOSSVA_BODY:
//sFightPhase = 0;
//sBodyState = 1;
SkelAnime_Init(globalCtx, &this->skelAnime, &gBarinadeBodySkel, &gBarinadeBodyAnim, NULL, NULL, 0); SkelAnime_Init(globalCtx, &this->skelAnime, &gBarinadeBodySkel, &gBarinadeBodyAnim, NULL, NULL, 0);
this->actor.flags |= ACTOR_FLAG_24; this->actor.flags |= ACTOR_FLAG_24;
break; break;
@ -4032,6 +4035,8 @@ void BossVa_DrawDoor(GlobalContext* globalCtx, s16 scale) {
CLOSE_DISPS(globalCtx->state.gfxCtx); CLOSE_DISPS(globalCtx->state.gfxCtx);
} }
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
void BossVa_Reset(void) { void BossVa_Reset(void) {
sKillBari = 0; sKillBari = 0;
sCsCamera = 0; sCsCamera = 0;
@ -4046,4 +4051,7 @@ void BossVa_Reset(void) {
sZapperRot.z = 0; sZapperRot.z = 0;
sPhase2Timer = 0; sPhase2Timer = 0;
sPhase4HP = 0; sPhase4HP = 0;
for (u8 i = 0; i < ARRAY_SIZE(sBodyBari); i++) {
sBodyBari[i] = 0;
}
} }