diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-13 00:03:22 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-13 00:03:22 -0500 |
| commit | 270bd98d41a19c516a4be95f522deb26cc4300a9 (patch) | |
| tree | dca3131793bf14acd85d6558f8195b0294870af6 /src/field_map_obj.c | |
| parent | 2c87516ca3efa260b96b92ededb24d75edfe49e8 (diff) | |
more labeling
Diffstat (limited to 'src/field_map_obj.c')
| -rw-r--r-- | src/field_map_obj.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index a453fd2c1..0e7cd7896 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -3899,7 +3899,7 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp gFieldEffectArguments[1] = mapObject->coords2.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; - FieldEffectStart(0x17); + FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); sprite->animNum = 0; } return 0; @@ -3938,7 +3938,7 @@ u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sp gFieldEffectArguments[1] = mapObject->coords2.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; - FieldEffectStart(0x17); + FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); return 1; } @@ -5087,7 +5087,7 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite) if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0)) { FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(0x1c); + mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE); mapObject->mapobj_unk_21 = 1; sprite->data7 ++; } @@ -5107,7 +5107,7 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite) if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0)) { FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(0x1d); + mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); mapObject->mapobj_unk_21 = 1; sprite->data7 ++; } @@ -7467,7 +7467,7 @@ bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite) bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); - FieldEffectStart(0x0); + FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); sprite->data2 = 1; return TRUE; } @@ -7475,7 +7475,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); - FieldEffectStart(0x21); + FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2); sprite->data2 = 1; return TRUE; } @@ -7483,7 +7483,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); - FieldEffectStart(0x2e); + FieldEffectStart(FLDEFF_HEART_ICON); sprite->data2 = 1; return TRUE; } |