diff options
Diffstat (limited to 'data/maps/SeafoamIslands_B3F/scripts.inc')
| -rw-r--r-- | data/maps/SeafoamIslands_B3F/scripts.inc | 106 |
1 files changed, 50 insertions, 56 deletions
diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index c566ab522..13c6b606a 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -1,23 +1,19 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F - map_script 3, SeafoamIslands_B3F_MapScript1_162F5A - map_script 2, SeafoamIslands_B3F_MapScript2_162F98 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B3F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B3F_OnFrame .byte 0 -SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if FALSE, EventScript_162F6D - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if TRUE, EventScript_162F94 +SeafoamIslands_B3F_OnTransition:: @ 8162F5A + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F6D + call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D - setvar VAR_0x4002, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 - call_if eq, EventScript_162F90 + setvar VAR_TEMP_2, 0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 + compare VAR_TEMP_2, 2 + call_if_eq EventScript_162F90 return EventScript_162F90:: @ 8162F90 @@ -28,24 +24,22 @@ EventScript_162F94:: @ 8162F94 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC return -SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 - map_script_2 VAR_0x4001, 1, EventScript_162FA2 +SeafoamIslands_B3F_OnFrame:: @ 8162F98 + map_script_2 VAR_TEMP_1, 1, EventScript_162FA2 .2byte 0 EventScript_162FA2:: @ 8162FA2 lockall - setvar VAR_0x4002, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 - goto_if eq, EventScript_16300C + setvar VAR_TEMP_2, 0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 + compare VAR_TEMP_2, 2 + goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 24 - call_if lt, EventScript_162FF6 - compare_var_to_value VAR_0x8008, 24 - call_if ge, EventScript_163001 + compare VAR_0x8008, 24 + call_if_lt EventScript_162FF6 + compare VAR_0x8008, 24 + call_if_ge EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate @@ -53,51 +47,51 @@ EventScript_162FA2:: @ 8162FA2 end EventScript_162FF0:: @ 8162FF0 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return EventScript_162FF6:: @ 8162FF6 - applymovement 255, Movement_163013 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163013 waitmovement 0 return EventScript_163001:: @ 8163001 - applymovement 255, Movement_163021 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163021 waitmovement 0 return EventScript_16300C:: @ 816300C - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end Movement_163013:: @ 8163013 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163021:: @ 8163021 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end |