ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1532 from cbt6/anim-number

Browse Source 
Label some animation index numbers
This commit is contained in:
GriffinR 2021-10-29 14:14:15 -04:00 committed by GitHub
commit af4d6dd8f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 452 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
include/constants/event_object_movement.h
View File

@ -245,4 +245,77 @@
#define MOVEMENT_ACTION_STEP_END 0xFE #define MOVEMENT_ACTION_STEP_END 0xFE
#define MOVEMENT_ACTION_NONE 0xFF #define MOVEMENT_ACTION_NONE 0xFF
#define ANIM_STD_FACE_SOUTH 0
#define ANIM_STD_FACE_NORTH 1
#define ANIM_STD_FACE_WEST 2
#define ANIM_STD_FACE_EAST 3
#define ANIM_STD_GO_SOUTH 4
#define ANIM_STD_GO_NORTH 5
#define ANIM_STD_GO_WEST 6
#define ANIM_STD_GO_EAST 7
#define ANIM_STD_GO_FAST_SOUTH 8
#define ANIM_STD_GO_FAST_NORTH 9
#define ANIM_STD_GO_FAST_WEST 10
#define ANIM_STD_GO_FAST_EAST 11
#define ANIM_STD_GO_FASTER_SOUTH 12
#define ANIM_STD_GO_FASTER_NORTH 13
#define ANIM_STD_GO_FASTER_WEST 14
#define ANIM_STD_GO_FASTER_EAST 15
#define ANIM_STD_GO_FASTEST_SOUTH 16
#define ANIM_STD_GO_FASTEST_NORTH 17
#define ANIM_STD_GO_FASTEST_WEST 18
#define ANIM_STD_GO_FASTEST_EAST 19
#define ANIM_STD_COUNT 20
#define ANIM_RUN_SOUTH (ANIM_STD_COUNT + 0)
#define ANIM_RUN_NORTH (ANIM_STD_COUNT + 1)
#define ANIM_RUN_WEST (ANIM_STD_COUNT + 2)
#define ANIM_RUN_EAST (ANIM_STD_COUNT + 3)
#define ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH (ANIM_STD_COUNT + 0)
#define ANIM_BUNNY_HOPPY_BACK_WHEEL_NORTH (ANIM_STD_COUNT + 1)
#define ANIM_BUNNY_HOPPY_BACK_WHEEL_WEST (ANIM_STD_COUNT + 2)
#define ANIM_BUNNY_HOPPY_BACK_WHEEL_EAST (ANIM_STD_COUNT + 3)
#define ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH (ANIM_STD_COUNT + 4)
#define ANIM_BUNNY_HOPPY_FRONT_WHEEL_NORTH (ANIM_STD_COUNT + 5)
#define ANIM_BUNNY_HOPPY_FRONT_WHEEL_WEST (ANIM_STD_COUNT + 6)
#define ANIM_BUNNY_HOPPY_FRONT_WHEEL_EAST (ANIM_STD_COUNT + 7)
#define ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH (ANIM_STD_COUNT + 8)
#define ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH (ANIM_STD_COUNT + 9)
#define ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST (ANIM_STD_COUNT + 10)
#define ANIM_STANDING_WHEELIE_BACK_WHEEL_EAST (ANIM_STD_COUNT + 11)
#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH (ANIM_STD_COUNT + 12)
#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH (ANIM_STD_COUNT + 13)
#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_WEST (ANIM_STD_COUNT + 14)
#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_EAST (ANIM_STD_COUNT + 15)
#define ANIM_MOVING_WHEELIE_SOUTH (ANIM_STD_COUNT + 16)
#define ANIM_MOVING_WHEELIE_NORTH (ANIM_STD_COUNT + 17)
#define ANIM_MOVING_WHEELIE_WEST (ANIM_STD_COUNT + 18)
#define ANIM_MOVING_WHEELIE_EAST (ANIM_STD_COUNT + 19)
#define ANIM_GET_ON_OFF_POKEMON_SOUTH (ANIM_STD_COUNT + 0)
#define ANIM_GET_ON_OFF_POKEMON_NORTH (ANIM_STD_COUNT + 1)
#define ANIM_GET_ON_OFF_POKEMON_WEST (ANIM_STD_COUNT + 2)
#define ANIM_GET_ON_OFF_POKEMON_EAST (ANIM_STD_COUNT + 3)
#define ANIM_NURSE_BOW (ANIM_STD_COUNT + 0)
#define ANIM_FIELD_MOVE 0
#define ANIM_STAY_STILL 0
#define ANIM_REMOVE_OBSTACLE 1
#define ANIM_TAKE_OUT_ROD_SOUTH 0
#define ANIM_TAKE_OUT_ROD_NORTH 1
#define ANIM_TAKE_OUT_ROD_WEST 2
#define ANIM_TAKE_OUT_ROD_EAST 3
#define ANIM_PUT_AWAY_ROD_SOUTH 4
#define ANIM_PUT_AWAY_ROD_NORTH 5
#define ANIM_PUT_AWAY_ROD_WEST 6
#define ANIM_PUT_AWAY_ROD_EAST 7
#define ANIM_HOOKED_POKEMON_SOUTH 8
#define ANIM_HOOKED_POKEMON_NORTH 9
#define ANIM_HOOKED_POKEMON_WEST 10
#define ANIM_HOOKED_POKEMON_EAST 11
#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H #endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H

13
src/cable_car.c
View File

@ -17,6 +17,7 @@
#include "sound.h" #include "sound.h"
#include "sprite.h" #include "sprite.h"
#include "task.h" #include "task.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"
@ -902,15 +903,13 @@ static void CreateCableCarSprites(void)
{ {
if (rval % 2) if (rval % 2)
{ {
// Do walking west anim StartSpriteAnim(&gSprites[spriteId], ANIM_STD_GO_WEST);
StartSpriteAnim(&gSprites[spriteId], 6);
gSprites[spriteId].sSameDir = TRUE; gSprites[spriteId].sSameDir = TRUE;
gSprites[spriteId].y += 2; gSprites[spriteId].y += 2;
} }
else else
{ {
// Do walking east anim StartSpriteAnim(&gSprites[spriteId], ANIM_STD_GO_EAST);
StartSpriteAnim(&gSprites[spriteId], 7);
gSprites[spriteId].sSameDir = FALSE; gSprites[spriteId].sSameDir = FALSE;
} }
} }
@ -918,15 +917,13 @@ static void CreateCableCarSprites(void)
{ {
if (rval % 2) if (rval % 2)
{ {
// Do walking east anim StartSpriteAnim(&gSprites[spriteId], ANIM_STD_GO_EAST);
StartSpriteAnim(&gSprites[spriteId], 7);
gSprites[spriteId].sSameDir = TRUE; gSprites[spriteId].sSameDir = TRUE;
gSprites[spriteId].y += 2; gSprites[spriteId].y += 2;
} }
else else
{ {
// Do walking west anim StartSpriteAnim(&gSprites[spriteId], ANIM_STD_GO_WEST);
StartSpriteAnim(&gSprites[spriteId], 6);
gSprites[spriteId].sSameDir = FALSE; gSprites[spriteId].sSameDir = FALSE;
} }
} }

466
src/data/object_events/object_event_anims.h
View File

@ -796,99 +796,100 @@ static const union AnimCmd sAnim_HoOhStayStill[] =
}; };
static const union AnimCmd *const sAnimTable_Inanimate[] = { static const union AnimCmd *const sAnimTable_Inanimate[] = {
sAnim_StayStill, [ANIM_STAY_STILL] = sAnim_StayStill,
}; };
static const union AnimCmd *const sAnimTable_QuintyPlump[] = { static const union AnimCmd *const sAnimTable_QuintyPlump[] = {
sAnim_QuintyPlumpFaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_QuintyPlumpFaceSouth,
sAnim_QuintyPlumpFaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_QuintyPlumpFaceNorth,
sAnim_QuintyPlumpFaceWest, [ANIM_STD_FACE_WEST] = sAnim_QuintyPlumpFaceWest,
sAnim_QuintyPlumpFaceEast, [ANIM_STD_FACE_EAST] = sAnim_QuintyPlumpFaceEast,
sAnim_QuintyPlumpGoSouth, [ANIM_STD_GO_SOUTH] = sAnim_QuintyPlumpGoSouth,
sAnim_QuintyPlumpGoNorth, [ANIM_STD_GO_NORTH] = sAnim_QuintyPlumpGoNorth,
sAnim_QuintyPlumpGoWest, [ANIM_STD_GO_WEST] = sAnim_QuintyPlumpGoWest,
sAnim_QuintyPlumpGoEast, [ANIM_STD_GO_EAST] = sAnim_QuintyPlumpGoEast,
sAnim_QuintyPlumpGoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_QuintyPlumpGoFastSouth,
sAnim_QuintyPlumpGoFastNorth, [ANIM_STD_GO_FAST_NORTH] = sAnim_QuintyPlumpGoFastNorth,
sAnim_QuintyPlumpGoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_QuintyPlumpGoFastWest,
sAnim_QuintyPlumpGoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_QuintyPlumpGoFastEast,
sAnim_QuintyPlumpGoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_QuintyPlumpGoFasterSouth,
sAnim_QuintyPlumpGoFasterNorth, [ANIM_STD_GO_FASTER_NORTH] = sAnim_QuintyPlumpGoFasterNorth,
sAnim_QuintyPlumpGoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_QuintyPlumpGoFasterWest,
sAnim_QuintyPlumpGoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_QuintyPlumpGoFasterEast,
sAnim_QuintyPlumpGoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_QuintyPlumpGoFastestSouth,
sAnim_QuintyPlumpGoFastestNorth, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_QuintyPlumpGoFastestNorth,
sAnim_QuintyPlumpGoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_QuintyPlumpGoFastestWest,
sAnim_QuintyPlumpGoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_QuintyPlumpGoFastestEast,
}; };
static const union AnimCmd *const sAnimTable_Standard[] = { static const union AnimCmd *const sAnimTable_Standard[] = {
sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
sAnim_FaceWest, [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
sAnim_FaceEast, [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
sAnim_GoSouth, [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
sAnim_GoNorth, [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
sAnim_GoWest, [ANIM_STD_GO_WEST] = sAnim_GoWest,
sAnim_GoEast, [ANIM_STD_GO_EAST] = sAnim_GoEast,
sAnim_GoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
sAnim_GoFastNorth, [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
sAnim_GoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
sAnim_GoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
sAnim_GoFasterNorth, [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
sAnim_GoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
sAnim_GoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
sAnim_GoFastestNorth, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
sAnim_GoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
}; };
static const union AnimCmd *const sAnimTable_HoOh[] = { static const union AnimCmd *const sAnimTable_HoOh[] = {
sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
sAnim_FaceWest, [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
sAnim_FaceEast, [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
sAnim_HoOhFlapWings, [ANIM_STD_GO_SOUTH] = sAnim_HoOhFlapWings,
sAnim_HoOhStayStill, [ANIM_STD_GO_NORTH] = sAnim_HoOhStayStill,
sAnim_GoWest, [ANIM_STD_GO_WEST] = sAnim_GoWest,
sAnim_GoEast, [ANIM_STD_GO_EAST] = sAnim_GoEast,
sAnim_GoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
sAnim_GoFastNorth, [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
sAnim_GoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
sAnim_GoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
sAnim_GoFasterNorth, [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
sAnim_GoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
sAnim_GoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
sAnim_GoFastestNorth, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
sAnim_GoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
}; };
// The movements for going up use the animations for going right instead.
static const union AnimCmd *const sAnimTable_GroudonSide[] = { static const union AnimCmd *const sAnimTable_GroudonSide[] = {
sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
sAnim_FaceWest, [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
sAnim_FaceEast, [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
sAnim_GoSouth, [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
sAnim_GoEast, [ANIM_STD_GO_NORTH] = sAnim_GoEast,
sAnim_GoWest, [ANIM_STD_GO_WEST] = sAnim_GoWest,
sAnim_GoEast, [ANIM_STD_GO_EAST] = sAnim_GoEast,
sAnim_GoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastEast,
sAnim_GoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
sAnim_GoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterEast,
sAnim_GoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
sAnim_GoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestEast,
sAnim_GoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
}; };
static const union AnimCmd sAnim_RayquazaCoiledAwake[] = static const union AnimCmd sAnim_RayquazaCoiledAwake[] =
@ -952,186 +953,185 @@ static const union AnimCmd sAnim_RayquazaFaceEast[] =
// Though they correspond to facing/walking movements, Rayquaza doesn't have // Though they correspond to facing/walking movements, Rayquaza doesn't have
// equivalent images aside from flying up. Its other frames aside from the 'normal' // equivalent images aside from flying up. Its other frames aside from the 'normal'
// frame are for the sequence where it awakens on Sky Pillar. // frame are for the sequence where it awakens on Sky Pillar.
// The corresponding facing/walking movements are commented alongside
static const union AnimCmd *const sAnimTable_Rayquaza[] = { static const union AnimCmd *const sAnimTable_Rayquaza[] = {
sAnim_RayquazaFaceSouth, // Face South [ANIM_STD_FACE_SOUTH] = sAnim_RayquazaFaceSouth,
sAnim_RayquazaFaceNorth, // Face North [ANIM_STD_FACE_NORTH] = sAnim_RayquazaFaceNorth,
sAnim_RayquazaFaceWest, // Face West [ANIM_STD_FACE_WEST] = sAnim_RayquazaFaceWest,
sAnim_RayquazaFaceEast, // Face East [ANIM_STD_FACE_EAST] = sAnim_RayquazaFaceEast,
sAnim_RayquazaCoiledAsleep, // Go South [ANIM_STD_GO_SOUTH] = sAnim_RayquazaCoiledAsleep,
sAnim_RayquazaFlyUp, // Go North [ANIM_STD_GO_NORTH] = sAnim_RayquazaFlyUp,
sAnim_RayquazaCoiledMouthOpen, // Go West [ANIM_STD_GO_WEST] = sAnim_RayquazaCoiledMouthOpen,
sAnim_RayquazaNormal, // Go East [ANIM_STD_GO_EAST] = sAnim_RayquazaNormal,
sAnim_RayquazaCoiledAsleep, // Go fast South [ANIM_STD_GO_FAST_SOUTH] = sAnim_RayquazaCoiledAsleep,
sAnim_RayquazaFlyUp, // Go fast North [ANIM_STD_GO_FAST_NORTH] = sAnim_RayquazaFlyUp,
sAnim_RayquazaCoiledAwake, // Go fast West [ANIM_STD_GO_FAST_WEST] = sAnim_RayquazaCoiledAwake,
sAnim_RayquazaNormal, // Go fast East [ANIM_STD_GO_FAST_EAST] = sAnim_RayquazaNormal,
sAnim_RayquazaCoiledAsleep, // Go faster South [ANIM_STD_GO_FASTER_SOUTH] = sAnim_RayquazaCoiledAsleep,
sAnim_RayquazaFlyUp, // Go faster North [ANIM_STD_GO_FASTER_NORTH] = sAnim_RayquazaFlyUp,
sAnim_RayquazaCoiledMouthOpen, // Go faster West [ANIM_STD_GO_FASTER_WEST] = sAnim_RayquazaCoiledMouthOpen,
sAnim_RayquazaNormal, // Go faster East [ANIM_STD_GO_FASTER_EAST] = sAnim_RayquazaNormal,
sAnim_RayquazaCoiledAsleep, // Go fastest South [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_RayquazaCoiledAsleep,
sAnim_RayquazaFlyUp, // Go fastest North [ANIM_STD_GO_FASTEST_NORTH] = sAnim_RayquazaFlyUp,
sAnim_RayquazaCoiledMouthOpen, // Go fastest West [ANIM_STD_GO_FASTEST_WEST] = sAnim_RayquazaCoiledMouthOpen,
sAnim_RayquazaNormal, // Go fastest East [ANIM_STD_GO_FASTEST_EAST] = sAnim_RayquazaNormal,
}; };
static const union AnimCmd *const sAnimTable_BrendanMayNormal[] = { static const union AnimCmd *const sAnimTable_BrendanMayNormal[] = {
sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
sAnim_FaceWest, [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
sAnim_FaceEast, [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
sAnim_GoSouth, [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
sAnim_GoNorth, [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
sAnim_GoWest, [ANIM_STD_GO_WEST] = sAnim_GoWest,
sAnim_GoEast, [ANIM_STD_GO_EAST] = sAnim_GoEast,
sAnim_GoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
sAnim_GoFastNorth, [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
sAnim_GoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
sAnim_GoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
sAnim_GoFasterNorth, [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
sAnim_GoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
sAnim_GoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
sAnim_GoFastestNorth, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
sAnim_GoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
sAnim_RunSouth, [ANIM_RUN_SOUTH] = sAnim_RunSouth,
sAnim_RunNorth, [ANIM_RUN_NORTH] = sAnim_RunNorth,
sAnim_RunWest, [ANIM_RUN_WEST] = sAnim_RunWest,
sAnim_RunEast, [ANIM_RUN_EAST] = sAnim_RunEast,
}; };
static const union AnimCmd *const sAnimTable_AcroBike[] = { static const union AnimCmd *const sAnimTable_AcroBike[] = {
sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
sAnim_FaceWest, [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
sAnim_FaceEast, [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
sAnim_GoSouth, [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
sAnim_GoNorth, [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
sAnim_GoWest, [ANIM_STD_GO_WEST] = sAnim_GoWest,
sAnim_GoEast, [ANIM_STD_GO_EAST] = sAnim_GoEast,
sAnim_GoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
sAnim_GoFastNorth, [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
sAnim_GoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
sAnim_GoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
sAnim_GoFasterNorth, [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
sAnim_GoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
sAnim_GoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
sAnim_GoFastestNorth, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
sAnim_GoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
sAnim_BunnyHoppyBackWheelSouth, [ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH] = sAnim_BunnyHoppyBackWheelSouth,
sAnim_BunnyHoppyBackWheelNorth, [ANIM_BUNNY_HOPPY_BACK_WHEEL_NORTH] = sAnim_BunnyHoppyBackWheelNorth,
sAnim_BunnyHoppyBackWheelWest, [ANIM_BUNNY_HOPPY_BACK_WHEEL_WEST] = sAnim_BunnyHoppyBackWheelWest,
sAnim_BunnyHoppyBackWheelEast, [ANIM_BUNNY_HOPPY_BACK_WHEEL_EAST] = sAnim_BunnyHoppyBackWheelEast,
sAnim_BunnyHoppyFrontWheelSouth, [ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH] = sAnim_BunnyHoppyFrontWheelSouth,
sAnim_BunnyHoppyFrontWheelNorth, [ANIM_BUNNY_HOPPY_FRONT_WHEEL_NORTH] = sAnim_BunnyHoppyFrontWheelNorth,
sAnim_BunnyHoppyFrontWheelWest, [ANIM_BUNNY_HOPPY_FRONT_WHEEL_WEST] = sAnim_BunnyHoppyFrontWheelWest,
sAnim_BunnyHoppyFrontWheelEast, [ANIM_BUNNY_HOPPY_FRONT_WHEEL_EAST] = sAnim_BunnyHoppyFrontWheelEast,
sAnim_StandingWheelieBackWheelSouth, [ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH] = sAnim_StandingWheelieBackWheelSouth,
sAnim_StandingWheelieBackWheelNorth, [ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH] = sAnim_StandingWheelieBackWheelNorth,
sAnim_StandingWheelieBackWheelWest, [ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST] = sAnim_StandingWheelieBackWheelWest,
sAnim_StandingWheelieBackWheelEast, [ANIM_STANDING_WHEELIE_BACK_WHEEL_EAST] = sAnim_StandingWheelieBackWheelEast,
sAnim_StandingWheelieFrontWheelSouth, [ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH] = sAnim_StandingWheelieFrontWheelSouth,
sAnim_StandingWheelieFrontWheelNorth, [ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH] = sAnim_StandingWheelieFrontWheelNorth,
sAnim_StandingWheelieFrontWheelWest, [ANIM_STANDING_WHEELIE_FRONT_WHEEL_WEST] = sAnim_StandingWheelieFrontWheelWest,
sAnim_StandingWheelieFrontWheelEast, [ANIM_STANDING_WHEELIE_FRONT_WHEEL_EAST] = sAnim_StandingWheelieFrontWheelEast,
sAnim_MovingWheelieSouth, [ANIM_MOVING_WHEELIE_SOUTH] = sAnim_MovingWheelieSouth,
sAnim_MovingWheelieNorth, [ANIM_MOVING_WHEELIE_NORTH] = sAnim_MovingWheelieNorth,
sAnim_MovingWheelieWest, [ANIM_MOVING_WHEELIE_WEST] = sAnim_MovingWheelieWest,
sAnim_MovingWheelieEast, [ANIM_MOVING_WHEELIE_EAST] = sAnim_MovingWheelieEast,
}; };
static const union AnimCmd *const sAnimTable_Surfing[] = { static const union AnimCmd *const sAnimTable_Surfing[] = {
sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
sAnim_FaceWest, [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
sAnim_FaceEast, [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
sAnim_GoSouth, [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
sAnim_GoNorth, [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
sAnim_GoWest, [ANIM_STD_GO_WEST] = sAnim_GoWest,
sAnim_GoEast, [ANIM_STD_GO_EAST] = sAnim_GoEast,
sAnim_GoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
sAnim_GoFastNorth, [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
sAnim_GoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
sAnim_GoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
sAnim_GoFasterNorth, [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
sAnim_GoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
sAnim_GoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
sAnim_GoFastestNorth, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
sAnim_GoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
sAnim_GetOnOffSurfBlobSouth, [ANIM_GET_ON_OFF_POKEMON_SOUTH] = sAnim_GetOnOffSurfBlobSouth,
sAnim_GetOnOffSurfBlobNorth, [ANIM_GET_ON_OFF_POKEMON_NORTH] = sAnim_GetOnOffSurfBlobNorth,
sAnim_GetOnOffSurfBlobWest, [ANIM_GET_ON_OFF_POKEMON_WEST] = sAnim_GetOnOffSurfBlobWest,
sAnim_GetOnOffSurfBlobEast, [ANIM_GET_ON_OFF_POKEMON_EAST] = sAnim_GetOnOffSurfBlobEast,
}; };
static const union AnimCmd *const sAnimTable_Nurse[] = { static const union AnimCmd *const sAnimTable_Nurse[] = {
sAnim_FaceSouth, [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
sAnim_FaceNorth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
sAnim_FaceWest, [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
sAnim_FaceEast, [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
sAnim_GoSouth, [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
sAnim_GoNorth, [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
sAnim_GoWest, [ANIM_STD_GO_WEST] = sAnim_GoWest,
sAnim_GoEast, [ANIM_STD_GO_EAST] = sAnim_GoEast,
sAnim_GoFastSouth, [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
sAnim_GoFastNorth, [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
sAnim_GoFastWest, [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
sAnim_GoFastEast, [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
sAnim_GoFasterSouth, [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
sAnim_GoFasterNorth, [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
sAnim_GoFasterWest, [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
sAnim_GoFasterEast, [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
sAnim_GoFastestSouth, [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
sAnim_GoFastestNorth, [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
sAnim_GoFastestWest, [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
sAnim_GoFastestEast, [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
sAnim_NurseBow, [ANIM_NURSE_BOW] = sAnim_NurseBow,
}; };
static const union AnimCmd *const sAnimTable_FieldMove[] = { static const union AnimCmd *const sAnimTable_FieldMove[] = {
sAnim_FieldMove, [ANIM_FIELD_MOVE] = sAnim_FieldMove,
}; };
static const union AnimCmd *const sAnimTable_BerryTree[] = { static const union AnimCmd *const sAnimTable_BerryTree[] = {
sAnim_BerryTreeStage0, [BERRY_STAGE_PLANTED - 1] = sAnim_BerryTreeStage0,
sAnim_BerryTreeStage1, [BERRY_STAGE_SPROUTED - 1] = sAnim_BerryTreeStage1,
sAnim_BerryTreeStage2, [BERRY_STAGE_TALLER - 1] = sAnim_BerryTreeStage2,
sAnim_BerryTreeStage3, [BERRY_STAGE_FLOWERING - 1] = sAnim_BerryTreeStage3,
sAnim_BerryTreeStage4, [BERRY_STAGE_BERRIES - 1] = sAnim_BerryTreeStage4,
}; };
static const union AnimCmd *const sAnimTable_BreakableRock[] = { static const union AnimCmd *const sAnimTable_BreakableRock[] = {
sAnim_StayStill, [ANIM_STAY_STILL] = sAnim_StayStill,
sAnim_RockBreak, [ANIM_REMOVE_OBSTACLE] = sAnim_RockBreak,
}; };
static const union AnimCmd *const sAnimTable_CuttableTree[] = { static const union AnimCmd *const sAnimTable_CuttableTree[] = {
sAnim_StayStill, [ANIM_STAY_STILL] = sAnim_StayStill,
sAnim_TreeCut, [ANIM_REMOVE_OBSTACLE] = sAnim_TreeCut,
}; };
static const union AnimCmd *const sAnimTable_Fishing[] = { static const union AnimCmd *const sAnimTable_Fishing[] = {
sAnim_TakeOutRodSouth, [ANIM_TAKE_OUT_ROD_SOUTH] = sAnim_TakeOutRodSouth,
sAnim_TakeOutRodNorth, [ANIM_TAKE_OUT_ROD_NORTH] = sAnim_TakeOutRodNorth,
sAnim_TakeOutRodWest, [ANIM_TAKE_OUT_ROD_WEST] = sAnim_TakeOutRodWest,
sAnim_TakeOutRodEast, [ANIM_TAKE_OUT_ROD_EAST] = sAnim_TakeOutRodEast,
sAnim_PutAwayRodSouth, [ANIM_PUT_AWAY_ROD_SOUTH] = sAnim_PutAwayRodSouth,
sAnim_PutAwayRodNorth, [ANIM_PUT_AWAY_ROD_NORTH] = sAnim_PutAwayRodNorth,
sAnim_PutAwayRodWest, [ANIM_PUT_AWAY_ROD_WEST] = sAnim_PutAwayRodWest,
sAnim_PutAwayRodEast, [ANIM_PUT_AWAY_ROD_EAST] = sAnim_PutAwayRodEast,
sAnim_HookedPokemonSouth, [ANIM_HOOKED_POKEMON_SOUTH] = sAnim_HookedPokemonSouth,
sAnim_HookedPokemonNorth, [ANIM_HOOKED_POKEMON_NORTH] = sAnim_HookedPokemonNorth,
sAnim_HookedPokemonWest, [ANIM_HOOKED_POKEMON_WEST] = sAnim_HookedPokemonWest,
sAnim_HookedPokemonEast, [ANIM_HOOKED_POKEMON_EAST] = sAnim_HookedPokemonEast,
}; };
static const union AffineAnimCmd *const sAffineAnimTable_KyogreGroudon[] = { static const union AffineAnimCmd *const sAffineAnimTable_KyogreGroudon[] = {

276
src/event_object_movement.c
View File

@ -703,169 +703,169 @@ static const s16 sMovementDelaysShort[] = {32, 48, 64, 80};
#include "data/object_events/movement_type_func_tables.h" #include "data/object_events/movement_type_func_tables.h"
static const u8 sFaceDirectionAnimNums[] = { static const u8 sFaceDirectionAnimNums[] = {
[DIR_NONE] = 0, [DIR_NONE] = ANIM_STD_FACE_SOUTH,
[DIR_SOUTH] = 0, [DIR_SOUTH] = ANIM_STD_FACE_SOUTH,
[DIR_NORTH] = 1, [DIR_NORTH] = ANIM_STD_FACE_NORTH,
[DIR_WEST] = 2, [DIR_WEST] = ANIM_STD_FACE_WEST,
[DIR_EAST] = 3, [DIR_EAST] = ANIM_STD_FACE_EAST,
[DIR_SOUTHWEST] = 0, [DIR_SOUTHWEST] = ANIM_STD_FACE_SOUTH,
[DIR_SOUTHEAST] = 0, [DIR_SOUTHEAST] = ANIM_STD_FACE_SOUTH,
[DIR_NORTHWEST] = 1, [DIR_NORTHWEST] = ANIM_STD_FACE_NORTH,
[DIR_NORTHEAST] = 1, [DIR_NORTHEAST] = ANIM_STD_FACE_NORTH,
}; };
static const u8 sMoveDirectionAnimNums[] = { static const u8 sMoveDirectionAnimNums[] = {
[DIR_NONE] = 4, [DIR_NONE] = ANIM_STD_GO_SOUTH,
[DIR_SOUTH] = 4, [DIR_SOUTH] = ANIM_STD_GO_SOUTH,
[DIR_NORTH] = 5, [DIR_NORTH] = ANIM_STD_GO_NORTH,
[DIR_WEST] = 6, [DIR_WEST] = ANIM_STD_GO_WEST,
[DIR_EAST] = 7, [DIR_EAST] = ANIM_STD_GO_EAST,
[DIR_SOUTHWEST] = 4, [DIR_SOUTHWEST] = ANIM_STD_GO_SOUTH,
[DIR_SOUTHEAST] = 4, [DIR_SOUTHEAST] = ANIM_STD_GO_SOUTH,
[DIR_NORTHWEST] = 5, [DIR_NORTHWEST] = ANIM_STD_GO_NORTH,
[DIR_NORTHEAST] = 5, [DIR_NORTHEAST] = ANIM_STD_GO_NORTH,
}; };
static const u8 sMoveDirectionFastAnimNums[] = { static const u8 sMoveDirectionFastAnimNums[] = {
[DIR_NONE] = 8, [DIR_NONE] = ANIM_STD_GO_FAST_SOUTH,
[DIR_SOUTH] = 8, [DIR_SOUTH] = ANIM_STD_GO_FAST_SOUTH,
[DIR_NORTH] = 9, [DIR_NORTH] = ANIM_STD_GO_FAST_NORTH,
[DIR_WEST] = 10, [DIR_WEST] = ANIM_STD_GO_FAST_WEST,
[DIR_EAST] = 11, [DIR_EAST] = ANIM_STD_GO_FAST_EAST,
[DIR_SOUTHWEST] = 8, [DIR_SOUTHWEST] = ANIM_STD_GO_FAST_SOUTH,
[DIR_SOUTHEAST] = 8, [DIR_SOUTHEAST] = ANIM_STD_GO_FAST_SOUTH,
[DIR_NORTHWEST] = 9, [DIR_NORTHWEST] = ANIM_STD_GO_FAST_NORTH,
[DIR_NORTHEAST] = 9, [DIR_NORTHEAST] = ANIM_STD_GO_FAST_NORTH,
}; };
static const u8 sMoveDirectionFasterAnimNums[] = { static const u8 sMoveDirectionFasterAnimNums[] = {
[DIR_NONE] = 12, [DIR_NONE] = ANIM_STD_GO_FASTER_SOUTH,
[DIR_SOUTH] = 12, [DIR_SOUTH] = ANIM_STD_GO_FASTER_SOUTH,
[DIR_NORTH] = 13, [DIR_NORTH] = ANIM_STD_GO_FASTER_NORTH,
[DIR_WEST] = 14, [DIR_WEST] = ANIM_STD_GO_FASTER_WEST,
[DIR_EAST] = 15, [DIR_EAST] = ANIM_STD_GO_FASTER_EAST,
[DIR_SOUTHWEST] = 12, [DIR_SOUTHWEST] = ANIM_STD_GO_FASTER_SOUTH,
[DIR_SOUTHEAST] = 12, [DIR_SOUTHEAST] = ANIM_STD_GO_FASTER_SOUTH,
[DIR_NORTHWEST] = 13, [DIR_NORTHWEST] = ANIM_STD_GO_FASTER_NORTH,
[DIR_NORTHEAST] = 13, [DIR_NORTHEAST] = ANIM_STD_GO_FASTER_NORTH,
}; };
static const u8 sMoveDirectionFastestAnimNums[] = { static const u8 sMoveDirectionFastestAnimNums[] = {
[DIR_NONE] = 16, [DIR_NONE] = ANIM_STD_GO_FASTEST_SOUTH,
[DIR_SOUTH] = 16, [DIR_SOUTH] = ANIM_STD_GO_FASTEST_SOUTH,
[DIR_NORTH] = 17, [DIR_NORTH] = ANIM_STD_GO_FASTEST_NORTH,
[DIR_WEST] = 18, [DIR_WEST] = ANIM_STD_GO_FASTEST_WEST,
[DIR_EAST] = 19, [DIR_EAST] = ANIM_STD_GO_FASTEST_EAST,
[DIR_SOUTHWEST] = 16, [DIR_SOUTHWEST] = ANIM_STD_GO_FASTEST_SOUTH,
[DIR_SOUTHEAST] = 16, [DIR_SOUTHEAST] = ANIM_STD_GO_FASTEST_SOUTH,
[DIR_NORTHWEST] = 17, [DIR_NORTHWEST] = ANIM_STD_GO_FASTEST_NORTH,
[DIR_NORTHEAST] = 17, [DIR_NORTHEAST] = ANIM_STD_GO_FASTEST_NORTH,
}; };
static const u8 sJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon static const u8 sJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon
[DIR_NONE] = 20, [DIR_NONE] = ANIM_GET_ON_OFF_POKEMON_SOUTH,
[DIR_SOUTH] = 20, [DIR_SOUTH] = ANIM_GET_ON_OFF_POKEMON_SOUTH,
[DIR_NORTH] = 21, [DIR_NORTH] = ANIM_GET_ON_OFF_POKEMON_NORTH,
[DIR_WEST] = 22, [DIR_WEST] = ANIM_GET_ON_OFF_POKEMON_WEST,
[DIR_EAST] = 23, [DIR_EAST] = ANIM_GET_ON_OFF_POKEMON_EAST,
[DIR_SOUTHWEST] = 20, [DIR_SOUTHWEST] = ANIM_GET_ON_OFF_POKEMON_SOUTH,
[DIR_SOUTHEAST] = 20, [DIR_SOUTHEAST] = ANIM_GET_ON_OFF_POKEMON_SOUTH,
[DIR_NORTHWEST] = 21, [DIR_NORTHWEST] = ANIM_GET_ON_OFF_POKEMON_NORTH,
[DIR_NORTHEAST] = 21, [DIR_NORTHEAST] = ANIM_GET_ON_OFF_POKEMON_NORTH,
}; };
static const u8 sAcroWheelieDirectionAnimNums[] = { static const u8 sAcroWheelieDirectionAnimNums[] = {
[DIR_NONE] = 20, [DIR_NONE] = ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH,
[DIR_SOUTH] = 20, [DIR_SOUTH] = ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH,
[DIR_NORTH] = 21, [DIR_NORTH] = ANIM_BUNNY_HOPPY_BACK_WHEEL_NORTH,
[DIR_WEST] = 22, [DIR_WEST] = ANIM_BUNNY_HOPPY_BACK_WHEEL_WEST,
[DIR_EAST] = 23, [DIR_EAST] = ANIM_BUNNY_HOPPY_BACK_WHEEL_EAST,
[DIR_SOUTHWEST] = 20, [DIR_SOUTHWEST] = ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH,
[DIR_SOUTHEAST] = 20, [DIR_SOUTHEAST] = ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH,
[DIR_NORTHWEST] = 21, [DIR_NORTHWEST] = ANIM_BUNNY_HOPPY_BACK_WHEEL_NORTH,
[DIR_NORTHEAST] = 21, [DIR_NORTHEAST] = ANIM_BUNNY_HOPPY_BACK_WHEEL_NORTH,
}; };
static const u8 sAcroUnusedDirectionAnimNums[] = { static const u8 sAcroUnusedDirectionAnimNums[] = {
[DIR_NONE] = 24, [DIR_NONE] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH,
[DIR_SOUTH] = 24, [DIR_SOUTH] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH,
[DIR_NORTH] = 25, [DIR_NORTH] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_NORTH,
[DIR_WEST] = 26, [DIR_WEST] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_WEST,
[DIR_EAST] = 27, [DIR_EAST] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_EAST,
[DIR_SOUTHWEST] = 24, [DIR_SOUTHWEST] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH,
[DIR_SOUTHEAST] = 24, [DIR_SOUTHEAST] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH,
[DIR_NORTHWEST] = 25, [DIR_NORTHWEST] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_NORTH,
[DIR_NORTHEAST] = 25, [DIR_NORTHEAST] = ANIM_BUNNY_HOPPY_FRONT_WHEEL_NORTH,
}; };
static const u8 sAcroEndWheelieDirectionAnimNums[] = { static const u8 sAcroEndWheelieDirectionAnimNums[] = {
[DIR_NONE] = 28, [DIR_NONE] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH,
[DIR_SOUTH] = 28, [DIR_SOUTH] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH,
[DIR_NORTH] = 29, [DIR_NORTH] = ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH,
[DIR_WEST] = 30, [DIR_WEST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST,
[DIR_EAST] = 31, [DIR_EAST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_EAST,
[DIR_SOUTHWEST] = 28, [DIR_SOUTHWEST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH,
[DIR_SOUTHEAST] = 28, [DIR_SOUTHEAST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH,
[DIR_NORTHWEST] = 29, [DIR_NORTHWEST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH,
[DIR_NORTHEAST] = 29, [DIR_NORTHEAST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH,
}; };
static const u8 sAcroUnusedActionDirectionAnimNums[] = { static const u8 sAcroUnusedActionDirectionAnimNums[] = {
[DIR_NONE] = 32, [DIR_NONE] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH,
[DIR_SOUTH] = 32, [DIR_SOUTH] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH,
[DIR_NORTH] = 33, [DIR_NORTH] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH,
[DIR_WEST] = 34, [DIR_WEST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_WEST,
[DIR_EAST] = 35, [DIR_EAST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_EAST,
[DIR_SOUTHWEST] = 32, [DIR_SOUTHWEST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH,
[DIR_SOUTHEAST] = 32, [DIR_SOUTHEAST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH,
[DIR_NORTHWEST] = 33, [DIR_NORTHWEST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH,
[DIR_NORTHEAST] = 33, [DIR_NORTHEAST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH,
}; };
static const u8 sAcroWheeliePedalDirectionAnimNums[] = { static const u8 sAcroWheeliePedalDirectionAnimNums[] = {
[DIR_NONE] = 36, [DIR_NONE] = ANIM_MOVING_WHEELIE_SOUTH,
[DIR_SOUTH] = 36, [DIR_SOUTH] = ANIM_MOVING_WHEELIE_SOUTH,
[DIR_NORTH] = 37, [DIR_NORTH] = ANIM_MOVING_WHEELIE_NORTH,
[DIR_WEST] = 38, [DIR_WEST] = ANIM_MOVING_WHEELIE_WEST,
[DIR_EAST] = 39, [DIR_EAST] = ANIM_MOVING_WHEELIE_EAST,
[DIR_SOUTHWEST] = 36, [DIR_SOUTHWEST] = ANIM_MOVING_WHEELIE_SOUTH,
[DIR_SOUTHEAST] = 36, [DIR_SOUTHEAST] = ANIM_MOVING_WHEELIE_SOUTH,
[DIR_NORTHWEST] = 37, [DIR_NORTHWEST] = ANIM_MOVING_WHEELIE_NORTH,
[DIR_NORTHEAST] = 37, [DIR_NORTHEAST] = ANIM_MOVING_WHEELIE_NORTH,
}; };
static const u8 sFishingDirectionAnimNums[] = { static const u8 sFishingDirectionAnimNums[] = {
[DIR_NONE] = 0, [DIR_NONE] = ANIM_TAKE_OUT_ROD_SOUTH,
[DIR_SOUTH] = 0, [DIR_SOUTH] = ANIM_TAKE_OUT_ROD_SOUTH,
[DIR_NORTH] = 1, [DIR_NORTH] = ANIM_TAKE_OUT_ROD_NORTH,
[DIR_WEST] = 2, [DIR_WEST] = ANIM_TAKE_OUT_ROD_WEST,
[DIR_EAST] = 3, [DIR_EAST] = ANIM_TAKE_OUT_ROD_EAST,
[DIR_SOUTHWEST] = 0, [DIR_SOUTHWEST] = ANIM_TAKE_OUT_ROD_SOUTH,
[DIR_SOUTHEAST] = 0, [DIR_SOUTHEAST] = ANIM_TAKE_OUT_ROD_SOUTH,
[DIR_NORTHWEST] = 1, [DIR_NORTHWEST] = ANIM_TAKE_OUT_ROD_NORTH,
[DIR_NORTHEAST] = 1, [DIR_NORTHEAST] = ANIM_TAKE_OUT_ROD_NORTH,
}; };
static const u8 sFishingNoCatchDirectionAnimNums[] = { static const u8 sFishingNoCatchDirectionAnimNums[] = {
[DIR_NONE] = 4, [DIR_NONE] = ANIM_PUT_AWAY_ROD_SOUTH,
[DIR_SOUTH] = 4, [DIR_SOUTH] = ANIM_PUT_AWAY_ROD_SOUTH,
[DIR_NORTH] = 5, [DIR_NORTH] = ANIM_PUT_AWAY_ROD_NORTH,
[DIR_WEST] = 6, [DIR_WEST] = ANIM_PUT_AWAY_ROD_WEST,
[DIR_EAST] = 7, [DIR_EAST] = ANIM_PUT_AWAY_ROD_EAST,
[DIR_SOUTHWEST] = 4, [DIR_SOUTHWEST] = ANIM_PUT_AWAY_ROD_SOUTH,
[DIR_SOUTHEAST] = 4, [DIR_SOUTHEAST] = ANIM_PUT_AWAY_ROD_SOUTH,
[DIR_NORTHWEST] = 5, [DIR_NORTHWEST] = ANIM_PUT_AWAY_ROD_NORTH,
[DIR_NORTHEAST] = 5, [DIR_NORTHEAST] = ANIM_PUT_AWAY_ROD_NORTH,
}; };
static const u8 sFishingBiteDirectionAnimNums[] = { static const u8 sFishingBiteDirectionAnimNums[] = {
[DIR_NONE] = 8, [DIR_NONE] = ANIM_HOOKED_POKEMON_SOUTH,
[DIR_SOUTH] = 8, [DIR_SOUTH] = ANIM_HOOKED_POKEMON_SOUTH,
[DIR_NORTH] = 9, [DIR_NORTH] = ANIM_HOOKED_POKEMON_NORTH,
[DIR_WEST] = 10, [DIR_WEST] = ANIM_HOOKED_POKEMON_WEST,
[DIR_EAST] = 11, [DIR_EAST] = ANIM_HOOKED_POKEMON_EAST,
[DIR_SOUTHWEST] = 8, [DIR_SOUTHWEST] = ANIM_HOOKED_POKEMON_SOUTH,
[DIR_SOUTHEAST] = 8, [DIR_SOUTHEAST] = ANIM_HOOKED_POKEMON_SOUTH,
[DIR_NORTHWEST] = 9, [DIR_NORTHWEST] = ANIM_HOOKED_POKEMON_NORTH,
[DIR_NORTHEAST] = 9, [DIR_NORTHEAST] = ANIM_HOOKED_POKEMON_NORTH,
}; };
static const u8 sRunningDirectionAnimNums[] = { static const u8 sRunningDirectionAnimNums[] = {
[DIR_NONE] = 20, [DIR_NONE] = ANIM_RUN_SOUTH,
[DIR_SOUTH] = 20, [DIR_SOUTH] = ANIM_RUN_SOUTH,
[DIR_NORTH] = 21, [DIR_NORTH] = ANIM_RUN_NORTH,
[DIR_WEST] = 22, [DIR_WEST] = ANIM_RUN_WEST,
[DIR_EAST] = 23, [DIR_EAST] = ANIM_RUN_EAST,
[DIR_SOUTHWEST] = 20, [DIR_SOUTHWEST] = ANIM_RUN_SOUTH,
[DIR_SOUTHEAST] = 20, [DIR_SOUTHEAST] = ANIM_RUN_SOUTH,
[DIR_NORTHWEST] = 21, [DIR_NORTHWEST] = ANIM_RUN_NORTH,
[DIR_NORTHEAST] = 21, [DIR_NORTHEAST] = ANIM_RUN_NORTH,
}; };
const u8 gTrainerFacingDirectionMovementTypes[] = { const u8 gTrainerFacingDirectionMovementTypes[] = {
@ -6492,7 +6492,7 @@ bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *objectEvent
bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, 0x14); StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, ANIM_NURSE_BOW);
return FALSE; return FALSE;
} }
@ -6591,7 +6591,7 @@ bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *objectEvent, struct
bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
SetAndStartSpriteAnim(sprite, 1, 0); SetAndStartSpriteAnim(sprite, ANIM_REMOVE_OBSTACLE, 0);
sprite->sActionFuncId = 1; sprite->sActionFuncId = 1;
return FALSE; return FALSE;
} }
@ -6619,7 +6619,7 @@ bool8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *objectEvent, struc
bool8 MovementAction_CutTree_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) bool8 MovementAction_CutTree_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
SetAndStartSpriteAnim(sprite, 1, 0); SetAndStartSpriteAnim(sprite, ANIM_REMOVE_OBSTACLE, 0);
sprite->sActionFuncId = 1; sprite->sActionFuncId = 1;
return FALSE; return FALSE;
} }

4
src/field_effect.c
View File

@ -3240,7 +3240,7 @@ static void FlyOutFieldEffect_JumpOnBird(struct Task *task)
{ {
struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
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);
if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING) if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
@ -3478,7 +3478,7 @@ static void FlyInFieldEffect_BirdSwoopDown(struct Task *task)
ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
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->tBirdSpriteId = CreateFlyBirdSprite(); task->tBirdSpriteId = CreateFlyBirdSprite();
StartFlyBirdSwoopDown(task->tBirdSpriteId); StartFlyBirdSwoopDown(task->tBirdSpriteId);

2
src/field_player_avatar.c
View File

@ -1403,7 +1403,7 @@ void SetPlayerInvisibility(bool8 invisible)
void SetPlayerAvatarFieldMove(void) void SetPlayerAvatarFieldMove(void)
{ {
ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE));
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], ANIM_FIELD_MOVE);
} }
static void SetPlayerAvatarFishing(u8 direction) static void SetPlayerAvatarFishing(u8 direction)