From be2c06d5a4b566284b5f9a890c68fa62cd5b0b23 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sun, 25 Apr 2021 16:25:32 -0400 Subject: [PATCH] Made follower emotes immune to time-blending. --- src/event_object_movement.c | 2 +- src/trainer_see.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 32adfdcb90..fc99a172aa 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -478,8 +478,8 @@ const u8 gInitialMovementTypeFacingDirections[] = { #define OBJ_EVENT_PAL_TAG_RS_BRENDAN 0x1122 #define OBJ_EVENT_PAL_TAG_RS_MAY 0x1123 #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_EMOTES 0x8002 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF #include "data/object_events/object_event_graphics_info_pointers.h" diff --git a/src/trainer_see.c b/src/trainer_see.c index eb0cef4734..d21cce747f 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -287,7 +287,7 @@ static const union AnimCmd *const sSpriteAnimTable_Emotes[] = { // TODO: Move these declarations into even_object_movement.h #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 = {