diff options
| author | huderlem <huderlem@gmail.com> | 2020-01-13 19:33:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 19:33:47 -0600 |
| commit | 6d6c57f3832c14aadd07b9d39c658c838fcd42cf (patch) | |
| tree | eb87fc3634991f5ce401b25dfca9968ee5c36f69 /data/scripts/mevent_aurora_ticket.inc | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
| parent | 96720db08319d8f69d7864e186722d13dc9ceb05 (diff) | |
Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
Diffstat (limited to 'data/scripts/mevent_aurora_ticket.inc')
| -rw-r--r-- | data/scripts/mevent_aurora_ticket.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc index 177d69681..f26be068f 100644 --- a/data/scripts/mevent_aurora_ticket.inc +++ b/data/scripts/mevent_aurora_ticket.inc @@ -2,10 +2,8 @@ MysteryEventScript_AuroraTicket:: @ 867533C setvaddress MysteryEventScript_AuroraTicket lock faceplayer - checkflag FLAG_RECEIVED_AURORA_TICKET - vgoto_if_eq AuroraTicket_Obtained - checkflag FLAG_BATTLED_DEOXYS - vgoto_if_eq AuroraTicket_Obtained + vgoto_if_set FLAG_RECEIVED_AURORA_TICKET, AuroraTicket_Obtained + vgoto_if_set FLAG_BATTLED_DEOXYS, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, TRUE vgoto_if_eq AuroraTicket_Obtained @@ -15,7 +13,7 @@ MysteryEventScript_AuroraTicket:: @ 867533C checkitemspace ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE vgoto_if_eq AuroraTicket_NoBagSpace - giveitem_std ITEM_AURORA_TICKET + giveitem ITEM_AURORA_TICKET setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_RECEIVED_AURORA_TICKET vmessage sText_AuroraTicketUseAtPort |