dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #992 from GriffinRichards/fix-trainerbattle

Browse Source 
Minor fixes in trainer_battle.inc
This commit is contained in:
PikalaxALT
2020-03-03 15:56:28 -05:00
committed by GitHub
parent 07da4225c3 b6c9ad505d
commit 0eae6d0d07
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/trainer_battle.inc
+4 -5
View File
@@ -44,7 +44,7 @@ EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA
EventScript_NoDoubleTrainerBattle:: @ 82713C1 EventScript_NoDoubleTrainerBattle:: @ 82713C1
gotopostbattlescript gotopostbattlescript
EventScript_DoTainerBattle:: @ 82713C2 EventScript_DoNoIntroTrainerBattle:: @ 82713C2
applymovement VAR_LAST_TALKED, Movement_RevealTrainer applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0 waitmovement 0
special SetUpTrainerEncounterMusic special SetUpTrainerEncounterMusic
@@ -54,7 +54,7 @@ EventScript_DoTainerBattle:: @ 82713C2
EventScript_TryDoRematchBattle:: @ 82713D1 EventScript_TryDoRematchBattle:: @ 82713D1
call EventScript_RevealTrainer call EventScript_RevealTrainer
specialvar VAR_RESULT, IsTrainerReadyForRematch specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_NoRematchTrainerBattle goto_if_eq EventScript_NoRematchTrainerBattle
special SetUpTrainerEncounterMusic special SetUpTrainerEncounterMusic
special SetUpTrainerMovement special SetUpTrainerMovement
@@ -70,7 +70,7 @@ EventScript_NoRematchTrainerBattle:: @ 82713F7
EventScript_TryDoDoubleRematchBattle:: @ 82713F8 EventScript_TryDoDoubleRematchBattle:: @ 82713F8
specialvar VAR_RESULT, IsTrainerReadyForRematch specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_NoDoubleRematchTrainerBattle goto_if_eq EventScript_NoDoubleRematchTrainerBattle
special HasEnoughMonsForDoubleBattle special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
@@ -113,7 +113,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C
EventScript_DoTrainerBattle:: @ 8271454 EventScript_DoTrainerBattle:: @ 8271454
trainerbattlebegin trainerbattlebegin
@ Pointless check, possibly used for debugging? @ Below battle mode check only needed in FRLG
specialvar VAR_RESULT, GetTrainerBattleMode specialvar VAR_RESULT, GetTrainerBattleMode
compare VAR_RESULT, TRAINER_BATTLE_SINGLE compare VAR_RESULT, TRAINER_BATTLE_SINGLE
goto_if_eq EventScript_EndTrainerBattle goto_if_eq EventScript_EndTrainerBattle
@@ -125,7 +125,6 @@ EventScript_DoTrainerBattle:: @ 8271454
goto_if_eq EventScript_EndTrainerBattle goto_if_eq EventScript_EndTrainerBattle
compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC
goto_if_eq EventScript_EndTrainerBattle goto_if_eq EventScript_EndTrainerBattle
EventScript_EndTrainerBattle:: @ 8271491 EventScript_EndTrainerBattle:: @ 8271491
gotobeatenscript gotobeatenscript
releaseall releaseall
include/event_scripts.h
+1 -1
View File
@@ -4,7 +4,7 @@
extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_TestSignpostMsg[];
extern const u8 EventScript_TryGetTrainerScript[]; extern const u8 EventScript_TryGetTrainerScript[];
extern const u8 EventScript_271354[]; extern const u8 EventScript_271354[];
extern const u8 EventScript_DoTainerBattle[]; extern const u8 EventScript_DoNoIntroTrainerBattle[];
extern const u8 EventScript_TryDoDoubleTrainerBattle[]; extern const u8 EventScript_TryDoDoubleTrainerBattle[];
extern const u8 EventScript_TryDoNormalTrainerBattle[]; extern const u8 EventScript_TryDoNormalTrainerBattle[];
extern const u8 EventScript_TryDoDoubleRematchBattle[]; extern const u8 EventScript_TryDoDoubleRematchBattle[];
src/battle_setup.c
+1 -1
View File
@@ -1087,7 +1087,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
{ {
case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT:
TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data);
return EventScript_DoTainerBattle; return EventScript_DoNoIntroTrainerBattle;
case TRAINER_BATTLE_DOUBLE: case TRAINER_BATTLE_DOUBLE:
TrainerBattleLoadArgs(sDoubleBattleParams, data); TrainerBattleLoadArgs(sDoubleBattleParams, data);
SetMapVarsToTrainer(); SetMapVarsToTrainer();