diff options
Diffstat (limited to 'data/maps/Route16_NorthEntrance_2F/scripts.inc')
| -rw-r--r-- | data/maps/Route16_NorthEntrance_2F/scripts.inc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 777967038..2dfd8f1b0 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -2,42 +2,40 @@ Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - msgbox gUnknown_819FA07, 2 + msgbox gUnknown_819FA07, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - msgbox gUnknown_819FA41, 2 + msgbox gUnknown_819FA41, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - msgbox gUnknown_819FA6F, 3 + msgbox gUnknown_819FA6F, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - msgbox gUnknown_819FAB9, 3 + msgbox gUnknown_819FAB9, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 lock faceplayer call EventScript_17036F - checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE - goto_if TRUE, EventScript_170365 + goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + compare VAR_RESULT, NO + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F - compare_var_to_value VAR_0x8006, 40 - goto_if lt, EventScript_1A7ABD + compare VAR_0x8006, 40 + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_AMULET_COIN, 1 - giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE msgbox gUnknown_819FC93 release |