diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
| commit | e92cc7752b5934d7501c5027057a6b7c52601bd7 (patch) | |
| tree | 85150713e1d8561415a54a45221c5b1975c91428 /data/scripts/mevent_battle_card.inc | |
| parent | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (diff) | |
| parent | 736f3bbbe0d1685474364a68038554f024bff62e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'data/scripts/mevent_battle_card.inc')
| -rw-r--r-- | data/scripts/mevent_battle_card.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc index 77f9a9b24..70462bdd9 100644 --- a/data/scripts/mevent_battle_card.inc +++ b/data/scripts/mevent_battle_card.inc @@ -1,7 +1,6 @@ MysteryEventScript_BattleCard:: @ 867513C setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_eq MysteryEventScript_BattleCardInfo + vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON specialvar VAR_0x8008, GetMysteryEventCardVal compare VAR_0x8008, REQUIRED_CARD_BATTLES @@ -11,7 +10,7 @@ MysteryEventScript_BattleCard:: @ 867513C vmessage sText_MysteryGiftBattleCountCard_WonPrize waitmessage waitbuttonpress - giveitem_std ITEM_POTION + giveitem ITEM_POTION release setflag FLAG_MYSTERY_EVENT_DONE end |