From deb8d8f3e7e4d4110fc314e542f291b4883b60b5 Mon Sep 17 00:00:00 2001
From: JordanLongstaff <jrdnlngstff@gmail.com>
Date: Mon, 9 Dec 2024 16:57:18 -0500
Subject: [PATCH] Fix Jenkins errors, round 1

---
 src/overlays/actors/ovl_En_Go/z_en_go.c   |  9 ++++++---
 src/overlays/actors/ovl_En_Go2/z_en_go2.c | 21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

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 f592338553..1346033cca 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,8 @@ 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_RECEIVED_GORON_TUNIC)) {
+            } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) ||
+                       GET_INFTABLE(INFTABLE_RECEIVED_GORON_TUNIC)) {
                 if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_LINK_ABOUT_GORONS)) {
                     return 0x3038;
                 } else {
@@ -258,7 +259,8 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                 switch (thisx->textId) {
                     case 0x300A:
                         if (play->msgCtx.choiceIndex == 0) {
-                            if (CUR_UPG_VALUE(UPG_STRENGTH) != 0 || GET_INFTABLE(INFTABLE_TALKED_TO_DMT_BOMB_FLOWER_GORON)) {
+                            if (CUR_UPG_VALUE(UPG_STRENGTH) != 0 ||
+                                GET_INFTABLE(INFTABLE_TALKED_TO_DMT_BOMB_FLOWER_GORON)) {
                                 thisx->textId = 0x300B;
                             } else {
                                 thisx->textId = 0x300C;
@@ -851,7 +853,8 @@ void func_80A405CC(EnGo* this, PlayState* play) {
         this->skelAnime.curFrame = lastFrame;
         this->skelAnime.playSpeed = 0.0f;
         this->unk_212 = Rand_S16Offset(30, 30);
-        if ((PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) == 0x40) && !GET_INFTABLE(INFTABLE_TALKED_TO_DMT_BOMB_FLOWER_GORON)) {
+        if ((PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) == 0x40) &&
+            !GET_INFTABLE(INFTABLE_TALKED_TO_DMT_BOMB_FLOWER_GORON)) {
             EnGo_SetupAction(this, func_80A40B1C);
         } else {
             EnGo_SetupAction(this, EnGo_BiggoronActionFunc);
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 a5180e147c..bc2e33120e 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -21,8 +21,8 @@ INFTABLE_TALKED_TO_LOST_WOODS_SHORTCUT_GORON - Talked to GC Goron at LW entrance
 INFTABLE_TALKED_TO_DMT_BOMB_FLOWER_GORON - Talked to DMT Goron at Bomb Flower with goron bracelet
 INFTABLE_TALKED_TO_GC_ENTRANCE_GORON - Talked to Goron at GC Entrance (Before goron ruby is obtained)
 INFTABLE_TALKED_TO_GC_ISLAND_GORON - Talked to Goron at GC Island (Before goron ruby is obtained)
-INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON - (not on cloud modding) Talked to GC Goron outside Darunias door (after opening door,
-before getting goron bracelet)
+INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON - (not on cloud modding) Talked to GC Goron outside Darunias door
+(after opening door, before getting goron bracelet)
 INFTABLE_OPENED_GORON_CITY_DOORS - Goron Link opened Goron City doors
 INFTABLE_10A - (not on cloud modding)
 INFTABLE_TALKED_TO_GORON_LINK_ABOUT_DRAGON - Spoke to Goron Link about Volvagia
@@ -398,8 +398,12 @@ u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
         return 0x3043;
     } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
         return 0x3027;
+    } else if (GET_EVENTCHKINF(EVENTCHKINF_DESTROYED_DODONGOS_CAVERN_BOULDER)) {
+        return 0x3021;
+    } else if (GET_INFTABLE(INFTABLE_TALKED_TO_DODONGOS_CAVERN_ENTRANCE_GORON)) {
+        return 0x302A;
     } else {
-        return GET_EVENTCHKINF(EVENTCHKINF_DESTROYED_DODONGOS_CAVERN_BOULDER) ? 0x3021 : GET_INFTABLE(INFTABLE_TALKED_TO_DODONGOS_CAVERN_ENTRANCE_GORON) ? 0x302A : 0x3008;
+        return 0x3008;
     }
 }
 
@@ -461,11 +465,14 @@ u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
         return 0x3043;
     } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
         return 0x3027;
+    } else if (CUR_UPG_VALUE(UPG_STRENGTH) != 0) {
+        return 0x302C;
+    } else if (!Flags_GetSwitch(play, 0x1B)) {
+        return 0x3017;
+    } else if (GET_INFTABLE(INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON)) {
+        return 0x3019;
     } else {
-        return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
-               : !Flags_GetSwitch(play, 0x1B)   ? 0x3017
-               : GET_INFTABLE(INFTABLE_TALKED_TO_DARUNIA_DOOR_GORON)      ? 0x3019
-                                                : 0x3018;
+        return 0x3018;
     }
 }