summaryrefslogtreecommitdiff
path: root/data/battle_scripts_1.s
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-10-04 10:21:03 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-10-08 16:39:46 -0400
commit31b501e7eb6ba15602dd13f6a2d728fca9f04ca5 (patch)
treebbdeb215ee3e628a4c343d2e2c887e4efe5bcb63 /data/battle_scripts_1.s
parente26f9d10d7bebee5ea512fc4729ce6adafec66a0 (diff)
Start misc battle documentation
Diffstat (limited to 'data/battle_scripts_1.s')
-rw-r--r--data/battle_scripts_1.s4
1 files changed, 3 insertions, 1 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 951558234..203ea3125 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2829,10 +2829,12 @@ BattleScript_HandleFaintedMon::
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChooseAnother
jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonTryChooseAnother
+@ Yes/No for sending out a new Pokémon, when sending out is optional
printstring STRINGID_USENEXTPKMN
setbyte gBattleCommunication, 0
yesnobox
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0, BattleScript_FaintedMonTryChooseAnother
+@ Player said no, try to run
jumpifplayerran BattleScript_FaintedMonEnd
printstring STRINGID_CANTESCAPE2
BattleScript_FaintedMonTryChooseAnother::
@@ -2904,7 +2906,7 @@ BattleScript_HandleFaintedMonLoop::
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
waitstate
- switchineffects 5
+ switchineffects BS_UNK_5
jumpifbytenotequal gBattlerFainted, gBattlersCount, BattleScript_HandleFaintedMonLoop
BattleScript_HandleFaintedMonMultipleEnd::
end2