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

Merge pull request #1270 from LOuroboros/drives_and_types

Browse Source 
Made Techno Blast's animation change depending on the Drive held
This commit is contained in:
Eduardo Quezada D'Ottone 2020-12-12 21:43:45 -03:00 committed by GitHub
commit ea1dca3024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_anim_new.c
View File

@ -14,6 +14,7 @@
#include "battle_scripts.h" #include "battle_scripts.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/hold_effects.h"
//// function declarations //// function declarations
static void SpriteCB_SpriteToCentreOfSide(struct Sprite* sprite); static void SpriteCB_SpriteToCentreOfSide(struct Sprite* sprite);
@ -5001,8 +5002,9 @@ void AnimTask_PurpleFlamesOnTarget(u8 taskId)
void AnimTask_TechnoBlast(u8 taskId) void AnimTask_TechnoBlast(u8 taskId)
{ {
//gBattleAnimArgs[0] = gItems[GetBattlerPartyData(gBattleAnimAttacker).item].holdEffectParam; if (ItemId_GetHoldEffect(gBattleMons[gBattleAnimAttacker].item) == HOLD_EFFECT_DRIVE)
gBattleAnimArgs[0] = ItemId_GetHoldEffectParam(gBattleMons[gBattleAnimAttacker].item); gBattleAnimArgs[0] = ItemId_GetSecondaryId(gBattleMons[gBattleAnimAttacker].item);
else
gBattleAnimArgs[0] = 0;
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }