summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-01-13 15:17:32 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-01-13 15:20:29 -0500
commitb9e1b050e10c8d7d62eb49fb1a4ab1a30a1bdaa8 (patch)
tree24ee473173d518b511674751f60724d5317cf708 /data
parent29e59c8eef90b5d166cecae0c54f4ecdd8d51333 (diff)
Label remaining battle types
Diffstat (limited to 'data')
-rw-r--r--data/battle_scripts_1.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index bf8ab19c1..1c3f3ea5b 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2860,7 +2860,7 @@ BattleScript_FaintedMonTryChooseAnother::
switchhandleorder BS_FAINTED, 0x2
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
- jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
+ jumpifbattletype BATTLE_TYPE_RECORDED_LINK, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
@@ -2978,7 +2978,7 @@ BattleScript_LocalBattleLostPrintTrainersWinText::
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
- jumpifbattletype BATTLE_TYPE_x800000, BattleScript_LocalBattleLostDoTrainer2WinText
+ jumpifbattletype BATTLE_TYPE_TOWER_LINK_MULTI, BattleScript_LocalBattleLostDoTrainer2WinText
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostDoTrainer2WinText::
trainerslideout B_POSITION_OPPONENT_LEFT