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

26
data/maps/DewfordTown/scripts.inc
View File

@@ -9,8 +9,7 @@ DewfordTown_MapScript1_1E950D: @ 81E950D
DewfordTown_EventScript_1E9511:: @ 81E9511
lock
faceplayer
checkflag FLAG_0x0BD
goto_if 0, DewfordTown_EventScript_1E9585
goto_if_unset FLAG_0x0BD, DewfordTown_EventScript_1E9585
message DewfordTown_Text_1E9C8A
waitmessage
multichoicedefault 21, 6, 0, 2, 0
@@ -44,7 +43,7 @@ DewfordTown_EventScript_1E957A:: @ 81E957A
DewfordTown_EventScript_1E9585:: @ 81E9585
msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E95A2
goto_if_eq DewfordTown_EventScript_1E95A2
msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT
release
end
@@ -74,13 +73,12 @@ DewfordTown_EventScript_1E95CC:: @ 81E95CC
DewfordTown_EventScript_1E95D5:: @ 81E95D5
lock
faceplayer
checkflag FLAG_0x101
goto_eq DewfordTown_EventScript_1E962A
goto_if_set FLAG_0x101, DewfordTown_EventScript_1E962A
msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E95FF
goto_if_eq DewfordTown_EventScript_1E95FF
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E9620
goto_if_eq DewfordTown_EventScript_1E9620
end
DewfordTown_EventScript_1E95FF:: @ 81E95FF
@@ -101,9 +99,9 @@ DewfordTown_EventScript_1E962A:: @ 81E962A
waitmessage
multichoice 20, 8, 50, 1
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E964C
goto_if_eq DewfordTown_EventScript_1E964C
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E9656
goto_if_eq DewfordTown_EventScript_1E9656
end
DewfordTown_EventScript_1E964C:: @ 81E964C
@@ -600,9 +598,9 @@ DewfordTown_EventScript_1E9922:: @ 81E9922
call DewfordTown_EventScript_271E8B
msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E9948
goto_if_eq DewfordTown_EventScript_1E9948
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E9952
goto_if_eq DewfordTown_EventScript_1E9952
end
DewfordTown_EventScript_1E9948:: @ 81E9948
@@ -617,15 +615,15 @@ DewfordTown_EventScript_1E9952:: @ 81E9952
lock
faceplayer
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E997D
goto_if_eq DewfordTown_EventScript_1E997D
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E9994
goto_if_eq DewfordTown_EventScript_1E9994
end
DewfordTown_EventScript_1E997D:: @ 81E997D
incrementgamestat 2
compare VAR_0x8004, 0
goto_eq DewfordTown_EventScript_1E999E
goto_if_eq DewfordTown_EventScript_1E999E
msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT
release
end