Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflicting types for rotating gate functions (#2087)

This commit is contained in:
DizzyEggg 2025-01-18 00:19:21 +01:00 committed by GitHub
parent 0a436d580e
commit e83f7c79eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rotating_gate.h
View File

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

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;