diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
| commit | bbe876153c2a0903a30b37734874bf63ca6d8a10 (patch) | |
| tree | 7efa03650e784e7ff6ac7d479b5315194a4081fb /data/scripts/magma_summit.inc | |
| parent | 300f2274f381b5a700b6a67847c3b9f97c67a541 (diff) | |
| parent | c2218920d57c883dc83078c2d1d7cf3af82babbb (diff) | |
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'data/scripts/magma_summit.inc')
| -rw-r--r-- | data/scripts/magma_summit.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc index ac71b038f..0992a62c0 100644 --- a/data/scripts/magma_summit.inc +++ b/data/scripts/magma_summit.inc @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 msgbox UnknownString_81B5131, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 msgbox MtPyre_Summit_Text_1B5D6D, 6 .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F msgbox UnknownString_81B51B5, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB msgbox MtPyre_Summit_Text_1B5DF1, 6 .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 msgbox UnknownString_81B5248, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 .endif end |