Fix conflicting types for rotating gate functions (#2087)

rh-hideout · Jan 17, 2025 · e83f7c7 · e83f7c7
1 parent 0a436d5
commit e83f7c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/include/rotating_gate.h b/include/rotating_gate.h
@@ -1,9 +1,9 @@
 #ifndef GUARD_ROTATING_GATE_H
 #define GUARD_ROTATING_GATE_H
 
-void RotatingGatePuzzleCameraUpdate(s16, s16);
+void RotatingGatePuzzleCameraUpdate(s16 deltaX, s16 deltaY);
 void RotatingGate_InitPuzzleAndGraphics(void);
-u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16);
-bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8, s16, s16);
+bool32 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y);
+bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y);
 
 #endif // GUARD_ROTATING_GATE_H
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
@@ -3,6 +3,7 @@
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "fieldmap.h"
+#include "rotating_gate.h"
 #include "sound.h"
 #include "sprite.h"
 #include "constants/songs.h"
@@ -938,7 +939,7 @@ void RotatingGate_InitPuzzle(void)
     }
 }
 
-void RotatingGatePuzzleCameraUpdate(u16 deltaX, u16 deltaY)
+void RotatingGatePuzzleCameraUpdate(s16 deltaX, s16 deltaY)
 {
     if (GetCurrentMapRotatingGatePuzzleType())
     {
@@ -957,7 +958,7 @@ void RotatingGate_InitPuzzleAndGraphics(void)
     }
 }
 
-bool8 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
+bool32 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
 {
     s32 i;
 
@@ -995,7 +996,7 @@ bool8 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
     return FALSE;
 }
 
-bool8 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y)
+bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y)
 {
     s32 i;