dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2022-06-24 21:10:48 -04:00
parent d73f39ae40
commit 9cde4e0f74
802 changed files with 20272 additions and 20272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/trainer_battle.inc
+20 -20
View File
@@ -1,11 +1,11 @@
EventScript_DoTrainerBattleFromApproach:: @ 81A4EB4
EventScript_DoTrainerBattleFromApproach::
lock
special PlayTrainerEncounterMusic
special EndTrainerApproach
waitstate
goto EventScript_DoTrainerBattle
EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
EventScript_TryDoNormalTrainerBattle::
lock
faceplayer
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
@@ -17,10 +17,10 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
special SetUpTrainerMovement
goto EventScript_DoTrainerBattle
EventScript_NoTrainerBattle:: @ 81A4EE8
EventScript_NoTrainerBattle::
ontrainerbattleend
EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
EventScript_TryDoDoubleTrainerBattle::
lock
faceplayer
call EventScript_RevealTrainer
@@ -34,17 +34,17 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
special SetUpTrainerMovement
goto EventScript_DoTrainerBattle
EventScript_NotEnoughMonsForDoubleBattle:: @ 81A4F19
EventScript_NotEnoughMonsForDoubleBattle::
special ShowTrainerCantBattleSpeech
waitmessage
waitbuttonpress
release
end
EventScript_NoDoubleTrainerBattle:: @ 81A4F20
EventScript_NoDoubleTrainerBattle::
ontrainerbattleend
EventScript_DoNoIntroTrainerBattle:: @ 81A4F21
EventScript_DoNoIntroTrainerBattle::
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
special PlayTrainerEncounterMusic
@@ -52,7 +52,7 @@ EventScript_DoNoIntroTrainerBattle:: @ 81A4F21
battlebegin
ontrainerbattleend
EventScript_TryDoRematchBattle:: @ 81A4F3E
EventScript_TryDoRematchBattle::
call EventScript_RevealTrainer
specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, FALSE
@@ -68,10 +68,10 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
releaseall
end
EventScript_NoRematchBattle:: @ 81A4F72
EventScript_NoRematchBattle::
ontrainerbattleend
EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
EventScript_TryDoDoubleRematchBattle::
specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, FALSE
goto_if_eq EventScript_NoDoubleRematchBattle
@@ -89,30 +89,30 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
releaseall
end
EventScript_NoDoubleRematchBattle:: @ 81A4FB0
EventScript_NoDoubleRematchBattle::
ontrainerbattleend
EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 81A4FB1
EventScript_NotEnoughMonsForDoubleRematchBattle::
special ShowTrainerCantBattleSpeech
waitmessage
waitbuttonpress
release
end
EventScript_EndQuestLogRematch:: @ 81A4FB8
EventScript_EndQuestLogRematch::
releaseall
end
EventScript_RevealTrainer:: @ 81A4FBA
EventScript_RevealTrainer::
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
return
Movement_RevealTrainer:: @ 81A4FC5
Movement_RevealTrainer::
reveal_trainer
step_end
EventScript_DoTrainerBattle:: @ 81A4FC7
EventScript_DoTrainerBattle::
special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
@@ -129,19 +129,19 @@ EventScript_DoTrainerBattle:: @ 81A4FC7
goto_if_eq EventScript_EndTrainerBattleContinueScript
compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC
goto_if_eq EventScript_EndTrainerBattleContinueScript
EventScript_EndTrainerBattle:: @ 81A5017
EventScript_EndTrainerBattle::
releaseall
end
EventScript_EndTrainerBattleContinueScript:: @ 81A5019
EventScript_EndTrainerBattleContinueScript::
ontrainerbattleendgoto
EventScript_EndQuestLogBattle:: @ 81A501A
EventScript_EndQuestLogBattle::
special SetBattledTrainerFlag
releaseall
end
Std_MsgboxAutoclose:: @ 81A501F
Std_MsgboxAutoclose::
message 0x0
waitmessage
waitbuttonpress