diff --git a/include/z64save.h b/include/z64save.h index 0443bb47c0..90a362a47a 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -816,7 +816,7 @@ typedef enum LinkAge { #define INFTABLE_10A 0x10A #define INFTABLE_SPOKE_TO_GORON_LINK_ABOUT_DRAGON 0x10B #define INFTABLE_STOPPED_GORON_LINKS_ROLLING 0x10C -#define INFTABLE_10D 0x10D +#define INFTABLE_RECEIVED_GORON_TUNIC 0x10D #define INFTABLE_SPOKE_TO_GORON_LINK_ABOUT_GORONS 0x10E #define INFTABLE_10F 0x10F #define INFTABLE_113 0x113 diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index d9f8d99831..5dbf748964 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -115,7 +115,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) { } else { return 0x3041; } - } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) || GET_INFTABLE(INFTABLE_10D)) { + } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) || GET_INFTABLE(INFTABLE_RECEIVED_GORON_TUNIC)) { if (GET_INFTABLE(INFTABLE_SPOKE_TO_GORON_LINK_ABOUT_GORONS)) { return 0x3038; } else { @@ -225,7 +225,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) { break; case 0x3036: Actor_OfferGetItem(thisx, play, GI_TUNIC_GORON, xzRange, yRange); - SET_INFTABLE(INFTABLE_10D); // EnGo exclusive flag + SET_INFTABLE(INFTABLE_RECEIVED_GORON_TUNIC); // EnGo exclusive flag talkState = NPC_TALK_STATE_ACTION; break; case 0x3037: diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index cff07501d0..7ffa1cb4f4 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -23,11 +23,11 @@ INFTABLE_SPOKE_TO_GC_ENTRANCE_GORON - Talked to Goron at GC Entrance (Before gor INFTABLE_SPOKE_TO_GC_ISLAND_GORON - Talked to Goron at GC Island (Before goron ruby is obtained) INFTABLE_SPOKE_TO_DARUNIA_DOOR_GORON - (not on cloud modding) Talked to GC Goron outside Darunias door (after opening door, before getting goron bracelet) -INFTABLE_GORON_CITY_DOORS_UNLOCKED - Obtained Fire Tunic from Goron Link +INFTABLE_GORON_CITY_DOORS_UNLOCKED - Goron opened Goron City doors INFTABLE_10A - (not on cloud modding) INFTABLE_SPOKE_TO_GORON_LINK_ABOUT_DRAGON - Spoke to Goron Link about Volvagia INFTABLE_STOPPED_GORON_LINKS_ROLLING - Stopped Goron Link's Rolling -INFTABLE_10D - EnGo Exclusive +INFTABLE_RECEIVED_GORON_TUNIC - Obtained Fire Tunic from Goron Link (EnGo Exclusive) INFTABLE_SPOKE_TO_GORON_LINK_ABOUT_GORONS - Spoke to Goron Link about the missing Gorons INFTABLE_10F - (not on cloud modding)