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
data/maps/MauvilleCity_BikeShop/scripts.inc
+8 -16
View File
@@ -8,18 +8,14 @@ MauvilleCity_BikeShop_EventScript_Rydel::
goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting
msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT
msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
goto_if_eq VAR_RESULT, YES, MauvilleCity_BikeShop_EventScript_YesFar
goto_if_eq VAR_RESULT, NO, MauvilleCity_BikeShop_EventScript_NotFar
end
MauvilleCity_BikeShop_EventScript_SkipGreeting::
msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
goto_if_eq VAR_RESULT, YES, MauvilleCity_BikeShop_EventScript_YesFar
goto_if_eq VAR_RESULT, NO, MauvilleCity_BikeShop_EventScript_NotFar
end
MauvilleCity_BikeShop_EventScript_ChooseBike::
@@ -62,21 +58,17 @@ MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes::
MauvilleCity_BikeShop_EventScript_AskSwitchBikes::
msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike
goto_if_eq VAR_RESULT, YES, MauvilleCity_BikeShop_EventScript_SwitchBikes
goto_if_eq VAR_RESULT, NO, MauvilleCity_BikeShop_EventScript_KeepBike
end
@ If the player does not have a bike on them Rydel assumes its stored in the PC
MauvilleCity_BikeShop_EventScript_SwitchBikes::
msgbox MauvilleCity_BikeShop_Text_IllSwitchBikes, MSGBOX_DEFAULT
checkitem ITEM_ACRO_BIKE
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchAcroForMach
goto_if_eq VAR_RESULT, TRUE, MauvilleCity_BikeShop_EventScript_SwitchAcroForMach
checkitem ITEM_MACH_BIKE
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchMachForAcro
goto_if_eq VAR_RESULT, TRUE, MauvilleCity_BikeShop_EventScript_SwitchMachForAcro
msgbox MauvilleCity_BikeShop_Text_OhYourBikeIsInPC, MSGBOX_DEFAULT
release
end