diff options
Diffstat (limited to 'data/maps/SeafloorCavern_Entrance/scripts.inc')
-rw-r--r-- | data/maps/SeafloorCavern_Entrance/scripts.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index e10b52d00..b9ff722e6 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,16 +1,16 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E - map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474 + map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_OnResume .byte 0 -SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 +SeafloorCavern_Entrance_OnResume: @ 8234474 setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end -SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 +SeafloorCavern_Entrance_EventScript_Grunt:: @ 8234485 lockall compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 - goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED + goto_if_eq SeafloorCavern_Entrance_EventScript_GruntSpeechShort waitse playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -19,51 +19,51 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 waitmovement 0 delay 20 compare VAR_FACING, DIR_WEST - call_if_eq SeafloorCavern_Entrance_EventScript_23452E + call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest compare VAR_FACING, DIR_EAST - call_if_eq SeafloorCavern_Entrance_EventScript_234523 + call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast compare VAR_FACING, DIR_NORTH - call_if_eq SeafloorCavern_Entrance_EventScript_234539 + call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth delay 30 setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 copyobjectxytoperm 1 - msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT + msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED +SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: @ 82344ED compare VAR_FACING, DIR_WEST - call_if_eq SeafloorCavern_Entrance_EventScript_23452E + call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest compare VAR_FACING, DIR_EAST - call_if_eq SeafloorCavern_Entrance_EventScript_234523 + call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast compare VAR_FACING, DIR_NORTH - call_if_eq SeafloorCavern_Entrance_EventScript_234539 - msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT + call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth + msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 +SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast:: @ 8234523 applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E +SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest:: @ 823452E applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 +SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth:: @ 8234539 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -SeafloorCavern_Entrance_Text_234544: @ 8234544 +SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: @ 8234544 .string "Hey!\n" .string "I remember your face!\p" .string "If you're here, it must mean that\n" @@ -79,7 +79,7 @@ SeafloorCavern_Entrance_Text_234544: @ 8234544 .string "That bunch of goons, they sure don't\n" .string "look good near the sea!$" -SeafloorCavern_Entrance_Text_2346C8: @ 82346C8 +SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort: @ 82346C8 .string "A punk like you, do you really think\n" .string "you can take on TEAM AQUA?\p" .string "I'd say you're too early by about\n" |