From be8ecb275de14e943c4a7d75925e7cb9884020bd Mon Sep 17 00:00:00 2001
From: Prince Frizzy <theclashingfritz@users.noreply.github.com>
Date: Sat, 19 Mar 2022 00:31:04 -0400
Subject: [PATCH] Some small cleanup, And re-add generating the coop.map to the
 Makefile. (#36)

---
 Makefile                                |  6 +++
 src/game/behaviors/treasure_chest.inc.c | 63 +++++++++++++------------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index c3f9fd25..9aea84ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1045,6 +1045,12 @@ endif
 #all: $(ROM)
 all: $(EXE)
 
+ifeq ($(WINDOWS_BUILD),1)
+exemap: $(EXE)
+	$(V)$(OBJDUMP) -t $(EXE) > $(BUILD_DIR)/coop.map
+all: exemap
+endif
+
 ifeq ($(COMPARE),1)
 	@$(PRINT) "$(GREEN)Checking if ROM matches.. $(NO_COL)\n"
 	@$(SHA1SUM) --quiet -c $(TARGET).sha1 && $(PRINT) "$(TARGET): $(GREEN)OK$(NO_COL)\n" || ($(PRINT) "$(YELLOW)Building the ROM file has succeeded, but does not match the original ROM.\nThis is expected, and not an error, if you are making modifications.\nTo silence this message, use 'make COMPARE=0.' $(NO_COL)\n" && false)
diff --git a/src/game/behaviors/treasure_chest.inc.c b/src/game/behaviors/treasure_chest.inc.c
index 8187b5f5..18dfae41 100644
--- a/src/game/behaviors/treasure_chest.inc.c
+++ b/src/game/behaviors/treasure_chest.inc.c
@@ -19,42 +19,43 @@ void bhv_treasure_chest_top_loop(void) {
     struct Object* sp34 = o->parentObj->parentObj;
 
     switch (o->oAction) {
-    case 0:
-        if (o->parentObj->oAction == 1)
-            o->oAction = 1;
-        break;
-
-    case 1:
-        if (o->oTimer == 0) {
-            if (sp34->oTreasureChestUnkFC == 0) {
-                spawn_object_relative(0, 0, -80, 120, o, MODEL_BUBBLE, bhvWaterAirBubble);
-                play_sound(SOUND_GENERAL_CLAM_SHELL1, o->header.gfx.cameraToObject);
+        case 0:
+            if (o->parentObj->oAction == 1) {
+                o->oAction = 1;
             }
-            else {
-                play_sound(SOUND_GENERAL_OPEN_CHEST, o->header.gfx.cameraToObject);
+            break;
+
+        case 1:
+            if (o->oTimer == 0) {
+                if (sp34->oTreasureChestUnkFC == 0) {
+                    spawn_object_relative(0, 0, -80, 120, o, MODEL_BUBBLE, bhvWaterAirBubble);
+                    play_sound(SOUND_GENERAL_CLAM_SHELL1, o->header.gfx.cameraToObject);
+                } else {
+                    play_sound(SOUND_GENERAL_OPEN_CHEST, o->header.gfx.cameraToObject);
+                }
             }
-        }
 
-        o->oFaceAnglePitch += -0x200;
-        if (o->oFaceAnglePitch < -0x4000) {
-            o->oFaceAnglePitch = -0x4000;
-            o->oAction++;
-            if (o->parentObj->oBehParams2ndByte != 4)
-                spawn_orange_number(o->parentObj->oBehParams2ndByte, 0, -40, 0);
-        }
-        break;
+            o->oFaceAnglePitch += -0x200;
+            if (o->oFaceAnglePitch < -0x4000) {
+                o->oFaceAnglePitch = -0x4000;
+                o->oAction++;
+                if (o->parentObj->oBehParams2ndByte != 4)
+                    spawn_orange_number(o->parentObj->oBehParams2ndByte, 0, -40, 0);
+            }
+            break;
 
-    case 2:
-        if (o->parentObj->oAction == 0)
-            o->oAction = 3;
-        break;
+        case 2:
+            if (o->parentObj->oAction == 0) {
+                o->oAction = 3;
+            }
+            break;
 
-    case 3:
-        o->oFaceAnglePitch += 0x800;
-        if (o->oFaceAnglePitch > 0) {
-            o->oFaceAnglePitch = 0;
-            o->oAction = 0;
-        }
+        case 3:
+            o->oFaceAnglePitch += 0x800;
+            if (o->oFaceAnglePitch > 0) {
+                o->oFaceAnglePitch = 0;
+                o->oAction = 0;
+            }
     }
 }