dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add usage of ANIM_GET_ON_OFF_POKEMON_WEST, unused comments

Browse Source
This commit is contained in:
GriffinR
2022-02-28 15:10:53 -05:00
parent a5e6e91605
commit cd9d40b3cd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/object_events/object_event_anims.h
+2
View File
@@ -995,6 +995,7 @@ static const union AnimCmd *const sAnimTable_Inanimate[] = {
[ANIM_STAY_STILL] = sAnim_StayStill [ANIM_STAY_STILL] = sAnim_StayStill
}; };
// Leftover from Ruby/Sapphire
static const union AnimCmd *const sAnimTable_QuintyPlump[] = { static const union AnimCmd *const sAnimTable_QuintyPlump[] = {
[ANIM_STD_FACE_SOUTH] = sAnim_QuintyPlumpFaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_QuintyPlumpFaceSouth,
[ANIM_STD_FACE_NORTH] = sAnim_QuintyPlumpFaceNorth, [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, [ANIM_SHAKE_HEAD_OR_WALK_IN_PLACE] = sAnim_ShakeHeadOrWalkInPlace,
}; };
// Leftover from Ruby/Sapphire
static const union AnimCmd *const sAnimTable_AcroBike[] = { static const union AnimCmd *const sAnimTable_AcroBike[] = {
[ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
[ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
src/field_effect.c
+2 -2
View File
@@ -3192,7 +3192,7 @@ static void UseFlyEffect_6(struct Task * task)
{ {
struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); 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; objectEvent->inanimate = TRUE;
ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT);
task->data[0]++; task->data[0]++;
@@ -3445,7 +3445,7 @@ static void FlyInEffect_1(struct Task * task)
ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE));
CameraObjectReset2(); CameraObjectReset2();
ObjectEventTurn(objectEvent, DIR_WEST); ObjectEventTurn(objectEvent, DIR_WEST);
StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); StartSpriteAnim(&gSprites[objectEvent->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST);
objectEvent->invisible = FALSE; objectEvent->invisible = FALSE;
task->data[1] = CreateFlyBirdSprite(); task->data[1] = CreateFlyBirdSprite();
StartFlyBirdSwoopDown(task->data[1]); StartFlyBirdSwoopDown(task->data[1]);