summaryrefslogtreecommitdiff
path: root/data/maps/Route112/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route112/scripts.inc')
-rw-r--r--data/maps/Route112/scripts.inc36
1 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index ae03b2248..9bf458099 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -1,60 +1,60 @@
Route112_MapScripts:: @ 8150502
- map_script 3, Route112_MapScript1_150508
+ map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_150508
.byte 0
Route112_MapScript1_150508:: @ 8150508
- call Route112_EventScript_1A0196
+ call Common_EventScript_SetupEvilTeamGfxIds
setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
end
Route112_EventScript_150513:: @ 8150513
- msgbox Route112_Text_16FDF0, 2
+ msgbox Route112_Text_16FDF0, MSGBOX_NPC
end
Route112_EventScript_15051C:: @ 815051C
- msgbox Route112_Text_16FE3E, 2
+ msgbox Route112_Text_16FE3E, MSGBOX_NPC
end
Route112_EventScript_150525:: @ 8150525
- msgbox Route112_Text_16FEED, 3
+ msgbox Route112_Text_16FEED, MSGBOX_SIGN
end
Route112_EventScript_15052E:: @ 815052E
- msgbox Route112_Text_16FF19, 3
+ msgbox Route112_Text_16FF19, MSGBOX_SIGN
end
Route112_EventScript_150537:: @ 8150537
- msgbox Route112_Text_16FF64, 3
+ msgbox Route112_Text_16FF64, MSGBOX_SIGN
end
Route112_EventScript_150540:: @ 8150540
- msgbox Route112_Text_16FE7A, 2
+ msgbox Route112_Text_16FE7A, MSGBOX_NPC
end
Route112_EventScript_150549:: @ 8150549
- trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655
- msgbox Route112_Text_1BB667, 6
+ trainerbattle_single TRAINER_BRICE, Route112_Text_1BB619, Route112_Text_1BB655
+ msgbox Route112_Text_1BB667, MSGBOX_AUTOCLOSE
end
Route112_EventScript_150560:: @ 8150560
- trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707
+ trainerbattle_single TRAINER_TRENT_1, Route112_Text_1BB6A0, Route112_Text_1BB707
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route112_EventScript_150587
- msgbox Route112_Text_1BB721, 6
+ msgbox Route112_Text_1BB721, MSGBOX_AUTOCLOSE
end
Route112_EventScript_150587:: @ 8150587
- trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801
- msgbox Route112_Text_1BB819, 6
+ trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_1BB7C7, Route112_Text_1BB801
+ msgbox Route112_Text_1BB819, MSGBOX_AUTOCLOSE
end
Route112_EventScript_15059E:: @ 815059E
- trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6
- msgbox Route112_Text_1BB8BE, 6
+ trainerbattle_single TRAINER_LARRY, Route112_Text_1BB893, Route112_Text_1BB8B6
+ msgbox Route112_Text_1BB8BE, MSGBOX_AUTOCLOSE
end
Route112_EventScript_1505B5:: @ 81505B5
- trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942
- msgbox Route112_Text_1BB958, 6
+ trainerbattle_single TRAINER_CAROL, Route112_Text_1BB8F0, Route112_Text_1BB942
+ msgbox Route112_Text_1BB958, MSGBOX_AUTOCLOSE
end