From e2d47a07f5281ac1d6a78942ae1416bdbd152aaf Mon Sep 17 00:00:00 2001 From: Jaizu Date: Thu, 29 Dec 2022 12:28:44 +0100 Subject: [PATCH 1/2] Fix ANIM_SPRITE on regular builds with BUGFIX. Dicussion about this being a BUGFIX define instead limiting it only to modern. Credit SBird. --- src/pokemon_animation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 9a95edf4b3..a305851aa7 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -901,7 +901,7 @@ u8 GetSpeciesBackAnimSet(u16 species) // as 0xFFFFXXXX instead of the desired 0x02YYXXXX. // By dumb luck, this is not an issue in vanilla. However, // changing the link order revealed this bug. -#if MODERN +#ifdef BUGFIX #define ANIM_SPRITE(taskId) ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | ((u16)gTasks[taskId].tPtrLo))) #else #define ANIM_SPRITE(taskId) ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | (gTasks[taskId].tPtrLo))) From c40c7e7e6591a97814d1a5831faa4d09a8d0984d Mon Sep 17 00:00:00 2001 From: Jaizu Date: Thu, 29 Dec 2022 16:11:17 +0100 Subject: [PATCH 2/2] Fix breaking modern, correct labels. --- src/pokemon_animation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index a305851aa7..baeb70578f 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -901,11 +901,11 @@ u8 GetSpeciesBackAnimSet(u16 species) // as 0xFFFFXXXX instead of the desired 0x02YYXXXX. // By dumb luck, this is not an issue in vanilla. However, // changing the link order revealed this bug. -#ifdef BUGFIX +#if MODERN || defined(BUGFIX) #define ANIM_SPRITE(taskId) ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | ((u16)gTasks[taskId].tPtrLo))) #else #define ANIM_SPRITE(taskId) ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | (gTasks[taskId].tPtrLo))) -#endif //MODERN +#endif //MODERN || BUGFIX static void Task_HandleMonAnimation(u8 taskId) {