From 9046bd6a8558ad8b795ef34bfef35ed04a44a3ee Mon Sep 17 00:00:00 2001
From: Angie <angheloalf95@gmail.com>
Date: Sun, 29 Oct 2023 13:13:48 -0300
Subject: [PATCH] remove some gotos

---
 src/overlays/actors/ovl_En_An/z_en_an.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c
index 63865b846..e75fe13d9 100644
--- a/src/overlays/actors/ovl_En_An/z_en_an.c
+++ b/src/overlays/actors/ovl_En_An/z_en_an.c
@@ -1383,15 +1383,14 @@ s32 EnAn_MsgEvent_ReceiveLetterFromPostman(Actor* thisx, PlayState* play) {
     switch (this->msgEventState) {
         case 0x0:
             ret = false;
-            if (EnAn_ChangeCutscene(this, csId)) {
-                goto label;
+            if (!EnAn_ChangeCutscene(this, csId)) {
+                break;
             }
-            break;
+            FALLTHROUGH;
 
         case 0x2:
         case 0x4:
         case 0x6:
-        label:
             Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), &this->actor);
             ret = true;
             this->msgEventState++;
@@ -1431,14 +1430,13 @@ s32 EnAn_MsgEvent_AttendGoron(Actor* thisx, PlayState* play) {
     switch (this->msgEventState) {
         case 0x0:
             ret = false;
-            if (EnAn_ChangeCutscene(this, csId)) {
-                goto label;
+            if (!EnAn_ChangeCutscene(this, csId)) {
+                break;
             }
-            break;
+            FALLTHROUGH;
 
         case 0x2:
         case 0x4:
-        label:
             Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), &this->actor);
             ret = true;
             this->msgEventState++;
@@ -1479,15 +1477,14 @@ s32 EnAn_MsgEvent_GiveLunchToGranny(Actor* thisx, PlayState* play) {
         case 0x0:
             ret = 0;
             if (EnAn_ChangeCutscene(this, csId)) {
-                goto label;
+                break;
             }
-            break;
+            FALLTHROUGH;
 
         case 0x2:
         case 0x4:
         case 0x6:
         case 0x8:
-        label:
             if ((this->actor.child != NULL) && (this->actor.child->update != NULL)) {
                 Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)),
                                       this->actor.child);