Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

Browse Source
This commit is contained in:
Bassoonian 2025-01-18 13:07:05 +01:00
commit db5dc85b70
4 changed files with 10 additions and 10 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

5
include/sprite.h
View File

@ -1,6 +1,7 @@
#ifndef GUARD_SPRITE_H
#define GUARD_SPRITE_H
#define OAM_MATRIX_COUNT 32
#define MAX_SPRITES 64
#define SPRITE_NONE 0xFF
#define TAG_NONE 0xFFFF
@ -260,12 +261,12 @@ extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
extern const struct SpriteTemplate gDummySpriteTemplate;
extern u8 gReservedSpritePaletteCount;
extern struct Sprite gSprites[];
extern struct Sprite gSprites[MAX_SPRITES + 1];
extern u8 gOamLimit;
extern u16 gReservedSpriteTileCount;
extern s16 gSpriteCoordOffsetX;
extern s16 gSpriteCoordOffsetY;
extern struct OamMatrix gOamMatrices[];
extern struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT];
extern bool8 gAffineAnimsDisabled;
void ResetSpriteData(void);

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"
@ -939,7 +940,7 @@ void RotatingGate_InitPuzzle(void)
}
}
void RotatingGatePuzzleCameraUpdate(u16 deltaX, u16 deltaY)
void RotatingGatePuzzleCameraUpdate(s16 deltaX, s16 deltaY)
{
if (GetCurrentMapRotatingGatePuzzleType())
{
@ -958,7 +959,7 @@ void RotatingGate_InitPuzzleAndGraphics(void)
}
}
bool8 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
bool32 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y)
{
s32 i;
@ -996,7 +997,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;

2
src/sprite.c
View File

@ -5,8 +5,6 @@
#define MAX_SPRITE_COPY_REQUESTS 64
#define OAM_MATRIX_COUNT 32
#define sAnchorX data[6]
#define sAnchorY data[7]