summaryrefslogtreecommitdiff
path: root/data/maps/Route110_TrickHousePuzzle1/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route110_TrickHousePuzzle1/scripts.inc')
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/scripts.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index dc66b71f4..55b35f0bd 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8
- map_script 1, Route110_TrickHousePuzzle1_MapScript1_161CFE
+ map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_161CFE
.byte 0
Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE
@@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26
end
Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31
- trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93
- msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6
+ trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93
+ msgbox Route110_TrickHousePuzzle1_Text_19CBAB, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48
- trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06
- msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6
+ trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06
+ msgbox Route110_TrickHousePuzzle1_Text_19CC1B, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F
- trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86
- msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6
+ trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86
+ msgbox Route110_TrickHousePuzzle1_Text_19CCAA, MSGBOX_AUTOCLOSE
end