diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-14 18:37:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 18:37:11 -0500 |
| commit | 7f211b258846647b0ea3e67b36c9b0328cc378e6 (patch) | |
| tree | 3b863cece823ecb889dae4983b9f45e31b3a134f /src/event_object_movement.c | |
| parent | eafea33dd99c026c78e1d78d9c09fb3e759dc72a (diff) | |
| parent | 137f6549fffe9960b91ea8727ce92d3f3049f0fb (diff) | |
Merge pull request #359 from Slawter666/label_field_effect_helpers
Label field_effect_helpers.c
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 39318a9e6..8c5c92473 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1868,7 +1868,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) if (eventObject->movementType == 0x0b) { SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId); - eventObject->warpArrowSpriteId = sub_8154228(); + eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); } if (subspriteTables != NULL) { @@ -8206,7 +8206,7 @@ void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *s gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_TALL_GRASS); - spriteId = sub_81546C8( + spriteId = FindTallGrassFieldEffectSpriteId( eventObj->localId, eventObj->mapNum, eventObj->mapGroup, eventObj->currentCoords.x, eventObj->currentCoords.y); if (spriteId == MAX_SPRITES) @@ -8843,14 +8843,14 @@ void sub_8097B78(u8 var1, u8 var2) StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(var2)); } -void sub_8097BB4(u8 var1, u8 var2) +void sub_8097BB4(u8 var1, u8 graphicsId) { int spriteId = sub_8097B2C(var1); if(spriteId != MAX_SPRITES) { struct Sprite *sprite = &gSprites[spriteId]; - const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(var2); + const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(graphicsId); u16 tileNum = sprite->oam.tileNum; sprite->oam = *gfxInfo->oam; |