summaryrefslogtreecommitdiff
path: root/data/maps/Route131/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route131/scripts.inc')
-rw-r--r--data/maps/Route131/scripts.inc26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index 6aa6868f3..fb69bece5 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -1,5 +1,5 @@
Route131_MapScripts:: @ 815243E
- map_script 3, Route131_MapScript1_152444
+ map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_152444
.byte 0
Route131_MapScript1_152444:: @ 8152444
@@ -11,31 +11,31 @@ Route131_EventScript_15244E:: @ 815244E
return
Route131_EventScript_152452:: @ 8152452
- trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8
- msgbox Route131_Text_1C262A, 6
+ trainerbattle_single TRAINER_RICHARD, Route131_Text_1C25B3, Route131_Text_1C25F8
+ msgbox Route131_Text_1C262A, MSGBOX_AUTOCLOSE
end
Route131_EventScript_152469:: @ 8152469
- trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F
- msgbox Route131_Text_1C2726, 6
+ trainerbattle_single TRAINER_HERMAN, Route131_Text_1C26B9, Route131_Text_1C271F
+ msgbox Route131_Text_1C2726, MSGBOX_AUTOCLOSE
end
Route131_EventScript_152480:: @ 8152480
- trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4
- msgbox Route131_Text_1C27CF, 6
+ trainerbattle_single TRAINER_SUSIE, Route131_Text_1C2774, Route131_Text_1C27A4
+ msgbox Route131_Text_1C27CF, MSGBOX_AUTOCLOSE
end
Route131_EventScript_152497:: @ 8152497
- trainerbattle 0, TRAINER_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883
- msgbox Route131_Text_1C2898, 6
+ trainerbattle_single TRAINER_KARA, Route131_Text_1C284A, Route131_Text_1C2883
+ msgbox Route131_Text_1C2898, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1524AE:: @ 81524AE
- trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2
- msgbox Route131_Text_1C2950, 6
+ trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2
+ msgbox Route131_Text_1C2950, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1524C9:: @ 81524C9
- trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA
- msgbox Route131_Text_1C2A5D, 6
+ trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA
+ msgbox Route131_Text_1C2A5D, MSGBOX_AUTOCLOSE
end