summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-09-05 08:30:52 -0400
committerGitHub <noreply@github.com>2020-09-05 08:30:52 -0400
commitbb98e346e537ffa71a529db71688975b9a850cfa (patch)
tree9c4750f96a28f692a9b7661e1d88d47294c7ad15 /src
parent2c25e126e7bdcc0843b7b082608a8bb76437aff3 (diff)
parentb7fe94108c4a891733a4b4142e63f2e2cf9d0074 (diff)
Merge pull request #1178 from AsparagusEduardo/typo-pacifidlog
Fixed Pacifidlog typo.
Diffstat (limited to 'src')
-rw-r--r--src/field_tasks.c24
-rw-r--r--src/metatile_behavior.c8
2 files changed, 16 insertions, 16 deletions
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 91b4558d5..002977a10 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -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;
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 435ad7233..dde4de329 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -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;