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_chimney.inc | |
| parent | 300f2274f381b5a700b6a67847c3b9f97c67a541 (diff) | |
| parent | c2218920d57c883dc83078c2d1d7cf3af82babbb (diff) | |
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'data/scripts/magma_chimney.inc')
| -rw-r--r-- | data/scripts/magma_chimney.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index ed81e6628..daa8c96db 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B38B3, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 .else - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE msgbox MtChimney_Text_1B30C2, 4 |