diff options
Diffstat (limited to 'data/maps/CeruleanCity_House5/scripts.inc')
| -rw-r--r-- | data/maps/CeruleanCity_House5/scripts.inc | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 79cd75785..51243d31f 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -4,18 +4,16 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 lock faceplayer - checkflag FLAG_GOT_POWDER_JAR - goto_if TRUE, EventScript_16AEB7 + goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AEAD - checkflag FLAG_SYS_GOT_BERRY_POUCH - goto_if FALSE, EventScript_16AEA3 + compare VAR_RESULT, NO + goto_if_eq EventScript_16AEAD + goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull msgbox gUnknown_8193033 release end @@ -143,28 +141,28 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AEC8 + compare VAR_RESULT, NO + goto_if_eq EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B0CC + compare VAR_RESULT, 0 + goto_if_eq EventScript_16B0CC giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B0BF + compare VAR_RESULT, 0 + goto_if_eq EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16AEC8 + compare VAR_RESULT, YES + goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release end EventScript_16B0BF:: @ 816B0BF - msgbox gUnknown_81A5207 + msgbox Text_BagIsFull special sub_815F114 release end @@ -177,8 +175,8 @@ EventScript_16B0CC:: @ 816B0CC CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 special sub_814EA7C waitstate releaseall |