diff options
author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /data/scripts/magma_summit.s | |
parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) |
Merge 'master' with 'origin/master'
Diffstat (limited to 'data/scripts/magma_summit.s')
-rw-r--r-- | data/scripts/magma_summit.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/magma_summit.s b/data/scripts/magma_summit.s index 0992a62c0..ac71b038f 100644 --- a/data/scripts/magma_summit.s +++ b/data/scripts/magma_summit.s @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 msgbox UnknownString_81B5131, 6 .else - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 + trainerbattle 0, OPPONENT_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, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F msgbox UnknownString_81B51B5, 6 .else - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB + trainerbattle 0, OPPONENT_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, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 msgbox UnknownString_81B5248, 6 .else - trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 + trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 .endif end |