Fixes z-move priority (rh-hideout#3690)

* Fixes z-move priority * consider prankster affected z moves * consider only damaging moves
PCG06 · Dec 26, 2023 · f238fb7 · f238fb7
1 parent 75d68e9
commit f238fb7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/battle_main.c b/src/battle_main.c
@@ -4802,6 +4802,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;
 
     // Max Guard check