diff options
Diffstat (limited to 'data/maps/VermilionCity_PokemonFanClub/scripts.inc')
| -rw-r--r-- | data/maps/VermilionCity_PokemonFanClub/scripts.inc | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 397c174ea..23b24b9a2 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -4,11 +4,10 @@ VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F lock faceplayer - checkflag FLAG_GOT_BIKE_VOUCHER - goto_if TRUE, EventScript_16B4A7 + goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B4B1 + compare VAR_RESULT, YES + goto_if_eq EventScript_16B4B1 msgbox gUnknown_8194860 release end @@ -21,11 +20,10 @@ EventScript_16B4A7:: @ 816B4A7 EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B4F2 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER - additem ITEM_BIKE_VOUCHER, 1 - giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + giveitem_msg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 msgbox gUnknown_819477C release end @@ -38,8 +36,7 @@ EventScript_16B4F2:: @ 816B4F2 VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_16B511 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16B511 msgbox gUnknown_81948E6 release end @@ -53,11 +50,10 @@ EventScript_16B511:: @ 816B511 VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_16B54B + goto_if_set FLAG_TEMP_3, EventScript_16B54B msgbox gUnknown_81944CC closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_TEMP_2 release @@ -66,7 +62,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 EventScript_16B54B:: @ 816B54B msgbox gUnknown_8194518 closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 clearflag FLAG_TEMP_3 release @@ -75,11 +71,10 @@ EventScript_16B54B:: @ 816B54B VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_16B586 + goto_if_set FLAG_TEMP_2, EventScript_16B586 msgbox gUnknown_819446F closemessage - applymovement 6, Movement_1A75E5 + applymovement 6, Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_TEMP_3 release @@ -88,7 +83,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 EventScript_16B586:: @ 816B586 msgbox gUnknown_819449C closemessage - applymovement 6, Movement_1A75E5 + applymovement 6, Movement_FaceOriginalDirection waitmovement 0 clearflag FLAG_TEMP_2 release @@ -115,9 +110,9 @@ VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 end VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 - msgbox gUnknown_8194910, 3 + msgbox gUnknown_8194910, MSGBOX_SIGN end VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD - msgbox gUnknown_819493D, 3 + msgbox gUnknown_819493D, MSGBOX_SIGN end |