Made Reflect Type handle 3rd types #3303
Conversation
|
I just realized that this was only checking for the base forms of Arceus and Silvally, so I took the chance to update that as well. |
|
Solved the conflicts. I was waiting for #3258 to be merged so I could make the new ``BS_TryReflectType use GetBattlerType, but that PR went to Master, so I guess this is ready for review. |
Now in upcoming. |
Got it. Will update this then 👍 |
|
Thinking about it, since this is a bugfix, this should go to master. |
Rather than fixing any bugs, it's completing an incomplete implementation, but alright, I'll rebase to Master. |
Misc: -Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType) -Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle. -Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
|
Done. This PR is now targeting the Master branch. I'm not willing to write tests myself though. |
Done. |
Description
Closes #3266.
This PR updates Reflect Type's effect to handle 3rd types, including an edge case in which the target of Reflect Type may have lost its first 2 types, but acquired a 3rd one.
Misc. Changes:
-Turned the
VARIOUS_TRY_REFLECT_TYPEinto a callnative battle script.-Introduced a macro
IS_BATTLER_TYPELESSthat checks if the specified battler has no valid type (or in other words, that checks if its 3 types are set toTYPE_MYSTERY.)Discord contact info
lunos4026