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

View File

@@ -4,11 +4,10 @@ BattleFrontier_Lounge3_MapScripts:: @ 8261D82
BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
lock
faceplayer
checkflag FLAG_0x157
goto_eq BattleFrontier_Lounge3_EventScript_261EF9
goto_if_set FLAG_0x157, BattleFrontier_Lounge3_EventScript_261EF9
call BattleFrontier_Lounge3_EventScript_261EA0
compare VAR_0x8004, 2
goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB
goto_if_le BattleFrontier_Lounge3_EventScript_261EEB
setflag FLAG_0x157
msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT
goto BattleFrontier_Lounge3_EventScript_261DAF
@@ -20,10 +19,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
waitbuttonpress
msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge3_EventScript_261FA5
goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge3_EventScript_261FA5
goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
message BattleFrontier_Lounge3_Text_262B42
waitmessage
special sub_813A958
@@ -59,7 +58,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46
BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
specialvar VAR_TEMP_1, sub_813AA04
compare VAR_TEMP_1, VAR_0x8008
goto_if 4, BattleFrontier_Lounge3_EventScript_261E75
goto_if_ge BattleFrontier_Lounge3_EventScript_261E75
msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT
message BattleFrontier_Lounge3_Text_262B42
waitmessage
@@ -114,15 +113,15 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
goto_if 4, BattleFrontier_Lounge3_EventScript_261F12
goto_if_ge BattleFrontier_Lounge3_EventScript_261F12
goto BattleFrontier_Lounge3_EventScript_261DAF
end
BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
goto_eq BattleFrontier_Lounge3_EventScript_261F9E
goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2
goto_eq BattleFrontier_Lounge3_EventScript_261F2E
goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E
goto BattleFrontier_Lounge3_EventScript_261F71
end