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

improve goto_if macros

Browse Source
This commit is contained in:
Melody
2018-12-21 20:28:24 -05:00
parent 87fd6b8dc2
commit ac2e4adf2d
273 changed files with 2555 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/RustboroCity_Gym/scripts.inc
+6 -10
View File
@@ -5,9 +5,8 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31
trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq RustboroCity_Gym_EventScript_212FC8
checkflag FLAG_0x0A5
goto_if 0, RustboroCity_Gym_EventScript_212FA4
goto_if_eq RustboroCity_Gym_EventScript_212FC8
goto_if_unset FLAG_0x0A5, RustboroCity_Gym_EventScript_212FA4
msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT
release
end
@@ -31,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4
giveitem_std ITEM_TM39
compare VAR_RESULT, 0
goto_eq RustboroCity_Gym_EventScript_272054
goto_if_eq RustboroCity_Gym_EventScript_272054
setflag FLAG_0x0A5
msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT
release
@@ -60,8 +59,7 @@ RustboroCity_Gym_EventScript_213011:: @ 8213011
RustboroCity_Gym_EventScript_213028:: @ 8213028
lock
faceplayer
checkflag FLAG_0x4F0
goto_eq RustboroCity_Gym_EventScript_21303D
goto_if_set FLAG_0x4F0, RustboroCity_Gym_EventScript_21303D
msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT
release
end
@@ -73,15 +71,13 @@ RustboroCity_Gym_EventScript_21303D:: @ 821303D
RustboroCity_Gym_EventScript_213047:: @ 8213047
lockall
checkflag FLAG_BADGE01_GET
goto_eq RustboroCity_Gym_EventScript_213067
goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067
goto RustboroCity_Gym_EventScript_213071
end
RustboroCity_Gym_EventScript_213057:: @ 8213057
lockall
checkflag FLAG_BADGE01_GET
goto_eq RustboroCity_Gym_EventScript_213067
goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067
goto RustboroCity_Gym_EventScript_213071
end