improve goto_if macros

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
+6 -8
View File
@@ -2,7 +2,7 @@ EventScript_28CCAA:: @ 828CCAA
setvar VAR_0x8005, 8
special InterviewBefore
compare VAR_RESULT, 1
goto_eq EventScript_28CCC6
goto_if_eq EventScript_28CCC6
setvar VAR_0x8005, 8
special InterviewAfter
return
@@ -220,8 +220,7 @@ Route111_EventScript_28CF56:: @ 828CF56
call_if 1, Route111_EventScript_28CF9F
compare VAR_FACING, 4
call_if 1, Route111_EventScript_28CFB1
checkflag FLAG_TEMP_1
goto_eq Route111_EventScript_28D0EE
goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
msgbox Route111_Text_28B042, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
@@ -254,11 +253,10 @@ Route120_EventScript_28CFC3:: @ 828CFC3
call_if 1, Route111_EventScript_28CF9F
compare VAR_FACING, 4
call_if 1, Route111_EventScript_28CFB1
checkflag FLAG_TEMP_1
goto_eq Route111_EventScript_28D0EE
goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
specialvar VAR_RESULT, GabbyAndTyGetLastQuote
compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D053
goto_if_eq Route111_EventScript_28D053
msgbox Route111_Text_28B137, MSGBOX_DEFAULT
specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia
switch VAR_RESULT
@@ -313,14 +311,14 @@ Route111_EventScript_28D099:: @ 828D099
Route111_EventScript_28D0A7:: @ 828D0A7
compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D0E1
goto_if_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B433, MSGBOX_DEFAULT
setvar VAR_0x8004, 10
call Route111_EventScript_271E7C
lock
faceplayer
compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D0E1
goto_if_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT
special GabbyAndTyAfterInterview
setflag FLAG_TEMP_1