diff options
Diffstat (limited to 'data/mystery_event_msg.s')
| -rw-r--r-- | data/mystery_event_msg.s | 74 |
1 files changed, 34 insertions, 40 deletions
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index a62ebb8b8..2eab73984 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,5 +1,6 @@ @ These are event scripts. They should not be moved to C. +#include "constants/global.h" #include "constants/flags.h" #include "constants/moves.h" #include "constants/songs.h" @@ -37,14 +38,13 @@ sText_MysteryGiftStampCard: @ 8488E55 MysteryEventScript_SurfPichu:: @ 8488EB5 setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if FALSE, SurfPichu_GiveIfPossible + vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible gotoram SurfPichu_GiveIfPossible: @ 8488EC4 specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 - vgoto_if TRUE, SurfPichu_FullParty + compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty setflag FLAG_MYSTERY_EVENT_DONE vcall SurfPichu_GiveEgg lock @@ -70,16 +70,16 @@ SurfPichu_GiveEgg: @ 8488EF6 giveegg SPECIES_PICHU setmonobedient VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 - vgoto_if TRUE, SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 - vgoto_if TRUE, SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 - vgoto_if TRUE, SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 - vgoto_if TRUE, SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 - vgoto_if TRUE, SurfPichu_Slot5 + compare VAR_EVENT_PICHU_SLOT, 1 + vgoto_if_eq SurfPichu_Slot1 + compare VAR_EVENT_PICHU_SLOT, 2 + vgoto_if_eq SurfPichu_Slot2 + compare VAR_EVENT_PICHU_SLOT, 3 + vgoto_if_eq SurfPichu_Slot3 + compare VAR_EVENT_PICHU_SLOT, 4 + vgoto_if_eq SurfPichu_Slot4 + compare VAR_EVENT_PICHU_SLOT, 5 + vgoto_if_eq SurfPichu_Slot5 return SurfPichu_Slot1: @ 8488F38 @@ -118,8 +118,8 @@ sText_FullParty: @ 8488FE3 MysteryEventScript_VisitingTrainer:: @ 848903A setvaddress MysteryEventScript_VisitingTrainer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 - vgoto_if TRUE, MysteryEventScript_VisitingTrainerArrived + compare VAR_RESULT, 0 + vgoto_if_eq MysteryEventScript_VisitingTrainerArrived lock faceplayer vmessage sText_MysteryGiftVisitingTrainer @@ -167,12 +167,11 @@ sText_MysteryGiftVisitingTrainer_2: @ 84891B0 MysteryEventScript_BattleCard:: @ 84892B9 setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if TRUE, MysteryEventScript_BattleCardInfo + vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 specialvar VAR_0x8008, Special_BattleCardAction - compare_var_to_value VAR_0x8008, 3 - vgoto_if FALSE, MysteryEventScript_BattleCardInfo + compare VAR_0x8008, 3 + vgoto_if_ne MysteryEventScript_BattleCardInfo lock faceplayer vmessage sText_MysteryGiftBattleCountCard_2 @@ -217,19 +216,17 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 setvaddress MysteryEventScript_AuroraTicket lock faceplayer - checkflag FLAG_GOT_AURORA_TICKET - vgoto_if TRUE, AuroraTicket_Obtained - checkflag FLAG_FOUGHT_DEOXYS - vgoto_if TRUE, AuroraTicket_Obtained + vgoto_if_set FLAG_GOT_AURORA_TICKET, AuroraTicket_Obtained + vgoto_if_set FLAG_FOUGHT_DEOXYS, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if TRUE, AuroraTicket_Obtained + compare VAR_RESULT, TRUE + vgoto_if_eq AuroraTicket_Obtained vmessage sText_AuroraTicket1 waitmessage waitbuttonpress checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if TRUE, AuroraTicket_NoBagSpace + compare VAR_RESULT, FALSE + vgoto_if_eq AuroraTicket_NoBagSpace giveitem ITEM_AURORA_TICKET setflag FLAG_SYS_GOT_AURORA_TICKET setflag FLAG_GOT_AURORA_TICKET @@ -279,21 +276,18 @@ MysteryEventScript_MysticTicket:: @ 8489689 setvaddress MysteryEventScript_MysticTicket lock faceplayer - checkflag FLAG_GOT_MYSTIC_TICKET - vgoto_if TRUE, MysticTicket_Obtained - checkflag FLAG_FOUGHT_LUGIA - vgoto_if TRUE, MysticTicket_Obtained - checkflag FLAG_FOUGHT_HO_OH - vgoto_if TRUE, MysticTicket_Obtained + vgoto_if_set FLAG_GOT_MYSTIC_TICKET, MysticTicket_Obtained + vgoto_if_set FLAG_FOUGHT_LUGIA, MysticTicket_Obtained + vgoto_if_set FLAG_FOUGHT_HO_OH, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if TRUE, MysticTicket_Obtained + compare VAR_RESULT, TRUE + vgoto_if_eq MysticTicket_Obtained vmessage sText_MysticTicket2 waitmessage waitbuttonpress checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if TRUE, MysticTicket_NoBagSpace + compare VAR_RESULT, FALSE + vgoto_if_eq MysticTicket_NoBagSpace giveitem ITEM_MYSTIC_TICKET setflag FLAG_SYS_GOT_MYSTIC_TICKET setflag FLAG_GOT_MYSTIC_TICKET @@ -342,8 +336,8 @@ sText_MysticTicketNoPlace: @ 84897EE MysteryEventScript_AlteringCave:: @ 8489862 setvaddress MysteryEventScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 - compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 - vgoto_if FALSE, MysteryEventScript_AlteringCave_ + compare VAR_ALTERING_CAVE_WILD_SET, 10 + vgoto_if_ne MysteryEventScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 MysteryEventScript_AlteringCave_: @ 848987C lock |