dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Label some animation index numbers

Browse Source
This commit is contained in:
cbt6
2021-10-30 01:37:49 +08:00
parent c793949f46
commit 9a1764f83e
6 changed files with 452 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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