atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1178 from AsparagusEduardo/typo-pacifidlog

Browse source 
Fixed Pacifidlog typo.
This commit is contained in:
PikalaxALT 2020-09-05 08:30:52 -04:00 committed by GitHub
commit bb98e346e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/metatile_behavior.h
View file

@ -99,10 +99,10 @@ bool8 MetatileBehavior_IsShortGrass(u8);
bool8 MetatileBehavior_IsHotSprings(u8);
bool8 MetatileBehavior_IsWaterfall(u8);
bool8 MetatileBehavior_IsFortreeBridge(u8);
bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8);
bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8);
bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8);
bool8 MetatileBehavior_IsPacifilogHorizontalLog2(u8);
bool8 MetatileBehavior_IsPacifidlogVerticalLog1(u8);
bool8 MetatileBehavior_IsPacifidlogVerticalLog2(u8);
bool8 MetatileBehavior_IsPacifidlogHorizontalLog1(u8);
bool8 MetatileBehavior_IsPacifidlogHorizontalLog2(u8);
bool8 MetatileBehavior_IsPacifidlogLog(u8);
bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
bool8 MetatileBehavior_IsRegionMap(u8);

24
src/field_tasks.c
View file

@ -219,13 +219,13 @@ static void DummyPerStepCallback(u8 taskId)
static const struct PacifidlogMetatileOffsets *GetPacifidlogBridgeMetatileOffsets(const struct PacifidlogMetatileOffsets *offsets, u16 metatileBehavior)
{
if (MetatileBehavior_IsPacifilogVerticalLog1(metatileBehavior))
if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior))
return &offsets[0 * 2];
else if (MetatileBehavior_IsPacifilogVerticalLog2(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior))
return &offsets[1 * 2];
else if (MetatileBehavior_IsPacifilogHorizontalLog1(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior))
return &offsets[2 * 2];
else if (MetatileBehavior_IsPacifilogHorizontalLog2(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior))
return &offsets[3 * 2];
else
return NULL;
@ -265,22 +265,22 @@ static bool32 StandingOnNewPacifidlogBridge(s16 x1, s16 y1, s16 x2, s16 y2)
{
u16 metatileBehavior = MapGridGetMetatileBehaviorAt(x2, y2);
if (MetatileBehavior_IsPacifilogVerticalLog1(metatileBehavior))
if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior))
{
if (y1 > y2)
return FALSE;
}
else if (MetatileBehavior_IsPacifilogVerticalLog2(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior))
{
if (y1 < y2)
return FALSE;
}
else if (MetatileBehavior_IsPacifilogHorizontalLog1(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior))
{
if (x1 > x2)
return FALSE;
}
else if (MetatileBehavior_IsPacifilogHorizontalLog2(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior))
{
if (x1 < x2)
return FALSE;
@ -292,22 +292,22 @@ static bool32 StandingOnSamePacifidlogBridge(s16 x1, s16 y1, s16 x2, s16 y2)
{
u16 metatileBehavior = MapGridGetMetatileBehaviorAt(x1, y1);
if (MetatileBehavior_IsPacifilogVerticalLog1(metatileBehavior))
if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior))
{
if (y1 < y2)
return FALSE;
}
else if (MetatileBehavior_IsPacifilogVerticalLog2(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior))
{
if (y1 > y2)
return FALSE;
}
else if (MetatileBehavior_IsPacifilogHorizontalLog1(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior))
{
if (x1 < x2)
return FALSE;
}
else if (MetatileBehavior_IsPacifilogHorizontalLog2(metatileBehavior))
else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior))
{
if (x1 > x2)
return FALSE;

8
src/metatile_behavior.c
View file

@ -1107,7 +1107,7 @@ bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8 metatileBehavior)
bool8 MetatileBehavior_IsPacifidlogVerticalLog1(u8 metatileBehavior)
{
if (metatileBehavior == MB_PACIFIDLOG_VERTICAL_LOG_1)
return TRUE;
@ -1115,7 +1115,7 @@ bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8 metatileBehavior)
bool8 MetatileBehavior_IsPacifidlogVerticalLog2(u8 metatileBehavior)
{
if (metatileBehavior == MB_PACIFIDLOG_VERTICAL_LOG_2)
return TRUE;
@ -1123,7 +1123,7 @@ bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8 metatileBehavior)
bool8 MetatileBehavior_IsPacifidlogHorizontalLog1(u8 metatileBehavior)
{
if (metatileBehavior == MB_PACIFIDLOG_HORIZONTAL_LOG_1)
return TRUE;
@ -1131,7 +1131,7 @@ bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsPacifilogHorizontalLog2(u8 metatileBehavior)
bool8 MetatileBehavior_IsPacifidlogHorizontalLog2(u8 metatileBehavior)
{
if (metatileBehavior == MB_PACIFIDLOG_HORIZONTAL_LOG_2)
return TRUE;