Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old slide workaround (#6754)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-05-03 10:54:49 +02:00 committed by GitHub
parent 9259b7ee69
commit fe2d7442af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/battle_scripts_2.s
View File

@ -265,13 +265,12 @@ BattleScript_ActionWallyThrow:
end2
BattleScript_TrainerASlideMsgRet::
handletrainerslidemsg BS_SCRIPTING, 0
trainerslidein BS_OPPONENT1
handletrainerslidemsg BS_SCRIPTING, 1
handletrainerslidemsg BS_SCRIPTING, PRINT_SLIDE_MESSAGE
waitstate
trainerslideout BS_OPPONENT1
waitstate
handletrainerslidemsg BS_SCRIPTING, 2
handletrainerslidemsg BS_SCRIPTING, RESTORE_BATTLER_SLIDE_CONTROL
return
BattleScript_TrainerASlideMsgEnd2::
@ -279,13 +278,12 @@ BattleScript_TrainerASlideMsgEnd2::
end2
BattleScript_TrainerBSlideMsgRet::
handletrainerslidemsg BS_SCRIPTING, 0
trainerslidein BS_OPPONENT2
handletrainerslidemsg BS_SCRIPTING, 1
handletrainerslidemsg BS_SCRIPTING, PRINT_SLIDE_MESSAGE
waitstate
trainerslideout BS_OPPONENT2
waitstate
handletrainerslidemsg BS_SCRIPTING, 2
handletrainerslidemsg BS_SCRIPTING, RESTORE_BATTLER_SLIDE_CONTROL
return
BattleScript_TrainerBSlideMsgEnd2::

1
include/battle.h
View File

@ -825,7 +825,6 @@ struct BattleStruct
u8 usedMicleBerry;
struct MessageStatus slideMessageStatus;
u8 trainerSlideSpriteIds[MAX_BATTLERS_COUNT];
u8 storeBattlerSpriteId;
u16 opponentMonCanTera:6;
u16 opponentMonCanDynamax:6;
u16 padding:4;

6
include/constants/battle.h
View File

@ -605,4 +605,10 @@ enum StartingStatus
STARTING_STATUS_SWAMP_OPPONENT,
};
enum SlideMsgStates
{
PRINT_SLIDE_MESSAGE,
RESTORE_BATTLER_SLIDE_CONTROL,
};
#endif // GUARD_CONSTANTS_BATTLE_H

11
src/battle_script_commands.c
View File

@ -11128,20 +11128,13 @@ static void Cmd_various(void)
case VARIOUS_HANDLE_TRAINER_SLIDE_MSG:
{
VARIOUS_ARGS(u8 case_);
if (cmd->case_ == 0)
{
// Save sprite IDs, because trainer slide in will overwrite gBattlerSpriteIds variable.
gBattleStruct->storeBattlerSpriteId = (gBattlerSpriteIds[battler] & 0xFF) | (gBattlerSpriteIds[BATTLE_PARTNER(battler)] << 8);
}
else if (cmd->case_ == 1)
if (cmd->case_ == PRINT_SLIDE_MESSAGE)
{
BtlController_EmitPrintString(battler, BUFFER_A, STRINGID_TRAINERSLIDE);
MarkBattlerForControllerExec(battler);
}
else
else if (cmd->case_ == RESTORE_BATTLER_SLIDE_CONTROL)
{
gBattlerSpriteIds[BATTLE_PARTNER(battler)] = gBattleStruct->storeBattlerSpriteId >> 8;
gBattlerSpriteIds[battler] = gBattleStruct->storeBattlerSpriteId & 0xFF;
if (IsBattlerAlive(battler))
{
SetBattlerShadowSpriteCallback(battler, gBattleMons[battler].species);