diff options
Diffstat (limited to 'data/maps/AquaHideout_B2F/scripts.inc')
| -rw-r--r-- | data/maps/AquaHideout_B2F/scripts.inc | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 519c799fc..2ec8d5176 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,9 +1,9 @@ AquaHideout_B2F_MapScripts:: @ 815D8B1 - map_script 3, AquaHideout_B2F_MapScript1_15D8B7 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_15D8B7 .byte 0 AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 - call AquaHideout_B2F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD @@ -11,12 +11,12 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0833 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 .ifdef SAPPHIRE - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, Common_Movement_FacePlayer .else - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestUp .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -25,8 +25,8 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD - msgbox AquaHideout_B2F_Text_1971AE, 4 + trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_1, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + msgbox AquaHideout_B2F_Text_1971AE, MSGBOX_DEFAULT release end @@ -38,20 +38,20 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD setvar VAR_0x8009, 3 .endif .ifdef SAPPHIRE - applymovement VAR_0x8008, Movement_1A083F + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft .else - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestRight .endif waitmovement 0 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 - msgbox AquaHideout_B2F_Text_197162, 4 + msgbox AquaHideout_B2F_Text_197162, MSGBOX_DEFAULT closemessage .ifdef SAPPHIRE - applymovement VAR_0x8008, Movement_1A083F + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft .else - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestRight .endif .ifdef SAPPHIRE applymovement VAR_0x8009, AquaHideout_B2F_Movement_15D958 @@ -61,9 +61,9 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 - msgbox AquaHideout_B2F_Text_1971AE, 4 + msgbox AquaHideout_B2F_Text_1971AE, MSGBOX_DEFAULT setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE setflag FLAG_HIDE_GRUNTS_LILYCOVE release @@ -74,28 +74,28 @@ AquaHideout_B2F_Movement_15D958:: @ 815D958 walk_left walk_left walk_left - end_movement + step_end AquaHideout_B2F_Movement_15D95D:: @ 815D95D walk_right walk_right walk_right walk_right - end_movement + step_end AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D - msgbox AquaHideout_B2F_Text_1972D2, 6 + trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_2, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + msgbox AquaHideout_B2F_Text_1972D2, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_15D97D:: @ 815D97D - msgbox AquaHideout_B2F_Text_1972D2, 4 + msgbox AquaHideout_B2F_Text_1972D2, MSGBOX_DEFAULT release end AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 - msgbox AquaHideout_B2F_Text_1973C0, 6 + trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_3, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + msgbox AquaHideout_B2F_Text_1973C0, MSGBOX_AUTOCLOSE end |