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/BattleFrontier_ScottsHouse/scripts.inc
+16 -16
View File
@@ -46,7 +46,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PYRAMID_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4
msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT
giveitem_std ITEM_LANSAT_BERRY
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
@@ -70,7 +70,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PYRAMID_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
msgbox BattleFrontier_ScottsHouse_Text_264216, 4
msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT
giveitem_std ITEM_STARF_BERRY
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
@@ -80,12 +80,12 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
end
BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0
msgbox BattleFrontier_ScottsHouse_Text_2643EB, 4
msgbox BattleFrontier_ScottsHouse_Text_2643EB, MSGBOX_DEFAULT
release
end
BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA
msgbox BattleFrontier_ScottsHouse_Text_264373, 4
msgbox BattleFrontier_ScottsHouse_Text_264373, MSGBOX_DEFAULT
release
end
@@ -95,17 +95,17 @@ BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4
goto_eq BattleFrontier_ScottsHouse_EventScript_263807
compare VAR_RESULT, 2
goto_eq BattleFrontier_ScottsHouse_EventScript_263811
msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4
msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT
release
end
BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807
msgbox BattleFrontier_ScottsHouse_Text_263F12, 4
msgbox BattleFrontier_ScottsHouse_Text_263F12, MSGBOX_DEFAULT
release
end
BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811
msgbox BattleFrontier_ScottsHouse_Text_263FFE, 4
msgbox BattleFrontier_ScottsHouse_Text_263FFE, MSGBOX_DEFAULT
release
end
@@ -133,7 +133,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
end
BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
msgbox BattleFrontier_ScottsHouse_Text_264412, 4
msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT
givedecoration_std 42
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
@@ -143,12 +143,12 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
end
BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0
msgbox BattleFrontier_ScottsHouse_Text_264583, 4
msgbox BattleFrontier_ScottsHouse_Text_264583, MSGBOX_DEFAULT
release
end
BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA
msgbox BattleFrontier_ScottsHouse_Text_264546, 4
msgbox BattleFrontier_ScottsHouse_Text_264546, MSGBOX_DEFAULT
release
end
@@ -176,7 +176,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
end
BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
msgbox BattleFrontier_ScottsHouse_Text_26449F, 4
msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT
givedecoration_std 43
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
@@ -186,12 +186,12 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
end
BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939
msgbox BattleFrontier_ScottsHouse_Text_263DB8, 4
msgbox BattleFrontier_ScottsHouse_Text_263DB8, MSGBOX_DEFAULT
release
end
BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4
msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT
closemessage
delay 30
compare VAR_FACING, 2
@@ -202,10 +202,10 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29
compare VAR_FACING, 3
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34
msgbox BattleFrontier_ScottsHouse_Text_263B29, 4
msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E
waitmovement 0
msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4
msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
compare VAR_0x40D1, 13
goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC
compare VAR_0x40D1, 9
@@ -242,7 +242,7 @@ BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9
BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
special sub_813A9D0
msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4
msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
setflag FLAG_0x1D1
setflag FLAG_TEMP_2
release