From f91845a6114a8a8740e0956f76e1a1b443db5c2c Mon Sep 17 00:00:00 2001
From: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Date: Thu, 28 Jul 2022 10:03:44 -0500
Subject: [PATCH] play part 2

---
 include/functions.h                             |  2 +-
 src/code/z_actor.c                              |  2 +-
 src/overlays/actors/ovl_Boss_07/z_boss_07.c     | 12 ++++++------
 src/overlays/actors/ovl_En_Dragon/z_en_dragon.c |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index 6cca776af..36070db21 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -617,7 +617,7 @@ void Flags_SetCollectible(PlayState* play, s32 flag);
 void TitleCard_InitBossName(GameState* gameState, TitleCardContext* titleCtx, TexturePtr texture, s16 x, s16 y, u8 width, u8 height);
 
 s32 func_800B648C(PlayState* play, s32 arg1, s32 arg2, f32 arg3, Vec3f* arg4);
-f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, u32* arg3);
+f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, s32* arg3);
 void* func_800B6584(PlayState* play, s16 id, void* arg2, size_t size);
 void* func_800B6608(PlayState* play, s16 id);
 void* func_800B6680(PlayState* play, s16 id);
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index d792b276a..f3f4123d3 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -930,7 +930,7 @@ s32 func_800B648C(PlayState* play, s32 arg1, s32 arg2, f32 arg3, Vec3f* arg4) {
     return true;
 }
 
-f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, u32* arg3) {
+f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, s32* arg3) {
     f32 temp_f8;
 
     if ((play->actorCtx.unk1F5 == 0) || (arg1 == 0.0f)) {
diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c
index a10d61dce..65bfb0add 100644
--- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c
+++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c
@@ -1394,7 +1394,7 @@ void Boss07_Wrath_Grab(Boss07* this, PlayState* play) {
 }
 
 void Boss07_Wrath_GrabPlayer(Boss07* this, PlayState* play) {
-    u32 sp2C;
+    s32 sp2C;
     Player* player = GET_PLAYER(play);
 
     SkelAnime_Update(&this->skelAnime);
@@ -1420,7 +1420,7 @@ void Boss07_Wrath_ThrowPlayer(Boss07* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     f32 phi_f0;
     f32 phi_f2;
-    u32 sp30;
+    s32 sp30;
 
     SkelAnime_Update(&this->skelAnime);
     this->unk_15A = 20;
@@ -1655,7 +1655,7 @@ void Boss07_Wrath_Damaged(Boss07* this, PlayState* play) {
 
 void Boss07_Wrath_WhipCollisionCheck(Vec3f* arg0, f32 arg1, Boss07* this, PlayState* play) {
     s32 i;
-    u32 sp98 = -1;
+    s32 sp98 = -1;
     Player* player = GET_PLAYER(play);
     f32 dx;
     f32 dy;
@@ -2865,7 +2865,7 @@ void Boss07_Incarnation_SetupRun(Boss07* this, PlayState* play) {
 void Boss07_Incarnation_Run(Boss07* this, PlayState* play) {
     f32 sp34;
     f32 sp30;
-    u32 sp2C;
+    s32 sp2C;
 
     Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LAST2_WALK_OLD - SFX_FLAG);
     this->unk_AB40++;
@@ -5384,7 +5384,7 @@ void Boss07_Top_Collide(Boss07* this, PlayState* play) {
 }
 
 void Boss07_Top_CollisionCheck(Boss07* this, PlayState* play) {
-    u32 sp3C;
+    s32 sp3C;
     s32 sp38 = 0;
     Player* player = GET_PLAYER(play);
     s32 pad[3];
@@ -5497,7 +5497,7 @@ void Boss07_Static_Update(Actor* thisx, PlayState* play2) {
 
     if (sHeartbeatTimer != 0) {
         sHeartbeatTimer--;
-    dummy_label:;
+    dummy_label:; //!@fake
         play_sound(NA_SE_EN_LAST2_HEARTBEAT_OLD - SFX_FLAG);
     }
     if (this->unk_1808 != 0) {
diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
index ece3c0903..37613dab4 100644
--- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
+++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
@@ -724,7 +724,7 @@ void EnDragon_Dead(EnDragon* this, PlayState* play) {
 
 void EnDragon_UpdateDamage(EnDragon* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
-    u32 sp30;
+    s32 sp30;
 
     if (this->action == DEEP_PYTHON_ACTION_EXTEND) {
         if ((this->collider.elements[2].info.bumperFlags & BUMP_HIT) ||