dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up mystery event msg

Browse Source
This commit is contained in:
GriffinR
2019-11-05 15:08:07 -05:00
committed by huderlem
parent 481c09fcad
commit 58dcd6d99d
6 changed files with 215 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+8
View File
@@ -1630,6 +1630,14 @@
call_if 5, \dest call_if 5, \dest
.endm .endm
.macro vgoto_if_eq dest:req
vgoto_if 1, \dest
.endm
.macro vgoto_if_ne dest:req
vgoto_if 0, \dest
.endm
.macro switch var:req .macro switch var:req
copyvar VAR_0x8000, \var copyvar VAR_0x8000, \var
.endm .endm
data/mystery_event_msg.s
+175 -88
View File
@@ -1,6 +1,8 @@
#include "constants/global.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/map_scripts.h" #include "constants/map_scripts.h"
#include "constants/mevent.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
#include "constants/songs.h" #include "constants/songs.h"
@@ -16,10 +18,10 @@
MysteryEventScript_StampCard:: @ 8674CB0 MysteryEventScript_StampCard:: @ 8674CB0
setvaddress MysteryEventScript_StampCard setvaddress MysteryEventScript_StampCard
setorcopyvar VAR_RESULT, 1 setorcopyvar VAR_RESULT, GET_MAX_STAMPS
specialvar VAR_0x8008, sub_813986C specialvar VAR_0x8008, GetMysteryEventCardVal
setorcopyvar VAR_RESULT, 0 setorcopyvar VAR_RESULT, GET_NUM_STAMPS
specialvar VAR_0x8009, sub_813986C specialvar VAR_0x8009, GetMysteryEventCardVal
subvar VAR_0x8008, VAR_0x8009 subvar VAR_0x8008, VAR_0x8009
buffernumberstring 0, VAR_0x8008 buffernumberstring 0, VAR_0x8008
lock lock
@@ -31,18 +33,21 @@ MysteryEventScript_StampCard:: @ 8674CB0
end end
sText_MysteryGiftStampCard: sText_MysteryGiftStampCard:
.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" .string "Thank you for using the STAMP CARD\n"
.string "System.\p"
.string "You have {STR_VAR_1} more to collect to\n"
.string "fill your STAMP CARD.$"
MysteryEventScript_SurfPichu:: @ 8674D3D MysteryEventScript_SurfPichu:: @ 8674D3D
setvaddress MysteryEventScript_SurfPichu setvaddress MysteryEventScript_SurfPichu
checkflag FLAG_MYSTERY_EVENT_DONE checkflag FLAG_MYSTERY_EVENT_DONE
vgoto_if 0, SurfPichu_GiveIfPossible vgoto_if_ne SurfPichu_GiveIfPossible
returnram returnram
SurfPichu_GiveIfPossible: @ 8674D4C SurfPichu_GiveIfPossible: @ 8674D4C
specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE
vgoto_if 1, SurfPichu_FullParty vgoto_if_eq SurfPichu_FullParty
setflag FLAG_MYSTERY_EVENT_DONE setflag FLAG_MYSTERY_EVENT_DONE
vcall SurfPichu_GiveEgg vcall SurfPichu_GiveEgg
lock lock
@@ -69,15 +74,15 @@ SurfPichu_GiveEgg: @ 8674D7E
setmonobedient VAR_EVENT_PICHU_SLOT setmonobedient VAR_EVENT_PICHU_SLOT
setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
vgoto_if 1, SurfPichu_Slot1 vgoto_if_eq SurfPichu_Slot1
compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
vgoto_if 1, SurfPichu_Slot2 vgoto_if_eq SurfPichu_Slot2
compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
vgoto_if 1, SurfPichu_Slot3 vgoto_if_eq SurfPichu_Slot3
compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
vgoto_if 1, SurfPichu_Slot4 vgoto_if_eq SurfPichu_Slot4
compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
vgoto_if 1, SurfPichu_Slot5 vgoto_if_eq SurfPichu_Slot5
return return
SurfPichu_Slot1: @ 8674DC0 SurfPichu_Slot1: @ 8674DC0
@@ -101,19 +106,26 @@ SurfPichu_Slot5: @ 8674DD8
return return
sText_MysteryGiftEgg: sText_MysteryGiftEgg:
.string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "From the POKéMON CENTER we\n"
.string "have a gift--a POKéMON EGG!\p"
.string "Please raise it with love and\n"
.string "kindness.$"
sText_FullParty: sText_FullParty:
.string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" .string "Oh, your party appears to be full.\p"
.string "Please come see me after storing\n"
.string "a POKéMON on a PC.$"
MysteryEventScript_VisitingTrainer:: @ 8674EC1 MysteryEventScript_VisitingTrainer:: @ 8674EC1
setvaddress MysteryEventScript_VisitingTrainer setvaddress MysteryEventScript_VisitingTrainer
special ValidateEReaderTrainer special ValidateEReaderTrainer
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
vgoto_if 1, MysteryEventScript_VisitingTrainerArrived vgoto_if_eq MysteryEventScript_VisitingTrainerArrived
lock lock
faceplayer faceplayer
vmessage sText_MysteryGiftVisitingTrainer vmessage sText_MysteryGiftVisitingTrainerInstructions
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
@@ -122,29 +134,51 @@ MysteryEventScript_VisitingTrainer:: @ 8674EC1
MysteryEventScript_VisitingTrainerArrived: @ 8674EDF MysteryEventScript_VisitingTrainerArrived: @ 8674EDF
lock lock
faceplayer faceplayer
vmessage sText_MysteryGiftVisitingTrainer_2 vmessage sText_MysteryGiftVisitingTrainerArrived
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
sText_MysteryGiftVisitingTrainer: sText_MysteryGiftVisitingTrainerInstructions:
.string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "By holding this WONDER CARD, you\n"
.string "may take part in a survey at a\l"
.string "POKéMON MART.\p"
.string "Use these surveys to invite\n"
.string "TRAINERS to SOOTOPOLIS CITY.\p"
.string "…Let me give you a secret\n"
.string "password for a survey:\p"
.string "“GIVE ME\n"
.string "AWESOME TRAINER”\p"
.string "Write that in on a survey and send\n"
.string "it to the WIRELESS\l"
.string "COMMUNICATION SYSTEM.$"
sText_MysteryGiftVisitingTrainer_2: sText_MysteryGiftVisitingTrainerArrived:
.string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "A TRAINER has arrived in\n"
.string "SOOTOPOLIS CITY looking for you.\p"
.string "We hope you will enjoy\n"
.string "battling the visiting TRAINER.\p"
.string "You may invite other TRAINERS by\n"
.string "entering other passwords.\p"
.string "Try looking for other passwords\n"
.string "that may work.$"
MysteryEventScript_BattleCard:: @ 867513C MysteryEventScript_BattleCard:: @ 867513C
setvaddress MysteryEventScript_BattleCard setvaddress MysteryEventScript_BattleCard
checkflag FLAG_MYSTERY_EVENT_DONE checkflag FLAG_MYSTERY_EVENT_DONE
vgoto_if 1, MysteryEventScript_BattleCardInfo vgoto_if_eq MysteryEventScript_BattleCardInfo
setorcopyvar VAR_RESULT, 2 setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
specialvar VAR_0x8008, sub_813986C specialvar VAR_0x8008, GetMysteryEventCardVal
compare_var_to_value VAR_0x8008, 3 compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES
vgoto_if 0, MysteryEventScript_BattleCardInfo vgoto_if_ne MysteryEventScript_BattleCardInfo
lock lock
faceplayer faceplayer
vmessage sText_MysteryGiftBattleCountCard_2 vmessage sText_MysteryGiftBattleCountCard_WonPrize
waitmessage waitmessage
waitbuttonpress waitbuttonpress
giveitem_std ITEM_POTION giveitem_std ITEM_POTION
@@ -162,122 +196,157 @@ MysteryEventScript_BattleCardInfo: @ 8675179
end end
sText_MysteryGiftBattleCountCard: sText_MysteryGiftBattleCountCard:
.string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "Your BATTLE COUNT CARD keeps\n"
.string "track of your battle record against\l"
.string "TRAINERS with the same CARD.\p"
.string "Look for and battle TRAINERS who\n"
.string "have the same CARD as you.\p"
.string "You may check the overall rankings\n"
.string "by reading the NEWS.\p"
.string "Please do give it a try!$"
sText_MysteryGiftBattleCountCard_2: sText_MysteryGiftBattleCountCard_WonPrize:
.string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "Congratulations!\p"
.string "You have won a prize for winning\n"
.string "three battles!\p"
.string "We hope you will be inspired to\n"
.string "battle some more.$"
MysteryEventScript_AuroraTicket:: @ 867533C MysteryEventScript_AuroraTicket:: @ 867533C
setvaddress MysteryEventScript_AuroraTicket setvaddress MysteryEventScript_AuroraTicket
lock lock
faceplayer faceplayer
checkflag FLAG_RECEIVED_AURORA_TICKET checkflag FLAG_RECEIVED_AURORA_TICKET
vgoto_if 1, AuroraTicket_Obtained vgoto_if_eq AuroraTicket_Obtained
checkflag FLAG_BATTLED_DEOXYS checkflag FLAG_BATTLED_DEOXYS
vgoto_if 1, AuroraTicket_Obtained vgoto_if_eq AuroraTicket_Obtained
checkitem ITEM_AURORA_TICKET, 1 checkitem ITEM_AURORA_TICKET, 1
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, TRUE
vgoto_if 1, AuroraTicket_Obtained vgoto_if_eq AuroraTicket_Obtained
vmessage sText_AuroraTicket1 vmessage sText_AuroraTicketForYou
waitmessage waitmessage
waitbuttonpress waitbuttonpress
checkitemspace ITEM_AURORA_TICKET, 1 checkitemspace ITEM_AURORA_TICKET, 1
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, FALSE
vgoto_if 1, AuroraTicket_NoBagSpace vgoto_if_eq AuroraTicket_NoBagSpace
giveitem_std ITEM_AURORA_TICKET giveitem_std ITEM_AURORA_TICKET
setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
setflag FLAG_RECEIVED_AURORA_TICKET setflag FLAG_RECEIVED_AURORA_TICKET
vmessage sText_AuroraTicket2 vmessage sText_AuroraTicketUseAtPort
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
AuroraTicket_NoBagSpace: @ 8675397 AuroraTicket_NoBagSpace: @ 8675397
vmessage sText_AuroraTicketNoPlace vmessage sText_AuroraTicketBagFull
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
AuroraTicket_Obtained: @ 86753A0 AuroraTicket_Obtained: @ 86753A0
vmessage sText_AuroraTicketGot vmessage sText_AuroraTicketThankYou
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
sText_AuroraTicket1: sText_AuroraTicketForYou:
.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "You must be {PLAYER}.\n"
.string "There is a ticket here for you.$"
sText_AuroraTicket2: sText_AuroraTicketUseAtPort:
.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" .string "It appears to be for use at the\n"
.string "LILYCOVE CITY port.\p"
.string "Why not give it a try and see what\n"
.string "it is about?$"
sText_AuroraTicketGot: sText_AuroraTicketThankYou:
.string "Thank you for using the MYSTERY\nGIFT System.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.$"
sText_AuroraTicketNoPlace: sText_AuroraTicketBagFull:
.string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" .string "Oh, I'm sorry, {PLAYER}.\n"
.string "Your BAG's KEY ITEMS POCKET is full.\p"
.string "Please store something on your PC,\n"
.string "then come back for this.$"
MysteryEventScript_MysticTicket:: @ 867550B MysteryEventScript_MysticTicket:: @ 867550B
setvaddress MysteryEventScript_MysticTicket setvaddress MysteryEventScript_MysticTicket
lock lock
faceplayer faceplayer
checkflag FLAG_RECEIVED_MYSTIC_TICKET checkflag FLAG_RECEIVED_MYSTIC_TICKET
vgoto_if 1, MysticTicket_Obtained vgoto_if_eq MysticTicket_Obtained
checkflag FLAG_CAUGHT_LUGIA checkflag FLAG_CAUGHT_LUGIA
vgoto_if 1, MysticTicket_Obtained vgoto_if_eq MysticTicket_Obtained
checkflag FLAG_CAUGHT_HO_OH checkflag FLAG_CAUGHT_HO_OH
vgoto_if 1, MysticTicket_Obtained vgoto_if_eq MysticTicket_Obtained
checkitem ITEM_MYSTIC_TICKET, 1 checkitem ITEM_MYSTIC_TICKET, 1
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, TRUE
vgoto_if 1, MysticTicket_Obtained vgoto_if_eq MysticTicket_Obtained
vmessage sText_MysticTicket2 vmessage sText_MysticTicketForYou
waitmessage waitmessage
waitbuttonpress waitbuttonpress
checkitemspace ITEM_MYSTIC_TICKET, 1 checkitemspace ITEM_MYSTIC_TICKET, 1
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, FALSE
vgoto_if 1, MysticTicket_NoBagSpace vgoto_if_eq MysticTicket_NoBagSpace
giveitem_std ITEM_MYSTIC_TICKET giveitem_std ITEM_MYSTIC_TICKET
setflag FLAG_ENABLE_SHIP_NAVEL_ROCK setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
setflag FLAG_RECEIVED_MYSTIC_TICKET setflag FLAG_RECEIVED_MYSTIC_TICKET
vmessage sText_MysticTicket1 vmessage sText_MysticTicketUseAtPort
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
MysticTicket_NoBagSpace: @ 867556F MysticTicket_NoBagSpace: @ 867556F
vmessage sText_MysticTicketNoPlace vmessage sText_MysticTicketBagFull
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
MysticTicket_Obtained: @ 8675578 MysticTicket_Obtained: @ 8675578
vmessage sText_MysticTicketGot vmessage sText_MysticTicketThankYou
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
sText_MysticTicket2: sText_MysticTicketForYou:
.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "You must be {PLAYER}.\n"
.string "There is a ticket here for you.$"
sText_MysticTicket1: sText_MysticTicketUseAtPort:
.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" .string "It appears to be for use at the\n"
.string "LILYCOVE CITY port.\p"
.string "Why not give it a try and see what\n"
.string "it is about?$"
sText_MysticTicketGot: sText_MysticTicketThankYou:
.string "Thank you for using the MYSTERY\nGIFT System.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.$"
sText_MysticTicketNoPlace: sText_MysticTicketBagFull:
.string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" .string "Oh, I'm sorry, {PLAYER}.\n"
.string "Your BAG's KEY ITEMS POCKET is full.\p"
.string "Please store something on your PC,\n"
.string "then come back for this.$"
MysteryEventScript_AlteringCave:: @ 86756E3 MysteryEventScript_AlteringCave:: @ 86756E3
setvaddress MysteryEventScript_AlteringCave setvaddress MysteryEventScript_AlteringCave
addvar VAR_ALTERING_CAVE_WILD_SET, 1 addvar VAR_ALTERING_CAVE_WILD_SET, 1
compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
vgoto_if 0, MysteryEventScript_AlteringCave_ vgoto_if_ne MysteryEventScript_AlteringCave_
setvar VAR_ALTERING_CAVE_WILD_SET, 0 setvar VAR_ALTERING_CAVE_WILD_SET, 0
MysteryEventScript_AlteringCave_: @ 86756FD MysteryEventScript_AlteringCave_: @ 86756FD
lock lock
@@ -289,56 +358,74 @@ MysteryEventScript_AlteringCave_: @ 86756FD
end end
sText_MysteryGiftAlteringCave:: sText_MysteryGiftAlteringCave::
.string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "There appears to be a rumor about\n"
.string "rare POKéMON sightings.\p"
.string "The sightings reportedly came from\n"
.string "the ALTERING CAVE on ROUTE 103.\p"
.string "Perhaps it would be worthwhile for\n"
.string "you to investigate this rumor.$"
MysteryEventScript_OldSeaMap:: @ 86757F4 MysteryEventScript_OldSeaMap:: @ 86757F4
setvaddress MysteryEventScript_OldSeaMap setvaddress MysteryEventScript_OldSeaMap
lock lock
faceplayer faceplayer
checkflag FLAG_RECEIVED_OLD_SEA_MAP checkflag FLAG_RECEIVED_OLD_SEA_MAP
vgoto_if 1, OldSeaMap_Obtained vgoto_if_eq OldSeaMap_Obtained
checkflag FLAG_CAUGHT_MEW checkflag FLAG_CAUGHT_MEW
vgoto_if 1, OldSeaMap_Obtained vgoto_if_eq OldSeaMap_Obtained
checkitem ITEM_OLD_SEA_MAP, 1 checkitem ITEM_OLD_SEA_MAP, 1
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, TRUE
vgoto_if 1, OldSeaMap_Obtained vgoto_if_eq OldSeaMap_Obtained
vmessage sText_MysteryGiftOldSeaMap vmessage sText_MysteryGiftOldSeaMapForYou
waitmessage waitmessage
waitbuttonpress waitbuttonpress
checkitemspace ITEM_OLD_SEA_MAP, 1 checkitemspace ITEM_OLD_SEA_MAP, 1
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, FALSE
vgoto_if 1, OldSeaMap_NoBagSpace vgoto_if_eq OldSeaMap_NoBagSpace
giveitem_std ITEM_OLD_SEA_MAP giveitem_std ITEM_OLD_SEA_MAP
setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
setflag FLAG_RECEIVED_OLD_SEA_MAP setflag FLAG_RECEIVED_OLD_SEA_MAP
vmessage sText_MysteryGiftOldSeaMap_1 vmessage sText_MysteryGiftOldSeaMapUseAtPort
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
OldSeaMap_NoBagSpace: @ 867584F OldSeaMap_NoBagSpace: @ 867584F
vmessage sText_MysteryGiftOldSeaMap_3 vmessage sText_MysteryGiftOldSeaMapBagFull
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
OldSeaMap_Obtained: @ 8675858 OldSeaMap_Obtained: @ 8675858
vmessage sText_MysteryGiftOldSeaMap_2 vmessage sText_MysteryGiftOldSeaMapThankYou
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
sText_MysteryGiftOldSeaMap: sText_MysteryGiftOldSeaMapForYou:
.string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "Let me confirm--you are {PLAYER}?\p"
.string "We received this OLD SEA MAP\n"
.string "addressed to you.$"
sText_MysteryGiftOldSeaMap_1: sText_MysteryGiftOldSeaMapUseAtPort:
.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" .string "It appears to be for use at the\n"
.string "LILYCOVE CITY port.\p"
.string "Why not give it a try and see what\n"
.string "it is about?$"
sText_MysteryGiftOldSeaMap_2: sText_MysteryGiftOldSeaMapThankYou:
.string "Thank you for using the MYSTERY\nGIFT System.$" .string "Thank you for using the MYSTERY\n"
.string "GIFT System.$"
sText_MysteryGiftOldSeaMap_3: sText_MysteryGiftOldSeaMapBagFull:
.string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" .string "Oh, I'm sorry, {PLAYER}.\n"
.string "Your BAG's KEY ITEMS POCKET is full.\p"
.string "Please store something on your PC,\n"
.string "then come back for this.$"
data/specials.inc
+1 -1
View File
@@ -400,7 +400,7 @@ gSpecials:: @ 81DBA64
def_special ClearQuizLadyQuestionAndAnswer def_special ClearQuizLadyQuestionAndAnswer
def_special QuizLadySetCustomQuestion def_special QuizLadySetCustomQuestion
def_special QuizLadyTakePrizeForCustomQuiz def_special QuizLadyTakePrizeForCustomQuiz
def_special sub_813986C def_special GetMysteryEventCardVal
def_special QuizLadyRecordCustomQuizData def_special QuizLadyRecordCustomQuizData
def_special QuizLadySetWaitingForChallenger def_special QuizLadySetWaitingForChallenger
def_special BufferQuizCorrectAnswer def_special BufferQuizCorrectAnswer
include/constants/mevent.h
+15
View File
@@ -0,0 +1,15 @@
#ifndef GUARD_CONSTANTS_MEVENT_H
#define GUARD_CONSTANTS_MEVENT_H
// mevent2.c
#define GET_NUM_STAMPS 0
#define GET_MAX_STAMPS 1
#define GET_CARD_BATTLES_WON 2
#define GET_NUM_STAMPS_INTERNAL 3
#define GET_MAX_STAMPS_INTERNAL 4
#define GET_CARD_BATTLES_WON_INTERNAL 0
#define REQUIRED_CARD_BATTLES 3
#endif //GUARD_MEVENT_H
src/field_specials.c
+10 -9
View File
@@ -55,6 +55,7 @@
#include "constants/heal_locations.h" #include "constants/heal_locations.h"
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/mevent.h"
#include "constants/tv.h" #include "constants/tv.h"
#include "constants/script_menu.h" #include "constants/script_menu.h"
#include "constants/songs.h" #include "constants/songs.h"
@@ -1655,19 +1656,19 @@ void BufferLottoTicketNumber(void)
} }
} }
u16 sub_813986C(void) u16 GetMysteryEventCardVal(void)
{ {
switch (gSpecialVar_Result) switch (gSpecialVar_Result)
{ {
case 0: case GET_NUM_STAMPS:
return mevent_081445C0(3); return mevent_081445C0(GET_NUM_STAMPS_INTERNAL);
case 1: case GET_MAX_STAMPS:
return mevent_081445C0(4); return mevent_081445C0(GET_MAX_STAMPS_INTERNAL);
case 2: case GET_CARD_BATTLES_WON:
return mevent_081445C0(0); return mevent_081445C0(GET_CARD_BATTLES_WON_INTERNAL);
case 3: case 3: // Never occurs
return mevent_081445C0(1); return mevent_081445C0(1);
case 4: case 4: // Never occurs
return mevent_081445C0(2); return mevent_081445C0(2);
default: default:
return 0; return 0;
src/mevent2.c
+6 -5
View File
@@ -9,6 +9,7 @@
#include "string_util.h" #include "string_util.h"
#include "new_game.h" #include "new_game.h"
#include "mevent.h" #include "mevent.h"
#include "constants/mevent.h"
#include "constants/species.h" #include "constants/species.h"
static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE; static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE;
@@ -493,7 +494,7 @@ u16 mevent_081445C0(u32 command)
{ {
switch (command) switch (command)
{ {
case 0: case GET_CARD_BATTLES_WON_INTERNAL:
{ {
struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
if (data->unk_08_0 == 2) if (data->unk_08_0 == 2)
@@ -503,7 +504,7 @@ u16 mevent_081445C0(u32 command)
} }
break; break;
} }
case 1: case 1: // Never occurs
{ {
struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
if (data->unk_08_0 == 2) if (data->unk_08_0 == 2)
@@ -513,7 +514,7 @@ u16 mevent_081445C0(u32 command)
} }
break; break;
} }
case 2: case 2: // Never occurs
{ {
struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
if (data->unk_08_0 == 2) if (data->unk_08_0 == 2)
@@ -523,14 +524,14 @@ u16 mevent_081445C0(u32 command)
} }
break; break;
} }
case 3: case GET_NUM_STAMPS_INTERNAL:
{ {
struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
if (data->unk_08_0 == 1) if (data->unk_08_0 == 1)
return sub_801B4CC(); return sub_801B4CC();
break; break;
} }
case 4: case GET_MAX_STAMPS_INTERNAL:
{ {
struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
if (data->unk_08_0 == 1) if (data->unk_08_0 == 1)