diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-28 15:10:53 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-02-28 15:10:53 -0500 |
| commit | cd9d40b3cd1f14a69682bdf751f77e2865b1f698 (patch) | |
| tree | ca9637d65aa47b117962d1cba61e3db83a3b8e5b | |
| parent | a5e6e9160569ae905e81a9e0833005df2e8ca977 (diff) | |
Add usage of ANIM_GET_ON_OFF_POKEMON_WEST, unused comments
| -rw-r--r-- | src/data/object_events/object_event_anims.h | 2 | ||||
| -rw-r--r-- | src/field_effect.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h index cfbfe0f58..cd6a8a04b 100644 --- a/src/data/object_events/object_event_anims.h +++ b/src/data/object_events/object_event_anims.h @@ -995,6 +995,7 @@ static const union AnimCmd *const sAnimTable_Inanimate[] = { [ANIM_STAY_STILL] = sAnim_StayStill }; +// Leftover from Ruby/Sapphire static const union AnimCmd *const sAnimTable_QuintyPlump[] = { [ANIM_STD_FACE_SOUTH] = sAnim_QuintyPlumpFaceSouth, [ANIM_STD_FACE_NORTH] = sAnim_QuintyPlumpFaceNorth, @@ -1125,6 +1126,7 @@ static const union AnimCmd *const sAnimTable_RedGreenNormal[] = { [ANIM_SHAKE_HEAD_OR_WALK_IN_PLACE] = sAnim_ShakeHeadOrWalkInPlace, }; +// Leftover from Ruby/Sapphire static const union AnimCmd *const sAnimTable_AcroBike[] = { [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, diff --git a/src/field_effect.c b/src/field_effect.c index b44218dd5..220d9cdee 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3192,7 +3192,7 @@ static void UseFlyEffect_6(struct Task * task) { struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); - StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + StartSpriteAnim(&gSprites[objectEvent->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST); objectEvent->inanimate = TRUE; ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); task->data[0]++; @@ -3445,7 +3445,7 @@ static void FlyInEffect_1(struct Task * task) ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); CameraObjectReset2(); ObjectEventTurn(objectEvent, DIR_WEST); - StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + StartSpriteAnim(&gSprites[objectEvent->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST); objectEvent->invisible = FALSE; task->data[1] = CreateFlyBirdSprite(); StartFlyBirdSwoopDown(task->data[1]); |