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

Renamed EVENTCHKINF_3C (#2324)

Browse source 
* Renamed EVENTCHKINF_3C

* Renamed to Nabooru Knuckle

* Format for Jenkins
This commit is contained in:
Jordan Longstaff 2024-12-10 11:00:18 -05:00 • committed by GitHub
parent c04ed0e76c
commit b01b20697e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/z64save.h
View file

@ -505,7 +505,7 @@ typedef enum LinkAge {
#define EVENTCHKINF_39 0x39 #define EVENTCHKINF_39 0x39
#define EVENTCHKINF_OPENED_JABU_JABU 0x3A #define EVENTCHKINF_OPENED_JABU_JABU 0x3A
#define EVENTCHKINF_3B 0x3B #define EVENTCHKINF_3B 0x3B
#define EVENTCHKINF_3C 0x3C #define EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE 0x3C
// 0x40 // 0x40
#define EVENTCHKINF_40_INDEX 4 #define EVENTCHKINF_40_INDEX 4

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

@ -1528,7 +1528,7 @@ void EnIk_StartDefeatCutscene(Actor* thisx, PlayState* play) {
Cutscene_SetScript(play, gSpiritBossNabooruKnuckleDefeatCs); Cutscene_SetScript(play, gSpiritBossNabooruKnuckleDefeatCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
Actor_SetScale(&this->actor, 0.01f); Actor_SetScale(&this->actor, 0.01f);
SET_EVENTCHKINF(EVENTCHKINF_3C); SET_EVENTCHKINF(EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE);
EnIk_SetupCsAction3(this, play); EnIk_SetupCsAction3(this, play);
} }
} }
@ -1537,7 +1537,8 @@ void EnIk_Init(Actor* thisx, PlayState* play) {
EnIk* this = (EnIk*)thisx; EnIk* this = (EnIk*)thisx;
s32 upperParams = IK_GET_UPPER_PARAMS(&this->actor); s32 upperParams = IK_GET_UPPER_PARAMS(&this->actor);
if (((IK_GET_ARMOR_TYPE(&this->actor) == IK_TYPE_NABOORU) && GET_EVENTCHKINF(EVENTCHKINF_3C)) || if (((IK_GET_ARMOR_TYPE(&this->actor) == IK_TYPE_NABOORU) &&
GET_EVENTCHKINF(EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE)) ||
(upperParams != 0 && Flags_GetSwitch(play, upperParams >> 8))) { (upperParams != 0 && Flags_GetSwitch(play, upperParams >> 8))) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} else { } else {