improve goto_if macros
This commit is contained in:
@@ -77,8 +77,7 @@ RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C
|
||||
RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
|
||||
lock
|
||||
faceplayer
|
||||
checkflag FLAG_0x113
|
||||
goto_eq RustboroCity_PokemonSchool_EventScript_213FFB
|
||||
goto_if_set FLAG_0x113, RustboroCity_PokemonSchool_EventScript_213FFB
|
||||
compare VAR_FACING, 4
|
||||
call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5
|
||||
compare VAR_FACING, 3
|
||||
@@ -86,7 +85,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
|
||||
msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT
|
||||
giveitem_std ITEM_QUICK_CLAW
|
||||
compare VAR_RESULT, 0
|
||||
goto_eq RustboroCity_PokemonSchool_EventScript_272054
|
||||
goto_if_eq RustboroCity_PokemonSchool_EventScript_272054
|
||||
closemessage
|
||||
applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
|
||||
waitmovement 0
|
||||
@@ -167,12 +166,9 @@ RustboroCity_PokemonSchool_Movement_214027: @ 8214027
|
||||
RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
|
||||
lock
|
||||
faceplayer
|
||||
checkflag FLAG_0x1CB
|
||||
goto_eq RustboroCity_PokemonSchool_EventScript_2140A8
|
||||
checkflag FLAG_0x136
|
||||
goto_eq RustboroCity_PokemonSchool_EventScript_21406F
|
||||
checkflag FLAG_BADGE01_GET
|
||||
goto_eq RustboroCity_PokemonSchool_EventScript_214082
|
||||
goto_if_set FLAG_0x1CB, RustboroCity_PokemonSchool_EventScript_2140A8
|
||||
goto_if_set FLAG_0x136, RustboroCity_PokemonSchool_EventScript_21406F
|
||||
goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082
|
||||
msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT
|
||||
addvar VAR_0x40D1, 1
|
||||
setflag FLAG_0x136
|
||||
@@ -180,8 +176,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
|
||||
end
|
||||
|
||||
RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F
|
||||
checkflag FLAG_BADGE01_GET
|
||||
goto_eq RustboroCity_PokemonSchool_EventScript_214090
|
||||
goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214090
|
||||
msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT
|
||||
release
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user