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

Reformat compare + goto_if/call_if to single statements

Browse Source
This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
data/scripts/move_tutors.inc
View File

@@ -3,16 +3,13 @@ SlateportCity_PokemonFanClub_EventScript_SwaggerTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught
msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_SwaggerDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SwaggerDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_SwaggerDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SwaggerDeclined
msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_SWAGGER
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_SwaggerDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_SwaggerDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER
goto MoveTutor_EventScript_SwaggerTaught
end
@@ -32,16 +29,13 @@ MauvilleCity_EventScript_RolloutTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught
msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_RolloutDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_RolloutDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_RolloutDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_RolloutDeclined
msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_RolloutDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_RolloutDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT
goto MoveTutor_EventScript_RolloutTaught
end
@@ -61,16 +55,13 @@ VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught
msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_FuryCutterDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_FuryCutterDeclined
msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_FuryCutterDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER
goto MoveTutor_EventScript_FuryCutterTaught
end
@@ -90,16 +81,13 @@ LavaridgeTown_House_EventScript_MimicTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught
msgbox MoveTutor_MimicTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_MimicDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_MimicDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_MimicDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_MimicDeclined
msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_MIMIC
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_MimicDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_MimicDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC
goto MoveTutor_EventScript_MimicTaught
end
@@ -119,16 +107,13 @@ FallarborTown_Mart_EventScript_MetronomeTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught
msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_MetronomeDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_MetronomeDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_MetronomeDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_MetronomeDeclined
msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_METRONOME
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_MetronomeDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_MetronomeDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME
goto MoveTutor_EventScript_MetronomeTaught
end
@@ -148,16 +133,13 @@ FortreeCity_House2_EventScript_SleepTalkTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught
msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SleepTalkDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SleepTalkDeclined
msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_SleepTalkDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK
goto MoveTutor_EventScript_SleepTalkTaught
end
@@ -177,16 +159,13 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught
msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_SubstituteDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SubstituteDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_SubstituteDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SubstituteDeclined
msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_SubstituteDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_SubstituteDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE
goto MoveTutor_EventScript_SubstituteTaught
end
@@ -206,16 +185,13 @@ MossdeepCity_EventScript_DynamicPunchTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught
msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_DynamicPunchDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_DynamicPunchDeclined
msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_DynamicPunchDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH
goto MoveTutor_EventScript_DynamicPunchTaught
end
@@ -235,16 +211,13 @@ SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught
msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_DoubleEdgeDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_DoubleEdgeDeclined
msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_DoubleEdgeDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE
goto MoveTutor_EventScript_DoubleEdgeTaught
end
@@ -264,16 +237,13 @@ PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor::
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught
msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_ExplosionDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_ExplosionDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq MoveTutor_EventScript_ExplosionDeclined
goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_ExplosionDeclined
msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MoveTutor_EventScript_ExplosionDeclined
goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_ExplosionDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION
goto MoveTutor_EventScript_ExplosionTaught
end