atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made follower emotes immune to time-blending.

Browse source
This commit is contained in:
Ariel Antonitis 2021-04-25 16:25:32 -04:00
parent e71c3dbd1b
commit be2c06d5a4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/event_object_movement.c
View file

@ -478,8 +478,8 @@ const u8 gInitialMovementTypeFacingDirections[] = {
#define OBJ_EVENT_PAL_TAG_RS_BRENDAN 0x1122 #define OBJ_EVENT_PAL_TAG_RS_BRENDAN 0x1122
#define OBJ_EVENT_PAL_TAG_RS_MAY 0x1123 #define OBJ_EVENT_PAL_TAG_RS_MAY 0x1123
#define OBJ_EVENT_PAL_TAG_DYNAMIC 0x1124 #define OBJ_EVENT_PAL_TAG_DYNAMIC 0x1124
#define OBJ_EVENT_PAL_TAG_EMOTES 0x1125
#define OBJ_EVENT_PAL_TAG_LIGHT 0x8001 #define OBJ_EVENT_PAL_TAG_LIGHT 0x8001
#define OBJ_EVENT_PAL_TAG_EMOTES 0x8002
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF #define OBJ_EVENT_PAL_TAG_NONE 0x11FF
#include "data/object_events/object_event_graphics_info_pointers.h" #include "data/object_events/object_event_graphics_info_pointers.h"

2
src/trainer_see.c
View file

@ -287,7 +287,7 @@ static const union AnimCmd *const sSpriteAnimTable_Emotes[] = {
// TODO: Move these declarations into even_object_movement.h // TODO: Move these declarations into even_object_movement.h
#define OBJ_EVENT_PAL_TAG_MAY 0x1110 #define OBJ_EVENT_PAL_TAG_MAY 0x1110
#define OBJ_EVENT_PAL_TAG_EMOTES 0x1125 #define OBJ_EVENT_PAL_TAG_EMOTES 0x8002
static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark = static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark =
{ {