Added new conditions for the trainer slide-in system #2713
Conversation
Now they can say something: -When their last Pokémon's HP is between 25% and 50%. -When a critical hit is dealt to their first Pokémon for the first time. -When a super effective hit is dealt to their first Pokémon for the first time. -When a STAB move is used against (but doesn't faint) the opponent's Pokémon. -When the Player's Pokémon's move doesn't affect the opponent's Pokémon. -When they're about to trigger a Mega Evolution. -When they're about to trigger a Z-Move. Misc. changes: -Split GetEnemyMonCount for readability's sake. -Optimized the size allocated to trainerSlideLowHpMsgDone.
…expansion into trainerSlideMsgUpdate
|
Please fix conflicts :D |
…expansion into trainerSlideMsgUpdate
Done. I also fixed the order of the |
…expansion into trainerSlideMsgUpdate
Done. Needs testing due to the extra changes from #2699 that got in the way of the changes I made in this PR. If no one tests things, I'll do it myself once I wake up later. |
LOuroboros
force-pushed
the
trainerSlideMsgUpdate
branch
from
9fece3c
to
8a036e6
Compare
|
Checking some Scarlet/Violet videos I saw that they have a trainer message just as they send their first Pokémon. Do you plan to add those too? |
I'll look into it. |
|
Done. |
|
I recorded a .gif because why not, which I forgot to drop because I'm dumb.
|
Now a trainer NPC can also say something before the first turn of a battle starts for good.
LOuroboros
force-pushed
the
trainerSlideMsgUpdate
branch
from
734ad22
to
ff15856
Compare
…expansion into trainerSlideMsgUpdate
include/battle.h
Outdated
| @@ -622,7 +622,7 @@ struct BattleStruct | |||
| struct MegaEvolutionData mega; | |||
| struct ZMoveData zmove; | |||
| const u8 *trainerSlideMsg; | |||
| bool8 trainerSlideLowHpMsgDone; | |||
| bool8 trainerSlideLowHpMsgDone:1; | |||
There was a problem hiding this comment.
u8 trainerSlideLowHpMsgDone:1;
it also still takes up a byte currently, unless its combined with other bit-field field definitions.
There was a problem hiding this comment.
Why is that, and what do you suggest me to do? 👀
There was a problem hiding this comment.
because of struct alignment. you can't align the next field in the middle of a byte, so it will fill in the remaining 7 bits with padding. you can move the field to another bit-field area. If you don't care about saying the space then its fine as is. I just made this comment in the event you were trying to save the 7 bits
There was a problem hiding this comment.
I was. In this situation, I rather remove the bit allocation and keep the variable a bool8 than to use the u8 data type for what's a bool variable honestly. I'll do that, if you don't mind.
include/battle.h
Outdated
| @@ -663,6 +663,14 @@ struct BattleStruct | |||
| u8 storedHealingWish:4; // Each battler as a bit. | |||
| u8 storedLunarDance:4; // Each battler as a bit. | |||
| u16 supremeOverlordModifier[MAX_BATTLERS_COUNT]; | |||
| bool8 trainerSlideHalfHpMsgDone:1; | |||
There was a problem hiding this comment.
u8 trainerSlideHalfHpMsgDone:1;
There was a problem hiding this comment.
Why? It's only used as a bool.
There was a problem hiding this comment.
to be explicit that its sharing the byte with the fields below
There was a problem hiding this comment.
Is it though? The 4 variables below conform a byte on their own, don't they?
Also, a few lines above there's hitSwitchTargetFailed, also a bool8 variable that is allocated a size of 1 bit.
include/battle.h
Outdated
| u8 trainerSlideFirstSuperEffectiveHitMsgState:2; | ||
| u8 trainerSlideFirstSTABMoveMsgState:2; | ||
| u8 trainerSlidePlayerMonUnaffectedMsgState:2; | ||
| bool8 trainerSlideMegaEvolutionMsgDone:1; |
src/battle_message.c
Outdated
| else | ||
| return FALSE; | ||
| } | ||
|
|
||
| u32 ShouldDoTrainerSlide(u32 battlerId, u32 which) | ||
| { |
There was a problem hiding this comment.
can we clean up some of the code below by calling frequently-used functions e.g. GetEnemyMonCount(firstId, lastId, TRUE) , or initializing variables like currHp, maxHp for the hp threshold checks?
There was a problem hiding this comment.
GetEnemyMonCount is already called.
As for the thresholds, I suppose I could, yeah. I'll see what I can come up with.
There was a problem hiding this comment.
Check up my ping in the Discord server later. I need your opinion on a function that I wrote in an attempt to make those maxHp checks more readable.
| @@ -11176,6 +11178,39 @@ static void Cmd_various(void) | |||
| gBattlescriptCurrInstr = cmd->nextInstr; | |||
| return; | |||
| } | |||
| case VARIOUS_JUMP_IF_SHELL_TRAP: | |||
There was a problem hiding this comment.
why is this included here?
There was a problem hiding this comment.
Because I moved it from its original position.
It was written above VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES, even though it's defined below VARIOUS_HIT_SWITCH_TARGET_FAILED, so I moved it below the case VARIOUS_HIT_SWITCH_TARGET_FAILED in Cmd_various to keep consistency.
…expansion into trainerSlideMsgUpdate
|
Ready for re-review 👀 |
Description
Addresses something brought up in #1655; missing conditionals that are present in the official games.
The new conditions on which a trainer NPC is now allowed to say something are as follows:
-When their last Pokémon's HP is between 25% and 50%.
-When a critical hit is dealt to their first Pokémon for the first time.
-When a super effective hit is dealt to their first Pokémon for the first time.
-When a STAB move is used against (but doesn't faint) the opponent's Pokémon.
-When the Player's Pokémon's move doesn't affect the opponent's Pokémon.
Additionally, I added 2 conditions that are not present in the official games (as far as I remember anyway.)
-When they're about to trigger a Mega Evolution.
-When they're about to trigger a Z-Move.
These 2 are extrapolated from the fact that Dynamax/Gigantamax does have a slide-in message in the game where that gimmick is used.
If that one has slide-in messages, why should Megas or Z-Moves not have one too?
Discord contact info
Lunos#4026