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

Fixed trainerslide arguments (#5344)

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

4
asm/macros/battle_script.inc
View File

@ -507,9 +507,9 @@
.byte \battler .byte \battler
.endm .endm
.macro trainerslidein battler:req .macro trainerslidein position:req
.byte 0x53 .byte 0x53
.byte \battler .byte \position
.endm .endm
.macro playse song:req .macro playse song:req

30
data/battle_scripts_1.s
View File

@ -5603,13 +5603,13 @@ BattleScript_LocalTrainerBattleWon::
BattleScript_LocalTwoTrainersDefeated:: BattleScript_LocalTwoTrainersDefeated::
printstring STRINGID_TWOENEMIESDEFEATED printstring STRINGID_TWOENEMIESDEFEATED
BattleScript_LocalBattleWonLoseTexts:: BattleScript_LocalBattleWonLoseTexts::
trainerslidein BS_ATTACKER trainerslidein BS_OPPONENT1
waitstate waitstate
printstring STRINGID_TRAINER1LOSETEXT printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleWonReward jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleWonReward
trainerslideout B_POSITION_OPPONENT_LEFT trainerslideout BS_OPPONENT1
waitstate waitstate
trainerslidein BS_FAINTED trainerslidein BS_OPPONENT2
waitstate waitstate
printstring STRINGID_TRAINER2LOSETEXT printstring STRINGID_TRAINER2LOSETEXT
BattleScript_LocalBattleWonReward:: BattleScript_LocalBattleWonReward::
@ -5661,15 +5661,15 @@ BattleScript_LocalBattleLostPrintTrainersWinText::
waitstate waitstate
returnopponentmon2toball BS_ATTACKER returnopponentmon2toball BS_ATTACKER
waitstate waitstate
trainerslidein BS_ATTACKER trainerslidein BS_OPPONENT1
waitstate waitstate
printstring STRINGID_TRAINER1WINTEXT printstring STRINGID_TRAINER1WINTEXT
jumpifbattletype BATTLE_TYPE_TOWER_LINK_MULTI, BattleScript_LocalBattleLostDoTrainer2WinText jumpifbattletype BATTLE_TYPE_TOWER_LINK_MULTI, BattleScript_LocalBattleLostDoTrainer2WinText
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_ jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostDoTrainer2WinText:: BattleScript_LocalBattleLostDoTrainer2WinText::
trainerslideout B_POSITION_OPPONENT_LEFT trainerslideout BS_OPPONENT1
waitstate waitstate
trainerslidein BS_FAINTED trainerslidein BS_OPPONENT2
waitstate waitstate
printstring STRINGID_TRAINER2WINTEXT printstring STRINGID_TRAINER2WINTEXT
BattleScript_LocalBattleLostEnd_:: BattleScript_LocalBattleLostEnd_::
@ -5680,12 +5680,12 @@ BattleScript_FrontierLinkBattleLost::
waitstate waitstate
returnopponentmon2toball BS_ATTACKER returnopponentmon2toball BS_ATTACKER
waitstate waitstate
trainerslidein BS_ATTACKER trainerslidein BS_OPPONENT1
waitstate waitstate
printstring STRINGID_TRAINER1WINTEXT printstring STRINGID_TRAINER1WINTEXT
trainerslideout B_POSITION_OPPONENT_LEFT trainerslideout BS_OPPONENT1
waitstate waitstate
trainerslidein BS_FAINTED trainerslidein BS_OPPONENT2
waitstate waitstate
printstring STRINGID_TRAINER2WINTEXT printstring STRINGID_TRAINER2WINTEXT
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_FrontierLinkBattleLostEnd jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_FrontierLinkBattleLostEnd
@ -5708,12 +5708,12 @@ BattleScript_TowerLinkBattleWon::
playtrainerdefeatbgm BS_ATTACKER playtrainerdefeatbgm BS_ATTACKER
printstring STRINGID_BATTLEEND printstring STRINGID_BATTLEEND
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
trainerslidein BS_ATTACKER trainerslidein BS_OPPONENT1
waitstate waitstate
printstring STRINGID_TRAINER1LOSETEXT printstring STRINGID_TRAINER1LOSETEXT
trainerslideout B_POSITION_OPPONENT_LEFT trainerslideout BS_OPPONENT1
waitstate waitstate
trainerslidein BS_FAINTED trainerslidein BS_OPPONENT2
waitstate waitstate
printstring STRINGID_TRAINER2LOSETEXT printstring STRINGID_TRAINER2LOSETEXT
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_TowerLinkBattleWonEnd jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_TowerLinkBattleWonEnd
@ -5730,13 +5730,13 @@ BattleScript_FrontierTrainerBattleWon::
BattleScript_FrontierTrainerBattleWon_TwoDefeated: BattleScript_FrontierTrainerBattleWon_TwoDefeated:
printstring STRINGID_TWOENEMIESDEFEATED printstring STRINGID_TWOENEMIESDEFEATED
BattleScript_FrontierTrainerBattleWon_LoseTexts: BattleScript_FrontierTrainerBattleWon_LoseTexts:
trainerslidein BS_ATTACKER trainerslidein BS_OPPONENT1
waitstate waitstate
printstring STRINGID_TRAINER1LOSETEXT printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_TryPickUpItems jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_TryPickUpItems
trainerslideout B_POSITION_OPPONENT_LEFT trainerslideout BS_OPPONENT1
waitstate waitstate
trainerslidein BS_FAINTED trainerslidein BS_OPPONENT2
waitstate waitstate
printstring STRINGID_TRAINER2LOSETEXT printstring STRINGID_TRAINER2LOSETEXT
BattleScript_TryPickUpItems: BattleScript_TryPickUpItems:

10
data/battle_scripts_2.s
View File

@ -238,7 +238,7 @@ BattleScript_ActionWallyThrow:
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
returnatktoball returnatktoball
waitstate waitstate
trainerslidein BS_TARGET trainerslidein BS_PLAYER1
waitstate waitstate
printstring STRINGID_YOUTHROWABALLNOWRIGHT printstring STRINGID_YOUTHROWABALLNOWRIGHT
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@ -246,10 +246,10 @@ BattleScript_ActionWallyThrow:
BattleScript_TrainerASlideMsgRet:: BattleScript_TrainerASlideMsgRet::
handletrainerslidemsg BS_SCRIPTING, 0 handletrainerslidemsg BS_SCRIPTING, 0
trainerslidein B_POSITION_OPPONENT_LEFT trainerslidein BS_OPPONENT1
handletrainerslidemsg BS_SCRIPTING, 1 handletrainerslidemsg BS_SCRIPTING, 1
waitstate waitstate
trainerslideout B_POSITION_OPPONENT_LEFT trainerslideout BS_OPPONENT1
waitstate waitstate
handletrainerslidemsg BS_SCRIPTING, 2 handletrainerslidemsg BS_SCRIPTING, 2
return return
@ -260,10 +260,10 @@ BattleScript_TrainerASlideMsgEnd2::
BattleScript_TrainerBSlideMsgRet:: BattleScript_TrainerBSlideMsgRet::
handletrainerslidemsg BS_SCRIPTING, 0 handletrainerslidemsg BS_SCRIPTING, 0
trainerslidein B_POSITION_OPPONENT_RIGHT trainerslidein BS_OPPONENT2
handletrainerslidemsg BS_SCRIPTING, 1 handletrainerslidemsg BS_SCRIPTING, 1
waitstate waitstate
trainerslideout B_POSITION_OPPONENT_RIGHT trainerslideout BS_OPPONENT2
waitstate waitstate
handletrainerslidemsg BS_SCRIPTING, 2 handletrainerslidemsg BS_SCRIPTING, 2
return return

4
src/battle_script_commands.c
View File

@ -7439,9 +7439,9 @@ static void Cmd_switchineffects(void)
static void Cmd_trainerslidein(void) static void Cmd_trainerslidein(void)
{ {
CMD_ARGS(u8 battler); CMD_ARGS(u8 position);
u32 battler = GetBattlerForBattleScript(cmd->battler); u32 battler = GetBattlerForBattleScript(cmd->position);
BtlController_EmitTrainerSlide(battler, BUFFER_A); BtlController_EmitTrainerSlide(battler, BUFFER_A);
MarkBattlerForControllerExec(battler); MarkBattlerForControllerExec(battler);