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/Route123_BerryMastersHouse/scripts.inc
+23 -30
View File
@@ -10,15 +10,14 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
lock
faceplayer
dodailyevents
checkflag FLAG_0x92D
goto_eq Route123_BerryMastersHouse_EventScript_26F8B6
goto_if_set FLAG_0x92D, Route123_BerryMastersHouse_EventScript_26F8B6
msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 20
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x92D
msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT
random 10
@@ -26,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT
release
end
@@ -40,17 +39,16 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
lock
faceplayer
dodailyevents
checkflag FLAG_0x931
goto_eq Route123_BerryMastersHouse_EventScript_26FA6F
goto_if_set FLAG_0x931, Route123_BerryMastersHouse_EventScript_26FA6F
msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
setvar VAR_0x8004, 13
call Route123_BerryMastersHouse_EventScript_271E7C
lock
faceplayer
compare VAR_RESULT, 1
goto_eq Route123_BerryMastersHouse_EventScript_26F909
goto_if_eq Route123_BerryMastersHouse_EventScript_26F909
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_26F8F7
goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7
end
Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7
@@ -61,17 +59,17 @@ Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7
Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909
compare VAR_0x8004, 0
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C
compare VAR_0x8004, 1
goto_eq Route123_BerryMastersHouse_EventScript_26F97A
goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A
compare VAR_0x8004, 2
goto_eq Route123_BerryMastersHouse_EventScript_26F9AB
goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB
compare VAR_0x8004, 3
goto_eq Route123_BerryMastersHouse_EventScript_26F9DC
goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC
compare VAR_0x8004, 4
goto_eq Route123_BerryMastersHouse_EventScript_26FA0D
goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D
compare VAR_0x8004, 5
goto_eq Route123_BerryMastersHouse_EventScript_26FA3E
goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E
end
Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
@@ -80,62 +78,57 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
goto Route123_BerryMastersHouse_EventScript_26FA79
release
end
Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A
checkflag FLAG_0x0F8
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
goto_if_set FLAG_0x0F8, Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_SPELON_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0F8
goto Route123_BerryMastersHouse_EventScript_26FA79
end
Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB
checkflag FLAG_0x0F9
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
goto_if_set FLAG_0x0F9, Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_PAMTRE_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0F9
goto Route123_BerryMastersHouse_EventScript_26FA79
end
Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC
checkflag FLAG_0x0FA
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
goto_if_set FLAG_0x0FA, Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_WATMEL_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0FA
goto Route123_BerryMastersHouse_EventScript_26FA79
end
Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D
checkflag FLAG_0x0FB
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
goto_if_set FLAG_0x0FB, Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_DURIN_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0FB
goto Route123_BerryMastersHouse_EventScript_26FA79
end
Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E
checkflag FLAG_0x0FC
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
goto_if_set FLAG_0x0FC, Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_BELUE_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto_if_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0FC
goto Route123_BerryMastersHouse_EventScript_26FA79
end