mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

[PAL N64] Match actor changes that aren't in NTSC 1.2 or GC releases (#2208)

Browse source 
* [PAL N64] Match actor changes that aren't in NTSC 1.2

* Add bug comment about Zora's Domain waterfall
This commit is contained in:
cadmic 2024-09-18 07:49:01 -07:00 • committed by GitHub
parent dc2ceb33f3
commit 2122a4345b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 89 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h"
#include "assets/objects/object_ik/object_ik.h"
#include "terminal.h"
#include "versions.h"
#define FLAGS ACTOR_FLAG_4
@ -757,9 +758,11 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) {
} else if (this->actor.colChkInfo.health <= 10) {
Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_BOSS);
SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EN_LAST_DAMAGE);
#if !OOT_PAL_N64
if (this->switchFlag != 0xFF) {
Flags_SetSwitch(play, this->switchFlag);
}
#endif
return;
} else if (prevHealth == 50) {
Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY);
@ -1231,6 +1234,9 @@ void EnIk_CsAction4(EnIk* this, PlayState* play) {
void EnIk_CsAction5(EnIk* this, PlayState* play) {
if (EnIk_GetCue(play, 4) == NULL) {
#if OOT_PAL_N64
Flags_SetSwitch(play, this->switchFlag);
#endif
Actor_Kill(&this->actor);
}
}