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

Remove constants/movement_commands.h

Browse Source
This commit is contained in:
PikalaxALT
2020-02-21 15:46:19 -05:00
parent 2ed0c4b180
commit 540c33405a
3 changed files with 37 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/event_object_movement.h
+17 -6
View File
@@ -88,7 +88,14 @@
#define MOVEMENT_ACTION_FACE_UP 0x1
#define MOVEMENT_ACTION_FACE_LEFT 0x2
#define MOVEMENT_ACTION_FACE_RIGHT 0x3
// Something else here maybe? idk
#define MOVEMENT_ACTION_FACE_DOWN_FAST 0x4
#define MOVEMENT_ACTION_FACE_UP_FAST 0x5
#define MOVEMENT_ACTION_FACE_LEFT_FAST 0x6
#define MOVEMENT_ACTION_FACE_RIGHT_FAST 0x7
#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x8
#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9
#define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0xA
#define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0xB
#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0xC
#define MOVEMENT_ACTION_WALK_SLOW_UP 0xD
#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0xE
@@ -126,10 +133,10 @@
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x2E
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x2F
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x30
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x31
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x32
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x33
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x34
#define MOVEMENT_ACTION_FASE_DOWN_SLOW 0x31
#define MOVEMENT_ACTION_FASE_UP_SLOW 0x32
#define MOVEMENT_ACTION_FASE_LEFT_SLOW 0x33
#define MOVEMENT_ACTION_FASE_RIGHT_SLOW 0x34
#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x35
#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x36
#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x37
@@ -142,7 +149,11 @@
#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x3E
#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x3F
#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x40
#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x41
#define MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW 0x41
#define MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW 0x42
#define MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW 0x43
#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW 0x44
#define MOVEMENT_ACTION_UNKNOWN_STEP_45 0x45
#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x46
#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x47
#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x48
include/constants/movement_commands.h
-121
View File
@@ -1,121 +0,0 @@
#ifndef GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
#define GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
enum
{
face_down,
face_up,
face_left,
face_right,
face_down_fast,
face_up_fast,
face_left_fast,
face_right_fast,
walk_slowest_down,
walk_slowest_up,
walk_slowest_left,
walk_slowest_right,
walk_slow_down,
walk_slow_up,
walk_slow_left,
walk_slow_right,
walk_down,
walk_up,
walk_left,
walk_right,
jump_2_down,
jump_2_up,
jump_2_left,
jump_2_right,
delay_1,
delay_2,
delay_4,
delay_8,
delay_16,
walk_fast_down,
walk_fast_up,
walk_fast_left,
walk_fast_right,
walk_in_place_slow_down,
walk_in_place_slow_up,
walk_in_place_slow_left,
walk_in_place_slow_right,
walk_in_place_down,
walk_in_place_up,
walk_in_place_left,
walk_in_place_right,
walk_in_place_fast_down,
walk_in_place_fast_up,
walk_in_place_fast_left,
walk_in_place_fast_right,
walk_in_place_fastest_down,
walk_in_place_fastest_up,
walk_in_place_fastest_left,
walk_in_place_fastest_right,
face_down_slow,
face_up_slow,
face_left_slow,
face_right_slow,
walk_fastest_down,
walk_fastest_up,
walk_fastest_left,
walk_fastest_right,
slide_down,
slide_up,
slide_left,
slide_right,
player_run_down,
player_run_up,
player_run_left,
player_run_right,
player_run_down_slow,
player_run_up_slow,
player_run_left_slow,
player_run_right_slow,
step_45,
jump_down_run,
jump_up_run,
jump_left_run,
jump_right_run,
face_player,
face_away_player,
lock_facing_direction,
unlock_facing_direction,
jump_down,
jump_up,
jump_left,
jump_right,
jump_in_place_down,
jump_in_place_up,
jump_in_place_left,
jump_in_place_right,
jump_in_place_down_up,
jump_in_place_up_down,
jump_in_place_left_right,
jump_in_place_right_left,
face_original_direction,
nurse_joy_bow,
enable_jump_landing_ground_effect,
disable_jump_landing_ground_effect,
disable_anim,
restore_anim,
set_invisible,
set_visible,
emote_exclamation_mark,
emote_question_mark,
emote_x,
emote_double_exclamation_mark,
emote_smile,
step_67,
rock_smash_break,
cut_tree,
step_91 = 0x91,
step_92,
step_96 = 0x96,
step_end = 0xfe,
};
#endif //GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
src/vs_seeker.c
+20 -14
View File
@@ -21,7 +21,7 @@
#include "field_player_avatar.h"
#include "event_object_8097404.h"
#include "vs_seeker.h"
#include "constants/movement_commands.h"
#include "constants/event_object_movement.h"
#include "constants/object_events.h"
#include "constants/trainers.h"
#include "constants/maps.h"
@@ -545,29 +545,35 @@ static const VsSeekerData sVsSeekerData[] = {
};
static const u8 gUnknown_8453F5C[] = {
delay_16,
delay_16,
delay_16,
step_end
MOVEMENT_ACTION_DELAY_16,
MOVEMENT_ACTION_DELAY_16,
MOVEMENT_ACTION_DELAY_16,
MOVEMENT_ACTION_STEP_END
};
static const u8 gUnknown_8453F60[] = {
emote_exclamation_mark,
step_end
MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK,
MOVEMENT_ACTION_STEP_END
};
static const u8 sMovementScript_TrainerNoRematch[] = {
emote_x,
step_end
MOVEMENT_ACTION_EMOTE_X,
MOVEMENT_ACTION_STEP_END
};
static const u8 sMovementScript_TrainerRematch[] = {
walk_in_place_fastest_down,
emote_double_exclamation_mark,
step_end
MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK,
MOVEMENT_ACTION_STEP_END
};
static const u8 gUnknown_8453F67[] = { 0x08, 0x08, 0x07, 0x09, 0x0a };
static const u8 gUnknown_8453F67[] = {
MOVEMENT_TYPE_FACE_DOWN,
MOVEMENT_TYPE_FACE_DOWN,
MOVEMENT_TYPE_FACE_UP,
MOVEMENT_TYPE_FACE_LEFT,
MOVEMENT_TYPE_FACE_RIGHT
};
// text
@@ -954,7 +960,7 @@ void sub_810CB90(void)
if (gSelectedObjectEvent == sp0)
r4_2->animPattern = gUnknown_8453F67[r4_2->facingDirection];
else
r4_2->animPattern = 0x08;
r4_2->animPattern = MOVEMENT_TYPE_FACE_DOWN;
}
}
}