diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
| commit | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (patch) | |
| tree | 65b32493ea3eaef107ac73f804d23563da0f9ada /data/scripts/mevent_pichu.inc | |
| parent | 949509aade2627ded031669c296453c3d0ea9e59 (diff) | |
| parent | 026e1108b26f4ce5cea362997135bd8efc7cb28a (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'data/scripts/mevent_pichu.inc')
| -rw-r--r-- | data/scripts/mevent_pichu.inc | 12 |
1 files changed, 6 insertions, 6 deletions
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 |