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

@@ -50,7 +50,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_24D840
@@ -98,7 +98,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
waitse
call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
message BattleFrontier_BattlePalaceLobby_Text_24EF16
waitmessage
multichoicedefault 20, 8, 94, 1, 0
@@ -151,7 +151,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
setvar VAR_0x8005, 0
special CallBattlePalaceFunction
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817
goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
@@ -181,7 +181,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -194,7 +194,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
@@ -226,7 +226,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
call BattleFrontier_BattlePalaceLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
special SavePlayerParty
@@ -243,7 +243,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20
compare VAR_FRONTIER_BATTLE_MODE, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_24D999