From 9c309cb0cbe871ac56a7df9f972f3d697f81c1f0 Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Mon, 2 Jun 2025 08:30:28 -0400 Subject: [PATCH] Child Ruto, Part 1: Rename INFTABLE flags --- include/z64save.h | 16 ++++---- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 4 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 41 ++++++++++--------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/include/z64save.h b/include/z64save.h index 71b1414052..683b9cd6e9 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -842,14 +842,14 @@ typedef enum LinkAge { #define INFTABLE_12A 0x12A #define INFTABLE_138 0x138 #define INFTABLE_139 0x139 -#define INFTABLE_140 0x140 -#define INFTABLE_141 0x141 -#define INFTABLE_142 0x142 -#define INFTABLE_143 0x143 -#define INFTABLE_144 0x144 -#define INFTABLE_145 0x145 -#define INFTABLE_146 0x146 -#define INFTABLE_147 0x147 +#define INFTABLE_PLACED_RUTO_ON_SWITCH 0x140 +#define INFTABLE_MET_RUTO_FIRST_TIME 0x141 +#define INFTABLE_LEARNED_WHY_RUTO_IN_JABU_JABU 0x142 +#define INFTABLE_BECAME_CARRIER_FOR_RUTO 0x143 +#define INFTABLE_BROUGHT_RUTO_TO_SAPPHIRE_ROOM 0x144 +#define INFTABLE_RUTO_HAS_SAPPHIRE 0x145 +#define INFTABLE_RUTO_ABDUCTED 0x146 +#define INFTABLE_BROUGHT_RUTO_BACK_TO_HOLES_ROOM 0x147 #define INFTABLE_160 0x160 #define INFTABLE_161 0x161 #define INFTABLE_162 0x162 diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index f8529bb775..00c23d421a 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -105,7 +105,7 @@ s32 BgBdanObjects_GetProperty(BgBdanObjects* this, s32 arg1) { case JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0: return this->cameraSetting == CAM_SET_NORMAL0; case JABU_OBJECTS_GET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE: - return GET_INFTABLE(INFTABLE_146); + return GET_INFTABLE(INFTABLE_RUTO_ABDUCTED); case JABU_OBJECTS_GET_PROP_CAM_SETTING_DUNGEON1: return this->cameraSetting == CAM_SET_DUNGEON1; default: @@ -125,7 +125,7 @@ void BgBdanObjects_SetProperty(BgBdanObjects* this, s32 arg1) { this->cameraSetting = CAM_SET_DUNGEON0; break; case JABU_OBJECTS_SET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE: - SET_INFTABLE(INFTABLE_146); + SET_INFTABLE(INFTABLE_RUTO_ABDUCTED); break; default: PRINTF(T("Bg_Bdan_Objects_Set_Contact_Ru1\nそんな送信モードは無い%d!!!!!!!!\n", diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 9eac9a59f6..ec75812693 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -504,7 +504,7 @@ void DemoEffect_Init(Actor* thisx, PlayState* play2) { this->jewel.isPositionInit = 0; DemoEffect_InitJewel(play, this); Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_BOSS); - if ((play->sceneId == SCENE_JABU_JABU) && GET_INFTABLE(INFTABLE_145)) { + if ((play->sceneId == SCENE_JABU_JABU) && GET_INFTABLE(INFTABLE_RUTO_HAS_SAPPHIRE)) { Actor_Kill(&this->actor); return; } diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 0e4573f90d..997711b650 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -783,11 +783,12 @@ void func_80AEC2C0(EnRu1* this, PlayState* play) { } void func_80AEC320(EnRu1* this, PlayState* play) { - if (!GET_INFTABLE(INFTABLE_141)) { + if (!GET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME)) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); this->action = 7; EnRu1_SetMouthIndex(this, 1); - } else if (GET_INFTABLE(INFTABLE_147) && !GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145)) { + } else if (GET_INFTABLE(INFTABLE_BROUGHT_RUTO_BACK_TO_HOLES_ROOM) && + !GET_INFTABLE(INFTABLE_PLACED_RUTO_ON_SWITCH) && !GET_INFTABLE(INFTABLE_RUTO_HAS_SAPPHIRE)) { if (!func_80AEB020(this, play)) { s8 actorRoom; @@ -945,7 +946,7 @@ void func_80AECA18(EnRu1* this) { void func_80AECA44(EnRu1* this, PlayState* play) { if (func_80AEAFA0(play, 5, 3)) { - SET_INFTABLE(INFTABLE_141); + SET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME); this->action = 14; } } @@ -1194,8 +1195,8 @@ void func_80AED414(EnRu1* this, PlayState* play) { } void func_80AED44C(EnRu1* this, PlayState* play) { - if (GET_INFTABLE(INFTABLE_141) && !GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_140) && - !GET_INFTABLE(INFTABLE_147)) { + if (GET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME) && !GET_INFTABLE(INFTABLE_RUTO_HAS_SAPPHIRE) && + !GET_INFTABLE(INFTABLE_PLACED_RUTO_ON_SWITCH) && !GET_INFTABLE(INFTABLE_BROUGHT_RUTO_BACK_TO_HOLES_ROOM)) { if (!func_80AEB020(this, play)) { s8 actorRoom; @@ -1270,10 +1271,10 @@ void func_80AED6DC(EnRu1* this, PlayState* play) { void func_80AED6F8(PlayState* play) { s8 curRoomNum; - if (!GET_INFTABLE(INFTABLE_147)) { + if (!GET_INFTABLE(INFTABLE_BROUGHT_RUTO_BACK_TO_HOLES_ROOM)) { curRoomNum = play->roomCtx.curRoom.num; if (curRoomNum == 2) { - SET_INFTABLE(INFTABLE_147); + SET_INFTABLE(INFTABLE_BROUGHT_RUTO_BACK_TO_HOLES_ROOM); } } } @@ -1527,10 +1528,10 @@ void func_80AEE050(EnRu1* this) { s32 func_80AEE264(EnRu1* this, PlayState* play) { if (!Actor_TalkOfferAccepted(&this->actor, play)) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; - if (GET_INFTABLE(INFTABLE_143)) { + if (GET_INFTABLE(INFTABLE_BECAME_CARRIER_FOR_RUTO)) { this->actor.textId = 0x404E; Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); - } else if (GET_INFTABLE(INFTABLE_142)) { + } else if (GET_INFTABLE(INFTABLE_LEARNED_WHY_RUTO_IN_JABU_JABU)) { this->actor.textId = 0x404D; Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } else { @@ -1551,12 +1552,12 @@ void func_80AEE2F8(EnRu1* this, PlayState* play) { dynaPolyActor = DynaPoly_GetActor(&play->colCtx, floorBgId); if ((dynaPolyActor != NULL) && (dynaPolyActor->actor.id == ACTOR_BG_BDAN_SWITCH)) { if (PARAMS_GET_U(dynaPolyActor->actor.params, 8, 6) == 0x38) { - SET_INFTABLE(INFTABLE_140); + SET_INFTABLE(INFTABLE_PLACED_RUTO_ON_SWITCH); return; } } } - CLEAR_INFTABLE(INFTABLE_140); + CLEAR_INFTABLE(INFTABLE_PLACED_RUTO_ON_SWITCH); } s32 func_80AEE394(EnRu1* this, PlayState* play) { @@ -1628,7 +1629,7 @@ void func_80AEE628(EnRu1* this, PlayState* play) { if (EnRu1_IsCsStateIdle(play)) { Animation_Change(&this->skelAnime, &gRutoChildSittingAnim, 1.0f, 0, Animation_GetLastFrame(&gRutoChildSittingAnim), ANIMMODE_LOOP, -8.0f); - SET_INFTABLE(INFTABLE_144); + SET_INFTABLE(INFTABLE_BROUGHT_RUTO_TO_SAPPHIRE_ROOM); this->action = 31; } this->roomNum3 = curRoomNum; @@ -1638,7 +1639,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) { s32 pad; s8 curRoomNum = play->roomCtx.curRoom.num; - if (!GET_INFTABLE(INFTABLE_144) && (func_80AEB124(play) != NULL)) { + if (!GET_INFTABLE(INFTABLE_BROUGHT_RUTO_TO_SAPPHIRE_ROOM) && (func_80AEB124(play) != NULL)) { if (!Player_InCsMode(play)) { Animation_Change(&this->skelAnime, &gRutoChildSeesSapphireAnim, 1.0f, 0, Animation_GetLastFrame(&gRutoChildSquirmAnim), ANIMMODE_LOOP, -8.0f); @@ -1852,7 +1853,7 @@ void func_80AEF080(EnRu1* this) { } s32 func_80AEF0BC(EnRu1* this, PlayState* play) { - if (GET_INFTABLE(INFTABLE_142)) { + if (GET_INFTABLE(INFTABLE_LEARNED_WHY_RUTO_IN_JABU_JABU)) { f32 frameCount = Animation_GetLastFrame(&gRutoChildSitAnim); Animation_Change(&this->skelAnime, &gRutoChildSitAnim, 1.0f, 0, frameCount, ANIMMODE_ONCE, -8.0f); @@ -1873,7 +1874,7 @@ void func_80AEF170(EnRu1* this, PlayState* play, s32 cond) { void func_80AEF188(EnRu1* this, PlayState* play) { if (func_80AEB174(play) && !func_80AEF0BC(this, play)) { Message_CloseTextbox(play); - SET_INFTABLE(INFTABLE_142); + SET_INFTABLE(INFTABLE_LEARNED_WHY_RUTO_IN_JABU_JABU); this->action = 24; } } @@ -1883,7 +1884,7 @@ void func_80AEF1F0(EnRu1* this, PlayState* play, UNK_TYPE arg2) { Animation_Change(&this->skelAnime, &gRutoChildSittingAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gRutoChildSittingAnim), ANIMMODE_LOOP, 0.0f); Message_CloseTextbox(play); - SET_INFTABLE(INFTABLE_143); + SET_INFTABLE(INFTABLE_BECAME_CARRIER_FOR_RUTO); func_80AED6DC(this, play); Actor_OfferCarry(&this->actor, play); this->action = 27; @@ -2045,7 +2046,7 @@ void func_80AEF890(EnRu1* this, PlayState* play) { if (!(DEBUG_FEATURES && IS_CUTSCENE_LAYER) && EnRu1_IsCsStateIdle(play)) { curRoomNum = play->roomCtx.curRoom.num; - SET_INFTABLE(INFTABLE_145); + SET_INFTABLE(INFTABLE_RUTO_HAS_SAPPHIRE); Flags_SetSwitch(play, func_80AEADE0(this)); func_80AEB0EC(this, 1); this->action = 42; @@ -2150,7 +2151,7 @@ void func_80AEFC24(EnRu1* this, PlayState* play) { } void func_80AEFC54(EnRu1* this, PlayState* play) { - if (GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_146)) { + if (GET_INFTABLE(INFTABLE_RUTO_HAS_SAPPHIRE) && !GET_INFTABLE(INFTABLE_RUTO_ABDUCTED)) { s32 pad; func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); @@ -2236,8 +2237,8 @@ void func_80AEFF40(EnRu1* this, PlayState* play) { void func_80AEFF94(EnRu1* this, PlayState* play) { s8 actorRoom; - if (GET_INFTABLE(INFTABLE_141) && GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145) && - (!(func_80AEB020(this, play)))) { + if (GET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME) && GET_INFTABLE(INFTABLE_PLACED_RUTO_ON_SWITCH) && + !GET_INFTABLE(INFTABLE_RUTO_HAS_SAPPHIRE) && (!(func_80AEB020(this, play)))) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); actorRoom = this->actor.room; this->action = 22;