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_chimney.s | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'data/scripts/magma_chimney.s')
| -rw-r--r-- | data/scripts/magma_chimney.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/magma_chimney.s b/data/scripts/magma_chimney.s index 522e3887f..a2f4f67b7 100644 --- a/data/scripts/magma_chimney.s +++ b/data/scripts/magma_chimney.s @@ -48,9 +48,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B38B3, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 + trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 .else - trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 + trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE msgbox MtChimney_Text_1B30C2, 4 |