summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/field/fldeff_decoration.c12
-rw-r--r--src/field/fldeff_secretpower.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/field/fldeff_decoration.c b/src/field/fldeff_decoration.c
index d754aed43..b0ac30062 100644
--- a/src/field/fldeff_decoration.c
+++ b/src/field/fldeff_decoration.c
@@ -109,11 +109,11 @@ static void sub_80C6A14(u8 taskId)
void sub_80C6A54(s16 x, s16 y)
{
u8 dir = player_get_direction_lower_nybble();
- if (dir == 1)
+ if (dir == DIR_SOUTH)
{
sub_80C69C4(x, y);
}
- else if (dir == 2)
+ else if (dir == DIR_NORTH)
{
u8 taskId = CreateTask(sub_80C6A14, 5);
gTasks[taskId].data[0] = 0;
@@ -207,28 +207,28 @@ bool8 FldEff_SandPillar(void)
switch (player_get_direction_lower_nybble())
{
- case 1:
+ case DIR_SOUTH:
CreateSprite(
&gSpriteTemplate_83D26A0,
gSprites[gPlayerAvatar.spriteId].oam.x + 8,
gSprites[gPlayerAvatar.spriteId].oam.y + 32,
0);
break;
- case 2:
+ case DIR_NORTH:
CreateSprite(
&gSpriteTemplate_83D26A0,
gSprites[gPlayerAvatar.spriteId].oam.x + 8,
gSprites[gPlayerAvatar.spriteId].oam.y,
148);
break;
- case 3:
+ case DIR_WEST:
CreateSprite(
&gSpriteTemplate_83D26A0,
gSprites[gPlayerAvatar.spriteId].oam.x - 8,
gSprites[gPlayerAvatar.spriteId].oam.y + 16,
148);
break;
- case 4:
+ case DIR_EAST:
CreateSprite(
&gSpriteTemplate_83D26A0,
gSprites[gPlayerAvatar.spriteId].oam.x + 24,
diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c
index fd1548c46..5ec4407ae 100644
--- a/src/field/fldeff_secretpower.c
+++ b/src/field/fldeff_secretpower.c
@@ -69,7 +69,7 @@ bool8 SetUpFieldMove_SecretPower(void)
sub_80BB63C();
- if (gScriptResult == 1 || player_get_direction_lower_nybble() != 2)
+ if (gScriptResult == 1 || player_get_direction_lower_nybble() != DIR_NORTH)
return FALSE;
GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203923C.x, &gUnknown_0203923C.y);