diff --git a/graphics/battle_interface/z_move_trigger.pal b/graphics/battle_interface/z_move_trigger.pal deleted file mode 100644 index 2672d1f10a..0000000000 --- a/graphics/battle_interface/z_move_trigger.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -185 207 163 -77 105 97 -199 159 199 -221 177 207 -57 151 117 -139 221 253 -247 161 133 -255 255 255 -153 87 67 -233 233 125 -129 255 223 -149 147 247 -195 207 201 -123 151 135 -0 0 0 -0 0 0 diff --git a/graphics/battle_interface/z_move_trigger.png b/graphics/battle_interface/z_move_trigger.png index 9a9c5d937a..1b2b30a127 100644 Binary files a/graphics/battle_interface/z_move_trigger.png and b/graphics/battle_interface/z_move_trigger.png differ diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 939418434f..8276dd3f38 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -253,15 +253,15 @@ bool32 TryChangeZIndicator(u8 battlerId, u8 moveIndex) ShowZMoveTriggerSprite(); // Was not a viable z move, now is -> slide back in } -#define SINGLES_Z_TRIGGER_POS_X_OPTIMAL (30) -#define SINGLES_Z_TRIGGER_POS_X_PRIORITY (31) -#define SINGLES_Z_TRIGGER_POS_X_SLIDE (15) -#define SINGLES_Z_TRIGGER_POS_Y_DIFF (-11) +#define SINGLES_Z_TRIGGER_POS_X_OPTIMAL (29) +#define SINGLES_Z_TRIGGER_POS_X_PRIORITY (29) +#define SINGLES_Z_TRIGGER_POS_X_SLIDE (15) +#define SINGLES_Z_TRIGGER_POS_Y_DIFF (-11) -#define DOUBLES_Z_TRIGGER_POS_X_OPTIMAL (30) -#define DOUBLES_Z_TRIGGER_POS_X_PRIORITY (31) -#define DOUBLES_Z_TRIGGER_POS_X_SLIDE (15) -#define DOUBLES_Z_TRIGGER_POS_Y_DIFF (-4) +#define DOUBLES_Z_TRIGGER_POS_X_OPTIMAL SINGLES_Z_TRIGGER_POS_X_OPTIMAL +#define DOUBLES_Z_TRIGGER_POS_X_PRIORITY SINGLES_Z_TRIGGER_POS_X_PRIORITY +#define DOUBLES_Z_TRIGGER_POS_X_SLIDE SINGLES_Z_TRIGGER_POS_X_SLIDE +#define DOUBLES_Z_TRIGGER_POS_Y_DIFF (-4) #define tBattler data[0] #define tHide data[1] @@ -330,13 +330,14 @@ static void SpriteCB_ZMoveTrigger(struct Sprite *sprite) else { if (sprite->x != gSprites[gHealthboxSpriteIds[sprite->tBattler]].x - xOptimal) + { sprite->x--; - - if (sprite->x >= gSprites[gHealthboxSpriteIds[sprite->tBattler]].x - xPriority) sprite->oam.priority = 2; + } else + { sprite->oam.priority = 1; - + } sprite->y = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y - yDiff; sprite->y2 = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y2 - yDiff; }