Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-09 04:13:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 9e5298ec7a into a3c551fe21

Browse Source
This commit is contained in:
SiliconA-Z 2026-04-24 10:23:52 +09:00 committed by GitHub
commit 12e4cb96a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/battle_anim_scripts.s
View File

@ -3318,8 +3318,14 @@ Move_MILK_DRINK:
Move_MAGNITUDE:
createvisualtask AnimTask_IsPowerOver99, 2
waitforvisualfinish
.ifdef UBFIX
jumpreteq FALSE, MagnitudeRegular
jumpreteq TRUE, MagnitudeIntense
.else
jumpargeq 15, FALSE, MagnitudeRegular
jumpargeq 15, TRUE, MagnitudeIntense
.endif
MagnitudeEnd:
end
MagnitudeRegular:

21
src/battle_anim_ground.c
View File

@ -299,7 +299,6 @@ void AnimTask_DigDownMovement(u8 taskId)
static void AnimTask_DigBounceMovement(u8 taskId)
{
u8 y;
struct Task *task = &gTasks[taskId];
switch (task->data[0])
@ -318,9 +317,8 @@ static void AnimTask_DigBounceMovement(u8 taskId)
task->data[13] = gBattle_BG2_Y;
}
y = GetBattlerYCoordWithElevation(gBattleAnimAttacker);
task->data[14] = y - 32;
task->data[15] = y + 32;
task->data[14] = GetBattlerYCoordWithElevation(gBattleAnimAttacker) - 32;
task->data[15] = task->data[14] + 64;
if (task->data[14] < 0)
task->data[14] = 0;
@ -428,9 +426,8 @@ static void AnimTask_DigRiseUpFromHole(u8 taskId)
else
task->data[12] = gBattle_BG2_X;
var0 = GetBattlerYCoordWithElevation(gBattleAnimAttacker);
task->data[14] = var0 - 32;
task->data[15] = var0 + 32;
task->data[14] = GetBattlerYCoordWithElevation(gBattleAnimAttacker) - 32;
task->data[15] = task->data[14] + 64;
task->data[0]++;
break;
case 1:
@ -503,7 +500,7 @@ static void SetDigScanlineEffect(u8 useBG1, s16 y, s16 endY)
// arg 5: duration
void AnimDirtPlumeParticle(struct Sprite *sprite)
{
s8 battler;
u16 battler; // Should be u8.
s16 xOffset;
if (gBattleAnimArgs[0] == 0)
@ -542,7 +539,7 @@ static void AnimDirtPlumeParticle_Step(struct Sprite *sprite)
// arg 2: duration
static void AnimDigDirtMound(struct Sprite *sprite)
{
s8 battler;
u8 battler;
if (gBattleAnimArgs[0] == 0)
battler = gBattleAnimAttacker;
@ -708,7 +705,7 @@ static void AnimTask_ShakeBattlers(u8 taskId)
static void SetBattlersXOffsetForShake(struct Task *task)
{
u16 i;
u16 xOffset;
s16 xOffset;
if ((task->tTimer & 1) == 0)
xOffset = (task->tHorizOffset / 2) + (task->tHorizOffset & 1);
@ -733,7 +730,11 @@ static void SetBattlersXOffsetForShake(struct Task *task)
void AnimTask_IsPowerOver99(u8 taskId)
{
#ifdef UBFIX
gBattleAnimArgs[7] = gAnimMovePower > 99;
#else
gBattleAnimArgs[15] = gAnimMovePower > 99;
#endif
DestroyAnimVisualTask(taskId);
}