diff options
Diffstat (limited to 'data/maps/SevenIsland_House_Room2/scripts.inc')
| -rw-r--r-- | data/maps/SevenIsland_House_Room2/scripts.inc | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 0ca956c55..8d0ef3475 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -1,19 +1,19 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E - map_script 3, SevenIsland_House_Room2_MapScript1_170A89 - map_script 2, SevenIsland_House_Room2_MapScript2_170A8D + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room2_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room2_OnFrame .byte 0 -SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 +SevenIsland_House_Room2_OnTransition:: @ 8170A89 special SetEReaderTrainerGfxId end -SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D - map_script_2 VAR_0x4001, 0, EventScript_170A97 +SevenIsland_House_Room2_OnFrame:: @ 8170A8D + map_script_2 VAR_TEMP_1, 0, EventScript_170A97 .2byte 0 EventScript_170A97:: @ 8170A97 lockall - applymovement 255, Movement_170B22 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170B22 waitmovement 0 special PrintEReaderTrainerGreeting msgbox gStringVar4 @@ -22,18 +22,18 @@ EventScript_170A97:: @ 8170A97 setvar VAR_0x8005, 0 special StartSpecialBattle waitstate - compare_var_to_value VAR_RESULT, 3 - call_if eq, EventScript_170AFE - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_170B0C - compare_var_to_value VAR_RESULT, 2 - call_if eq, EventScript_170B17 + compare VAR_RESULT, 3 + call_if_eq EventScript_170AFE + compare VAR_RESULT, 1 + call_if_eq EventScript_170B0C + compare VAR_RESULT, 2 + call_if_eq EventScript_170B17 closemessage special HealPlayerParty - applymovement 255, Movement_170B28 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 waitstate releaseall @@ -59,19 +59,19 @@ EventScript_170B17:: @ 8170B17 return Movement_170B22:: @ 8170B22 - step_10 - step_10 - step_10 - step_13 - step_13 + walk_down + walk_down + walk_down + walk_right + walk_right step_end Movement_170B28:: @ 8170B28 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_1b + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 step_end |