From 37bd93ec6c3890048e49bada3e41127fd3fcea4f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 18:19:18 -0500 Subject: Rename mystery event msg scripts --- data/scripts/mevent_pichu.inc | 79 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 data/scripts/mevent_pichu.inc (limited to 'data/scripts/mevent_pichu.inc') diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc new file mode 100644 index 000000000..4df317564 --- /dev/null +++ b/data/scripts/mevent_pichu.inc @@ -0,0 +1,79 @@ +MysteryEventScript_SurfPichu:: @ 8674D3D + setvaddress MysteryEventScript_SurfPichu + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_ne SurfPichu_GiveIfPossible + returnram + +SurfPichu_GiveIfPossible: @ 8674D4C + specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount + compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty + setflag FLAG_MYSTERY_EVENT_DONE + vcall SurfPichu_GiveEgg + lock + faceplayer + vmessage sText_MysteryGiftEgg + waitmessage + waitbuttonpress + playfanfare MUS_FANFA4 + waitfanfare + release + end + +SurfPichu_FullParty: @ 8674D73 + lock + faceplayer + vmessage sText_FullParty + waitmessage + waitbuttonpress + release + end + +SurfPichu_GiveEgg: @ 8674D7E + giveegg SPECIES_PICHU + setmonobedient VAR_EVENT_PICHU_SLOT + setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER + compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + vgoto_if_eq SurfPichu_Slot1 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + vgoto_if_eq SurfPichu_Slot2 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + vgoto_if_eq SurfPichu_Slot3 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + vgoto_if_eq SurfPichu_Slot4 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + vgoto_if_eq SurfPichu_Slot5 + return + +SurfPichu_Slot1: @ 8674DC0 + setmonmove 1, 2, MOVE_SURF + return + +SurfPichu_Slot2:: @ 8674DC6 + setmonmove 2, 2, MOVE_SURF + return + +SurfPichu_Slot3: @ 8674DCC + setmonmove 3, 2, MOVE_SURF + return + +SurfPichu_Slot4: @ 8674DD2 + setmonmove 4, 2, MOVE_SURF + return + +SurfPichu_Slot5: @ 8674DD8 + setmonmove 5, 2, MOVE_SURF + return + +sText_MysteryGiftEgg: + .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: + .string "Oh, your party appears to be full.\p" + .string "Please come see me after storing\n" + .string "a POKéMON on a PC.$" -- cgit v1.2.3 From 9e08cfe55f632fd749ce64c0e54eb93bd10926dc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 18 Dec 2019 19:22:39 -0500 Subject: Remove uses of compare_var_to --- data/scripts/mevent_pichu.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/mevent_pichu.inc') diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc index 4df317564..4f5c739af 100644 --- a/data/scripts/mevent_pichu.inc +++ b/data/scripts/mevent_pichu.inc @@ -6,7 +6,7 @@ MysteryEventScript_SurfPichu:: @ 8674D3D SurfPichu_GiveIfPossible: @ 8674D4C specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE vgoto_if_eq SurfPichu_FullParty setflag FLAG_MYSTERY_EVENT_DONE vcall SurfPichu_GiveEgg @@ -33,15 +33,15 @@ SurfPichu_GiveEgg: @ 8674D7E giveegg SPECIES_PICHU setmonobedient VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + compare VAR_EVENT_PICHU_SLOT, 1 vgoto_if_eq SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + compare VAR_EVENT_PICHU_SLOT, 2 vgoto_if_eq SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + compare VAR_EVENT_PICHU_SLOT, 3 vgoto_if_eq SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + compare VAR_EVENT_PICHU_SLOT, 4 vgoto_if_eq SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + compare VAR_EVENT_PICHU_SLOT, 5 vgoto_if_eq SurfPichu_Slot5 return -- cgit v1.2.3 From f2e7b1507e564ba3b6b027a17aeeec2f89fba8c8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 11 Jan 2020 12:02:58 -0500 Subject: Port some macro/script fixes from pokefirered --- data/scripts/mevent_pichu.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data/scripts/mevent_pichu.inc') diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc index 4f5c739af..cc947e396 100644 --- a/data/scripts/mevent_pichu.inc +++ b/data/scripts/mevent_pichu.inc @@ -1,7 +1,6 @@ MysteryEventScript_SurfPichu:: @ 8674D3D setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_ne SurfPichu_GiveIfPossible + vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible returnram SurfPichu_GiveIfPossible: @ 8674D4C -- cgit v1.2.3