diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-03 13:47:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 13:47:29 -0500 |
| commit | dd22d97814bc152d356e076a8d0f19b0d3dd9230 (patch) | |
| tree | 2c7d0609e63a081f51557c62acf11fdf01c925be /data | |
| parent | fdc2a0b40ec625b728cea45b135b2afd953cedeb (diff) | |
| parent | 2e8570499dfcc0db64dfcb446f4e20a162253543 (diff) | |
Merge pull request #283 from GriffinRichards/fix-eventticket
Sync event ticket flag names
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/VermilionCity/scripts.inc | 16 | ||||
| -rw-r--r-- | data/mystery_event_msg.s | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 0442f3d02..0485cd89e 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -59,7 +59,7 @@ VermilionCity_EventScript_FerrySailor:: @ 8166941 end VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 - goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, EventScript_SetResultFalse checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse @@ -67,7 +67,7 @@ VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 end VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977 - goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, EventScript_SetResultFalse checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse @@ -103,7 +103,7 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD call VermilionCity_EventScript_CheckHasAuroraTicket compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket + call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE @@ -115,12 +115,12 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD end VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53 - setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN + setflag FLAG_SHOWN_MYSTIC_TICKET msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock return VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE @@ -132,13 +132,13 @@ VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F end VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5 - setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN + setflag FLAG_SHOWN_AURORA_TICKET msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland return VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1 - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket + call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 2eab73984..5b1f5cacb 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -228,7 +228,7 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 compare VAR_RESULT, FALSE vgoto_if_eq AuroraTicket_NoBagSpace giveitem ITEM_AURORA_TICKET - setflag FLAG_SYS_GOT_AURORA_TICKET + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_GOT_AURORA_TICKET vmessage sText_AuroraTicket2 waitmessage @@ -289,7 +289,7 @@ MysteryEventScript_MysticTicket:: @ 8489689 compare VAR_RESULT, FALSE vgoto_if_eq MysticTicket_NoBagSpace giveitem ITEM_MYSTIC_TICKET - setflag FLAG_SYS_GOT_MYSTIC_TICKET + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK setflag FLAG_GOT_MYSTIC_TICKET vmessage sText_MysticTicket1 waitmessage |