ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2446 from LOuroboros/primal

Browse Source 
Updated AnimTask_PrimalReversion
This commit is contained in:
ghoulslash 2023-01-04 09:16:28 -05:00 committed by GitHub
commit a425de77a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_anim_scripts.s
View File

@ -24949,7 +24949,7 @@ General_StrongWinds::
General_PrimalReversion:: General_PrimalReversion::
launchtask AnimTask_PrimalReversion 0x5 0x0 launchtask AnimTask_PrimalReversion 0x5 0x0
jumpargeq 0x0, ITEM_RED_ORB, General_PrimalReversion_Omega jumpargeq 0x0, ITEM_RED_ORB, General_PrimalReversion_Omega
jumpargeq 0x1, ITEM_BLUE_ORB, General_PrimalReversion_Alpha jumpargeq 0x0, ITEM_BLUE_ORB, General_PrimalReversion_Alpha
General_PrimalReversion_Alpha: General_PrimalReversion_Alpha:
loadspritegfx ANIM_TAG_ALPHA_STONE loadspritegfx ANIM_TAG_ALPHA_STONE
loadspritegfx ANIM_TAG_MEGA_PARTICLES loadspritegfx ANIM_TAG_MEGA_PARTICLES

2
src/battle_anim_new.c
View File

@ -7857,7 +7857,7 @@ static void SpriteCB_TwinkleOnBattler(struct Sprite *sprite)
void AnimTask_PrimalReversion(u8 taskId) void AnimTask_PrimalReversion(u8 taskId)
{ {
if (gBattleMons[gBattleAnimAttacker].item == ITEM_RED_ORB) if (gBattleMons[gBattleAnimAttacker].item == ITEM_RED_ORB || gBattleMons[gBattleAnimAttacker].item == ITEM_BLUE_ORB)
gBattleAnimArgs[0] = gBattleMons[gBattleAnimAttacker].item; gBattleAnimArgs[0] = gBattleMons[gBattleAnimAttacker].item;
else else
gBattleAnimArgs[0] = 0; gBattleAnimArgs[0] = 0;