CanTerastallize Adjustments #4440
Conversation
src/battle_terastal.c
Outdated
| @@ -47,10 +47,11 @@ bool32 CanTerastallize(u32 battler) | |||
| u32 holdEffect = GetBattlerHoldEffect(battler, FALSE); | |||
|
|
|||
| // Check if Player has Tera Orb and has charge. | |||
| if (B_FLAG_TERA_ORB_CHARGED != 0 | |||
| && (battler == B_POSITION_PLAYER_LEFT || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && battler == B_POSITION_PLAYER_RIGHT)) | |||
| if (!(B_FLAG_TERA_ORB_NO_COST != 0 && FlagGet(B_FLAG_TERA_ORB_NO_COST)) | |||
There was a problem hiding this comment.
Why is the check needed since the Tera Orb doesn't lose it's charge once B_FLAG_TERA_ORB_NO_COST is set?
There was a problem hiding this comment.
I originally left it out but decided I would add it in case a user sets the NO_COST flag but not the CHARGED flag so that the player wouldn't have to recharge it first, but I suppose on the flip side it makes it hard to disable Terastallization in case the user intentionally wants to remove the charge.
Currently standing by this, did some adjustments for readability (sort of) and tested here. The flags |
The default behavior on
upcomingallows for Terastallization from the get-go, which is hopefully the last slip-up as that wasn't intended behavior. The expansion user should be required to setB_FLAG_TERA_ORB_CHARGEDso that the player requires not just the Tera Orb item but a "charged" Tera Orb.