mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-14 21:03:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Migrate purple poe faster fight

Browse Source
This commit is contained in:
Garrett Cox
2024-04-18 21:36:10 -05:00
parent 1683617210
commit abdbe25c8a
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
-11
View File
@@ -183,12 +183,6 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) {
this->epoch++;
// Skip Poe Intro Cutscene
if (IS_RANDO && thisx->params == 4124 && !Randomizer_GetSettingValue(RSK_ENABLE_GLITCH_CUTSCENES)) {
Flags_SetSwitch(play, 0x1B);
Actor_Kill(thisx);
}
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
SkelAnime_Init(play, &this->skelAnime, &gPoeSistersSkel, &gPoeSistersSwayAnim, this->jointTable,
@@ -862,11 +856,6 @@ void func_80ADB338(EnPoSisters* this, PlayState* play) {
if (Actor_WorldDistXZToPoint(&player->actor, &this->actor.home.pos) < 600.0f) {
if (this->unk_19C != 0) {
this->unk_19C--;
// Force Meg to respawn instantly after getting hit
if (IS_RANDO) {
this->unk_19C = 0;
}
}
} else {
this->unk_19C = 100;
soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
+2
View File
@@ -32,4 +32,6 @@ typedef struct EnPoSisters {
u32 epoch;
} EnPoSisters; // size = 0x0338
void func_80ADB338(EnPoSisters* enPoSisters, PlayState* play);
#endif