diff options
Diffstat (limited to 'data/maps/SevenIsland_House_Room1/scripts.inc')
| -rw-r--r-- | data/maps/SevenIsland_House_Room1/scripts.inc | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index f136b8de2..60183ed13 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,18 +1,18 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A - map_script 3, SevenIsland_House_Room1_MapScript1_170895 - map_script 2, SevenIsland_House_Room1_MapScript2_1708CF + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame .byte 0 -SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 +SevenIsland_House_Room1_OnTransition:: @ 8170895 special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_1708AF - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if ne, EventScript_1708C3 + compare VAR_RESULT, 0 + call_if_eq EventScript_1708AF + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 + call_if_ne EventScript_1708C3 end EventScript_1708AF:: @ 81708AF - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C @@ -23,7 +23,7 @@ EventScript_1708C3:: @ 81708C3 setobjectmovementtype 1, 10 return -SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF +SevenIsland_House_Room1_OnFrame:: @ 81708CF map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9 @@ -32,19 +32,19 @@ SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF EventScript_1708E9:: @ 1708E9 lockall textcolor 1 - applymovement 255, Movement_170953 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170953 waitmovement 0 applymovement 1, Movement_170955 waitmovement 0 moveobjectoffscreen 1 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if eq, EventScript_170938 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if eq, EventScript_170941 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if eq, EventScript_17094A + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 + call_if_eq EventScript_170938 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 + call_if_eq EventScript_170941 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 + call_if_eq EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall @@ -63,22 +63,22 @@ EventScript_17094A:: @ 817094A return Movement_170953:: @ 8170953 - step_10 + walk_down step_end Movement_170955:: @ 8170955 - step_13 - step_2d + walk_right + walk_in_place_fastest_down step_end SevenIsland_House_Room1_EventScript_170958:: @ 8170958 lock faceplayer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_17097D - compare_var_to_value VAR_0x4001, 1 - goto_if eq, EventScript_170987 + compare VAR_RESULT, 1 + call_if_eq EventScript_17097D + compare VAR_TEMP_1, 1 + goto_if_eq EventScript_170987 msgbox gUnknown_81A049B release end @@ -92,28 +92,28 @@ EventScript_170987:: @ 8170987 special SavePlayerParty special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + compare VAR_RESULT, NO + goto_if_eq EventScript_170A11 call EventScript_170A1E - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + compare VAR_RESULT, 0 + goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + compare VAR_RESULT, NO + goto_if_eq EventScript_170A11 special LoadPlayerParty - call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + call EventScript_AskSaveGame + compare VAR_RESULT, 0 + goto_if_eq EventScript_170A11 special SavePlayerParty special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_170A2D - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_170A3F - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_170A51 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_170A2D + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_170A3F + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release @@ -127,57 +127,57 @@ EventScript_170A11:: @ 8170A11 EventScript_170A1E:: @ 8170A1E msgbox gUnknown_81A06AB - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate return EventScript_170A2D:: @ 8170A2D applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A63 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A63 waitmovement 0 return EventScript_170A3F:: @ 8170A3F applymovement VAR_LAST_TALKED, Movement_170A72 - applymovement 255, Movement_170A67 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A67 waitmovement 0 return EventScript_170A51:: @ 8170A51 applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A6B + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A6B waitmovement 0 return Movement_170A63:: @ 8170A63 - step_1c - step_11 - step_11 + delay_16 + walk_up + walk_up step_end Movement_170A67:: @ 8170A67 - step_1c - step_13 - step_11 + delay_16 + walk_right + walk_up step_end Movement_170A6B:: @ 8170A6B - step_1c - step_12 - step_11 + delay_16 + walk_left + walk_up step_end Movement_170A6F:: @ 8170A6F - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_170A72:: @ 8170A72 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 - msgbox gUnknown_81A0567, 3 + msgbox gUnknown_81A0567, MSGBOX_SIGN end |