dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflicting types for rotating gate functions (#2087)

Browse Source
This commit is contained in:
DizzyEggg
2025-01-18 00:19:21 +01:00
committed by GitHub
parent 0a436d580e
commit e83f7c79eb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rotating_gate.c
View File

@@ -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;