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

Bring labels for overworld.c over from pokeruby

Browse Source
This commit is contained in:
Slawter666
2018-09-04 23:31:37 +01:00
parent 5c66b8a7ef
commit 4c54212b1f
16 changed files with 231 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/event_object_movement.c
View File

@@ -798,7 +798,7 @@ bool8 (*const gDirectionBlockedMetatileFuncs[])(u8) = {
MetatileBehavior_IsWestBlocked
};
const struct Coords16 gDirectionToVectors[] = {
static const struct Coords16 sDirectionToVectors[] = {
{ 0, 0},
{ 0, 1},
{ 0, -1},
@@ -4957,14 +4957,14 @@ void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup)
void MoveCoords(u8 direction, s16 *x, s16 *y)
{
*x += gDirectionToVectors[direction].x;
*y += gDirectionToVectors[direction].y;
*x += sDirectionToVectors[direction].x;
*y += sDirectionToVectors[direction].y;
}
void sub_8092F60(u8 direction, s16 *x, s16 *y)
{
*x += gDirectionToVectors[direction].x << 4;
*y += gDirectionToVectors[direction].y << 4;
*x += sDirectionToVectors[direction].x << 4;
*y += sDirectionToVectors[direction].y << 4;
}
static void MoveCoordsInDirection(u32 dir, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
@@ -4972,13 +4972,13 @@ static void MoveCoordsInDirection(u32 dir, s16 *x, s16 *y, s16 deltaX, s16 delta
u8 direction = dir;
s16 dx2 = (u16)deltaX;
s16 dy2 = (u16)deltaY;
if (gDirectionToVectors[direction].x > 0)
if (sDirectionToVectors[direction].x > 0)
*x += dx2;
if (gDirectionToVectors[direction].x < 0)
if (sDirectionToVectors[direction].x < 0)
*x -= dx2;
if (gDirectionToVectors[direction].y > 0)
if (sDirectionToVectors[direction].y > 0)
*y += dy2;
if (gDirectionToVectors[direction].y < 0)
if (sDirectionToVectors[direction].y < 0)
*y -= dy2;
}
@@ -8389,32 +8389,32 @@ void UnfreezeEventObjects(void)
void Step1(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += gDirectionToVectors[dir].x;
sprite->pos1.y += gDirectionToVectors[dir].y;
sprite->pos1.x += sDirectionToVectors[dir].x;
sprite->pos1.y += sDirectionToVectors[dir].y;
}
void Step2(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x;
sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y;
sprite->pos1.x += 2 * (u16) sDirectionToVectors[dir].x;
sprite->pos1.y += 2 * (u16) sDirectionToVectors[dir].y;
}
void Step3(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x + (u16) gDirectionToVectors[dir].x;
sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y + (u16) gDirectionToVectors[dir].y;
sprite->pos1.x += 2 * (u16) sDirectionToVectors[dir].x + (u16) sDirectionToVectors[dir].x;
sprite->pos1.y += 2 * (u16) sDirectionToVectors[dir].y + (u16) sDirectionToVectors[dir].y;
}
void Step4(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 4 * (u16) gDirectionToVectors[dir].x;
sprite->pos1.y += 4 * (u16) gDirectionToVectors[dir].y;
sprite->pos1.x += 4 * (u16) sDirectionToVectors[dir].x;
sprite->pos1.y += 4 * (u16) sDirectionToVectors[dir].y;
}
void Step8(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 8 * (u16) gDirectionToVectors[dir].x;
sprite->pos1.y += 8 * (u16) gDirectionToVectors[dir].y;
sprite->pos1.x += 8 * (u16) sDirectionToVectors[dir].x;
sprite->pos1.y += 8 * (u16) sDirectionToVectors[dir].y;
}
void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3)