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

adds constants, cleans up callstd and msgbox code

Browse Source 
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
This commit is contained in:
Melody
2018-12-02 03:37:46 -05:00
parent 145047d438
commit c557ac61ae
354 changed files with 4538 additions and 4531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route123_BerryMastersHouse/scripts.inc
+15 -15
View File
@@ -12,7 +12,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
dodailyevents
checkflag FLAG_0x92D
goto_eq Route123_BerryMastersHouse_EventScript_26F8B6
msgbox Route123_BerryMastersHouse_Text_2A7386, 4
msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 20
addvar VAR_RESULT, 133
@@ -20,19 +20,19 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x92D
msgbox Route123_BerryMastersHouse_Text_2A7428, 4
msgbox Route123_BerryMastersHouse_Text_2A7428, 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
msgbox Route123_BerryMastersHouse_Text_2A7445, 4
msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT
release
end
Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6
msgbox Route123_BerryMastersHouse_Text_2A749E, 4
msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT
release
end
@@ -42,7 +42,7 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
dodailyevents
checkflag FLAG_0x931
goto_eq Route123_BerryMastersHouse_EventScript_26FA6F
msgbox Route123_BerryMastersHouse_Text_2A74E6, 4
msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
setvar VAR_0x8004, 13
call Route123_BerryMastersHouse_EventScript_271E7C
lock
@@ -54,8 +54,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
end
Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7
msgbox Route123_BerryMastersHouse_Text_2A7682, 4
msgbox Route123_BerryMastersHouse_Text_2A761B, 4
msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT
msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT
release
end
@@ -75,7 +75,7 @@ Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909
end
Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
msgbox Route123_BerryMastersHouse_Text_2A75D0, 4
msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
@@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A
checkflag FLAG_0x0F8
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_SPELON_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
@@ -99,7 +99,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A
Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB
checkflag FLAG_0x0F9
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_PAMTRE_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
@@ -110,7 +110,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB
Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC
checkflag FLAG_0x0FA
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_WATMEL_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
@@ -121,7 +121,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC
Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D
checkflag FLAG_0x0FB
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_DURIN_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
@@ -132,7 +132,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D
Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E
checkflag FLAG_0x0FC
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
giveitem_std ITEM_BELUE_BERRY
compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
@@ -141,13 +141,13 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E
end
Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F
msgbox Route123_BerryMastersHouse_Text_2A761B, 4
msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT
release
end
Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79
setflag FLAG_0x931
msgbox Route123_BerryMastersHouse_Text_2A761B, 4
msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT
release
end