summaryrefslogtreecommitdiff
path: root/data/maps/Route110_TrickHousePuzzle6/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route110_TrickHousePuzzle6/scripts.inc')
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/scripts.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 3378dc50b..46b2f0f5a 100644
--- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
@@ -1,6 +1,6 @@
Route110_TrickHousePuzzle6_MapScripts:: @ 81630CD
- map_script 3, Route110_TrickHousePuzzle6_MapScript1_1630D8
- map_script 4, Route110_TrickHousePuzzle6_MapScript2_1630DC
+ map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_1630D8
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_1630DC
.byte 0
Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8
@@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC
end
Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107
- trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6
- msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6
+ trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6
+ msgbox Route110_TrickHousePuzzle6_Text_19DCE7, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E
- trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83
- msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6
+ trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83
+ msgbox Route110_TrickHousePuzzle6_Text_19DD96, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135
- trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE
- msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6
+ trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE
+ msgbox Route110_TrickHousePuzzle6_Text_19DE44, MSGBOX_AUTOCLOSE
end