dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #283 from GriffinRichards/fix-eventticket

Browse Source 
Sync event ticket flag names
This commit is contained in:
PikalaxALT
2020-03-03 13:47:29 -05:00
committed by GitHub
parent fdc2a0b40e 2e8570499d
commit dd22d97814
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/VermilionCity/scripts.inc
+8 -8
View File
@@ -59,7 +59,7 @@ VermilionCity_EventScript_FerrySailor:: @ 8166941
end end
VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 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 checkitem ITEM_MYSTIC_TICKET, 1
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq EventScript_SetResultFalse goto_if_eq EventScript_SetResultFalse
@@ -67,7 +67,7 @@ VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958
end end
VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977 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 checkitem ITEM_AURORA_TICKET, 1
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq EventScript_SetResultFalse goto_if_eq EventScript_SetResultFalse
@@ -103,7 +103,7 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD
call VermilionCity_EventScript_CheckHasAuroraTicket call VermilionCity_EventScript_CheckHasAuroraTicket
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets 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 message VermilionCity_Text_BoardSeagallopFerry
waitmessage waitmessage
multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE
@@ -115,12 +115,12 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD
end end
VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53 VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53
setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN setflag FLAG_SHOWN_MYSTIC_TICKET
msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock
return return
VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F 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 message VermilionCity_Text_BoardSeagallopFerry
waitmessage waitmessage
multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE
@@ -132,13 +132,13 @@ VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F
end end
VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5 VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5
setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN setflag FLAG_SHOWN_AURORA_TICKET
msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland
return return
VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1 VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1
call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket
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 message VermilionCity_Text_BoardSeagallopFerry
waitmessage waitmessage
multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE
data/mystery_event_msg.s
+2 -2
View File
@@ -228,7 +228,7 @@ MysteryEventScript_AuroraTicket:: @ 84894B9
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
vgoto_if_eq AuroraTicket_NoBagSpace vgoto_if_eq AuroraTicket_NoBagSpace
giveitem ITEM_AURORA_TICKET giveitem ITEM_AURORA_TICKET
setflag FLAG_SYS_GOT_AURORA_TICKET setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
setflag FLAG_GOT_AURORA_TICKET setflag FLAG_GOT_AURORA_TICKET
vmessage sText_AuroraTicket2 vmessage sText_AuroraTicket2
waitmessage waitmessage
@@ -289,7 +289,7 @@ MysteryEventScript_MysticTicket:: @ 8489689
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
vgoto_if_eq MysticTicket_NoBagSpace vgoto_if_eq MysticTicket_NoBagSpace
giveitem ITEM_MYSTIC_TICKET giveitem ITEM_MYSTIC_TICKET
setflag FLAG_SYS_GOT_MYSTIC_TICKET setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
setflag FLAG_GOT_MYSTIC_TICKET setflag FLAG_GOT_MYSTIC_TICKET
vmessage sText_MysticTicket1 vmessage sText_MysticTicket1
waitmessage waitmessage
include/constants/flags.h
+4 -4
View File
@@ -766,8 +766,8 @@
#define FLAG_REVIVED_HELIX 0x2ED #define FLAG_REVIVED_HELIX 0x2ED
#define FLAG_REVIVED_AMBER 0x2EE #define FLAG_REVIVED_AMBER 0x2EE
#define FLAG_GOT_HM06 0x2EF #define FLAG_GOT_HM06 0x2EF
#define FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN 0x2F0 #define FLAG_SHOWN_MYSTIC_TICKET 0x2F0
#define FLAG_SHOWED_AURORATICKET_TO_CAPTAIN 0x2F1 #define FLAG_SHOWN_AURORA_TICKET 0x2F1
#define FLAG_FOUGHT_LUGIA 0x2F2 #define FLAG_FOUGHT_LUGIA 0x2F2
#define FLAG_FOUGHT_HO_OH 0x2F3 #define FLAG_FOUGHT_HO_OH 0x2F3
#define FLAG_OAK_SAW_DEX_COMPLETION 0x2F4 #define FLAG_OAK_SAW_DEX_COMPLETION 0x2F4
@@ -1372,8 +1372,8 @@
#define FLAG_SYS_GOT_BERRY_POUCH (SYS_FLAGS + 0x47) #define FLAG_SYS_GOT_BERRY_POUCH (SYS_FLAGS + 0x47)
#define FLAG_SYS_DEOXYS_AWAKENED (SYS_FLAGS + 0x48) #define FLAG_SYS_DEOXYS_AWAKENED (SYS_FLAGS + 0x48)
#define FLAG_SYS_UNLOCKED_TANOBY_RUINS (SYS_FLAGS + 0x49) #define FLAG_SYS_UNLOCKED_TANOBY_RUINS (SYS_FLAGS + 0x49)
#define FLAG_SYS_GOT_MYSTIC_TICKET (SYS_FLAGS + 0x4A) #define FLAG_ENABLE_SHIP_NAVEL_ROCK (SYS_FLAGS + 0x4A)
#define FLAG_SYS_GOT_AURORA_TICKET (SYS_FLAGS + 0x4B) #define FLAG_ENABLE_SHIP_BIRTH_ISLAND (SYS_FLAGS + 0x4B)
// World Map Flags // World Map Flags
#define FLAG_WORLD_MAP_PALLET_TOWN (SYS_FLAGS + 0x90) #define FLAG_WORLD_MAP_PALLET_TOWN (SYS_FLAGS + 0x90)