ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

new z move indicator, credits to blackforest

Browse Source
This commit is contained in:
ghoulslash 2022-07-18 09:21:59 -04:00
parent f6b6ab56be
commit 18affe8c1a
3 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphics/battle_interface/z_move_trigger.pal
View File

@ -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

BIN
graphics/battle_interface/z_move_trigger.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 255 B

23
src/battle_z_move.c
View File

@ -253,15 +253,15 @@ bool32 TryChangeZIndicator(u8 battlerId, u8 moveIndex)
ShowZMoveTriggerSprite(); // Was not a viable z move, now is -> slide back in 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_OPTIMAL (29)
#define SINGLES_Z_TRIGGER_POS_X_PRIORITY (31) #define SINGLES_Z_TRIGGER_POS_X_PRIORITY (29)
#define SINGLES_Z_TRIGGER_POS_X_SLIDE (15) #define SINGLES_Z_TRIGGER_POS_X_SLIDE (15)
#define SINGLES_Z_TRIGGER_POS_Y_DIFF (-11) #define SINGLES_Z_TRIGGER_POS_Y_DIFF (-11)
#define DOUBLES_Z_TRIGGER_POS_X_OPTIMAL (30) #define DOUBLES_Z_TRIGGER_POS_X_OPTIMAL SINGLES_Z_TRIGGER_POS_X_OPTIMAL
#define DOUBLES_Z_TRIGGER_POS_X_PRIORITY (31) #define DOUBLES_Z_TRIGGER_POS_X_PRIORITY SINGLES_Z_TRIGGER_POS_X_PRIORITY
#define DOUBLES_Z_TRIGGER_POS_X_SLIDE (15) #define DOUBLES_Z_TRIGGER_POS_X_SLIDE SINGLES_Z_TRIGGER_POS_X_SLIDE
#define DOUBLES_Z_TRIGGER_POS_Y_DIFF (-4) #define DOUBLES_Z_TRIGGER_POS_Y_DIFF (-4)
#define tBattler data[0] #define tBattler data[0]
#define tHide data[1] #define tHide data[1]
@ -330,13 +330,14 @@ static void SpriteCB_ZMoveTrigger(struct Sprite *sprite)
else else
{ {
if (sprite->x != gSprites[gHealthboxSpriteIds[sprite->tBattler]].x - xOptimal) if (sprite->x != gSprites[gHealthboxSpriteIds[sprite->tBattler]].x - xOptimal)
{
sprite->x--; sprite->x--;
if (sprite->x >= gSprites[gHealthboxSpriteIds[sprite->tBattler]].x - xPriority)
sprite->oam.priority = 2; sprite->oam.priority = 2;
}
else else
{
sprite->oam.priority = 1; sprite->oam.priority = 1;
}
sprite->y = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y - yDiff; sprite->y = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y - yDiff;
sprite->y2 = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y2 - yDiff; sprite->y2 = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y2 - yDiff;
} }