summaryrefslogtreecommitdiff
path: root/data/scripts/maps/MtChimney.s
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/MtChimney.s')
-rw-r--r--data/scripts/maps/MtChimney.s18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.s
index 4c6f90d9d..b7a43328b 100644
--- a/data/scripts/maps/MtChimney.s
+++ b/data/scripts/maps/MtChimney.s
@@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107
MtChimney_EventScript_15D110:: @ 815D110
.ifdef SAPPHIRE
- trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
+ trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
msgbox MtChimney_Text_1B3239, 6
.else
- trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
+ trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
msgbox MtChimney_Text_1B3C07, 6
.endif
end
MtChimney_EventScript_15D127:: @ 815D127
.ifdef SAPPHIRE
- trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
+ trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
msgbox MtChimney_Text_1B338D, 6
.else
- trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
+ trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
msgbox MtChimney_Text_1B3D3D, 6
.endif
end
@@ -439,7 +439,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA
end
MtChimney_EventScript_15D1E3:: @ 815D1E3
- trainerbattle 0, 313, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8
+ trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8
specialval RESULT, 57
compare RESULT, 1
jumpeq MtChimney_EventScript_15D20A
@@ -447,21 +447,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3
end
MtChimney_EventScript_15D20A:: @ 815D20A
- trainerbattle 5, 313, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD
+ trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD
msgbox MtChimney_Text_195AD9, 6
end
MtChimney_EventScript_15D221:: @ 815D221
- trainerbattle 0, 124, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F
+ trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F
msgbox MtChimney_Text_195B84, 6
end
MtChimney_EventScript_15D238:: @ 815D238
- trainerbattle 0, 125, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9
+ trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9
msgbox MtChimney_Text_195C31, 6
end
MtChimney_EventScript_15D24F:: @ 815D24F
- trainerbattle 0, 126, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F
+ trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F
msgbox MtChimney_Text_195D5C, 6
end