summaryrefslogtreecommitdiff
path: root/src/field_effect_helpers.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-07-02 04:59:52 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-07-02 05:05:13 -0400
commit1ce929157f6e6825b54ce39d73a41374534998c6 (patch)
tree79b27c9e1eeac44bdd0985cedb41809790cfd2b2 /src/field_effect_helpers.c
parent8589e138a82b74bbfdaec6008cb389e5d5e8cce8 (diff)
Clean up field effect doc
Diffstat (limited to 'src/field_effect_helpers.c')
-rwxr-xr-xsrc/field_effect_helpers.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 9950978ad..78948618f 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -348,7 +348,7 @@ u32 FldEff_JumpTallGrass(void)
sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3];
sprite->data[0] = gFieldEffectArguments[2];
- sprite->data[1] = 12;
+ sprite->data[1] = FLDEFF_JUMP_TALL_GRASS;
}
return 0;
}
@@ -451,7 +451,7 @@ u32 FldEff_JumpLongGrass(void)
sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3];
sprite->data[0] = gFieldEffectArguments[2];
- sprite->data[1] = 18;
+ sprite->data[1] = FLDEFF_JUMP_LONG_GRASS;
}
return 0;
}
@@ -800,19 +800,19 @@ void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite)
}
}
-u32 FldEff_Unknown19(void)
+u32 FldEff_UnusedGrass(void)
{
u8 spriteId;
struct Sprite *sprite;
sub_80930E0((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
- spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_17], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+ spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES)
{
sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3];
- sprite->data[0] = FLDEFF_UNKNOWN_19;
+ sprite->data[0] = FLDEFF_UNUSED_GRASS;
}
return 0;
}
@@ -834,19 +834,19 @@ u32 FldEff_UnusedGrass2(void)
return 0;
}
-u32 FldEff_Unknown21(void)
+u32 FldEff_UnusedSand(void)
{
u8 spriteId;
struct Sprite *sprite;
sub_80930E0((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
- spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_19], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+ spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_SAND], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
if (spriteId != MAX_SPRITES)
{
sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3];
- sprite->data[0] = FLDEFF_UNKNOWN_21;
+ sprite->data[0] = FLDEFF_UNUSED_SAND;
}
return 0;
}
@@ -1115,7 +1115,7 @@ u32 FldEff_Dust(void)
sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3];
sprite->data[0] = gFieldEffectArguments[2];
- sprite->data[1] = 10;
+ sprite->data[1] = FLDEFF_DUST;
}
return 0;
}