diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-01 15:25:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 15:25:22 -0400 |
| commit | cd4462f58cce785f408af26a7a3b11ad08575a5a (patch) | |
| tree | 2a35a97aa4fb1eae38861178967e6806b4f00e00 /data | |
| parent | 471608b56abbdf70a452896a0d895ffa5b4b06f9 (diff) | |
| parent | e006569719969870ce480916a23cfd157fdcf454 (diff) | |
Merge pull request #474 from lioniac/master
Multiple renamings and removed some orphaned functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/mystery_event_msg.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 8ffbf788d..c88b84cc6 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -38,14 +38,14 @@ sText_MysteryGiftStampCard: @ 8488E55 MysteryEventScript_SurfPichu:: @ 8488EB5 setvaddress MysteryEventScript_SurfPichu - vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible + vgoto_if_unset FLAG_MYSTERY_GIFT_DONE, SurfPichu_GiveIfPossible gotoram SurfPichu_GiveIfPossible: @ 8488EC4 specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE vgoto_if_eq SurfPichu_FullParty - setflag FLAG_MYSTERY_EVENT_DONE + setflag FLAG_MYSTERY_GIFT_DONE vcall SurfPichu_GiveEgg lock faceplayer @@ -167,7 +167,7 @@ sText_MysteryGiftVisitingTrainer_2: @ 84891B0 MysteryEventScript_BattleCard:: @ 84892B9 setvaddress MysteryEventScript_BattleCard - vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo + vgoto_if_set FLAG_MYSTERY_GIFT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 specialvar VAR_0x8008, BattleCardAction compare VAR_0x8008, 3 @@ -179,7 +179,7 @@ MysteryEventScript_BattleCard:: @ 84892B9 waitbuttonpress giveitem ITEM_POTION release - setflag FLAG_MYSTERY_EVENT_DONE + setflag FLAG_MYSTERY_GIFT_DONE end MysteryEventScript_BattleCardInfo: @ 84892F6 |