diff options
Diffstat (limited to 'data/maps/Route11_EastEntrance_2F/scripts.inc')
| -rw-r--r-- | data/maps/Route11_EastEntrance_2F/scripts.inc | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 0140d8de3..854a3d5f8 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -3,8 +3,7 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall - checkflag FLAG_WOKE_UP_ROUTE_12_SNORLAX - goto_if TRUE, EventScript_16FD49 + goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -15,7 +14,7 @@ EventScript_16FD49:: @ 816FD49 end Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - msgbox gUnknown_819ED1F, 3 + msgbox gUnknown_819ED1F, MSGBOX_SIGN end Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C @@ -23,17 +22,16 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C faceplayer setvar VAR_0x8008, 4 call EventScript_1A8CAD - checkflag FLAG_DID_NINA_TRADE - goto_if TRUE, EventScript_16FDCE + goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16FDB6 + compare VAR_RESULT, NO + goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16FDB6 + compare VAR_0x8004, 6 + goto_if_ge EventScript_16FDB6 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16FDC0 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_NINA_TRADE @@ -60,23 +58,21 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 lock faceplayer call EventScript_16FE64 - checkflag FLAG_GOT_ITEMFINDER - goto_if TRUE, EventScript_16FE5A + goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A msgbox gUnknown_819E9E5, 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_16FE64 - compare_var_to_value VAR_0x8006, 30 - goto_if lt, EventScript_1A7ABD + compare VAR_0x8006, 30 + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_ITEMFINDER, 1 - giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER msgbox gUnknown_819EB59 release |