Fixes z-move priority (#3690)

* Fixes z-move priority * consider prankster affected z moves * consider only damaging moves
rh-hideout · Dec 11, 2023 · 22280b4 · 22280b4
1 parent 403843c
commit 22280b4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/battle_main.c b/src/battle_main.c
@@ -4691,6 +4691,9 @@ s8 GetMovePriority(u32 battler, u16 move)
     s8 priority;
     u16 ability = GetBattlerAbility(battler);
 
+    if (gBattleStruct->zmove.toBeUsed[battler] && gBattleMoves[move].power != 0)
+        move = gBattleStruct->zmove.toBeUsed[battler];
+
     priority = gBattleMoves[move].priority;
     if (ability == ABILITY_GALE_WINGS
     #if B_GALE_WINGS >= GEN_7