summaryrefslogtreecommitdiff
path: root/data/maps/SeafoamIslands_B4F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SeafoamIslands_B4F/scripts.inc')
-rw-r--r--data/maps/SeafoamIslands_B4F/scripts.inc160
1 files changed, 75 insertions, 85 deletions
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
index 8d69a4808..c18472399 100644
--- a/data/maps/SeafoamIslands_B4F/scripts.inc
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -1,40 +1,34 @@
SeafoamIslands_B4F_MapScripts:: @ 816302E
- map_script 3, SeafoamIslands_B4F_MapScript1_163066
- map_script 5, SeafoamIslands_B4F_MapScript2_163048
- map_script 1, SeafoamIslands_B4F_MapScript3_1630B1
- map_script 4, SeafoamIslands_B4F_MapScript4_1630E7
- map_script 2, SeafoamIslands_B4F_MapScript5_1630F9
+ map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition
+ map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume
+ map_script MAP_SCRIPT_ON_LOAD, SeafoamIslands_B4F_OnLoad
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SeafoamIslands_B4F_OnWarp
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B4F_OnFrame
.byte 0
-SeafoamIslands_B4F_MapScript2_163048:: @ 8163048
- checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
- call_if TRUE, EventScript_163052
+SeafoamIslands_B4F_OnResume:: @ 8163048
+ call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163052
end
EventScript_163052:: @ 8163052
specialvar VAR_RESULT, Special_GetBattleOutcome
- compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
- goto_if ne, EventScript_1A77A9
+ compare VAR_RESULT, B_OUTCOME_CAUGHT
+ goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
-SeafoamIslands_B4F_MapScript1_163066:: @ 8163066
- checkflag FLAG_FOUGHT_ARTICUNO
- call_if FALSE, EventScript_1630AD
- checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
- call_if FALSE, EventScript_163082
- checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
- call_if TRUE, EventScript_1630A9
+SeafoamIslands_B4F_OnTransition:: @ 8163066
+ call_if_unset FLAG_FOUGHT_ARTICUNO, EventScript_1630AD
+ call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_163082
+ call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_1630A9
end
EventScript_163082:: @ 8163082
- setvar VAR_0x4002, 0
- checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1
- call_if FALSE, EventScript_163169
- checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
- call_if FALSE, EventScript_163169
- compare_var_to_value VAR_0x4002, 2
- call_if eq, EventScript_1630A5
+ setvar VAR_TEMP_2, 0
+ call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
+ call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
+ compare VAR_TEMP_2, 2
+ call_if_eq EventScript_1630A5
return
EventScript_1630A5:: @ 81630A5
@@ -49,14 +43,12 @@ EventScript_1630AD:: @ 81630AD
clearflag FLAG_HIDE_ARTICUNO
return
-SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1
- setvar VAR_0x4002, 0
- checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1
- call_if FALSE, EventScript_163169
- checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
- call_if FALSE, EventScript_163169
- compare_var_to_value VAR_0x4002, 2
- goto_if eq, EventScript_1630D4
+SeafoamIslands_B4F_OnLoad:: @ 81630B1
+ setvar VAR_TEMP_2, 0
+ call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
+ call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
+ compare VAR_TEMP_2, 2
+ goto_if_eq EventScript_1630D4
end
EventScript_1630D4:: @ 81630D4
@@ -64,108 +56,106 @@ EventScript_1630D4:: @ 81630D4
setmetatile 13, 14, 299, 0
end
-SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7
+SeafoamIslands_B4F_OnWarp:: @ 81630E7
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1
.2byte 0
EventScript_1630F1:: @ 81630F1
- turnobject 255, 2
+ turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
special Special_ForcePlayerToStartSurfing
end
-SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9
+SeafoamIslands_B4F_OnFrame:: @ 81630F9
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B
- map_script_2 VAR_0x4001, 1, EventScript_163121
+ map_script_2 VAR_TEMP_1, 1, EventScript_163121
.2byte 0
EventScript_16310B:: @ 816310B
lockall
- applymovement 255, Movement_16311D
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_16311D
waitmovement 0
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0
releaseall
end
Movement_16311D:: @ 816311D
- step_1e
- step_1e
- step_1e
+ walk_fast_up
+ walk_fast_up
+ walk_fast_up
step_end
EventScript_163121:: @ 8163121
lockall
- setvar VAR_0x4002, 0
- checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1
- call_if FALSE, EventScript_163169
- checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
- call_if FALSE, EventScript_163169
- compare_var_to_value VAR_0x4002, 2
- goto_if eq, EventScript_163185
+ setvar VAR_TEMP_2, 0
+ call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
+ call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
+ compare VAR_TEMP_2, 2
+ goto_if_eq EventScript_163185
getplayerxy VAR_0x8008, VAR_0x8009
- compare_var_to_value VAR_0x8008, 9
- call_if lt, EventScript_16316F
- compare_var_to_value VAR_0x8008, 9
- call_if ge, EventScript_16317A
+ compare VAR_0x8008, 9
+ call_if_lt EventScript_16316F
+ compare VAR_0x8008, 9
+ call_if_ge EventScript_16317A
special sub_805D1A8
- setvar VAR_0x4001, 0
+ setvar VAR_TEMP_1, 0
releaseall
end
EventScript_163169:: @ 8163169
- addvar VAR_0x4002, 1
+ addvar VAR_TEMP_2, 1
return
EventScript_16316F:: @ 816316F
- applymovement 255, Movement_16318C
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_16318C
waitmovement 0
return
EventScript_16317A:: @ 816317A
- applymovement 255, Movement_163195
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_163195
waitmovement 0
return
EventScript_163185:: @ 8163185
- setvar VAR_0x4001, 0
+ setvar VAR_TEMP_1, 0
releaseall
end
Movement_16318C:: @ 816318C
- step_11
- step_11
- step_11
- step_13
- step_13
- step_13
- step_13
- step_11
+ walk_up
+ walk_up
+ walk_up
+ walk_right
+ walk_right
+ walk_right
+ walk_right
+ walk_up
step_end
Movement_163195:: @ 8163195
- step_11
- step_11
- step_11
- step_13
- step_13
- step_13
- step_11
+ walk_up
+ walk_up
+ walk_up
+ walk_right
+ walk_right
+ walk_right
+ walk_up
step_end
SeafoamIslands_B4F_EventScript_16319D:: @ 816319D
lockall
- applymovement 255, Movement_1631AA
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_1631AA
waitmovement 0
releaseall
end
Movement_1631AA:: @ 81631AA
- step_11
+ walk_up
step_end
SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
special sub_8110AB4
- compare_var_to_value VAR_RESULT, 2
- goto_if eq, EventScript_1A7AE0
+ compare VAR_RESULT, 2
+ goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -183,34 +173,34 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
- compare_var_to_value VAR_RESULT, B_OUTCOME_WON
- goto_if eq, EventScript_16320F
- compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
- goto_if eq, EventScript_163218
- compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
- goto_if eq, EventScript_163218
+ compare VAR_RESULT, B_OUTCOME_WON
+ goto_if_eq EventScript_16320F
+ compare VAR_RESULT, B_OUTCOME_RAN
+ goto_if_eq EventScript_163218
+ compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+ goto_if_eq EventScript_163218
setflag FLAG_FOUGHT_ARTICUNO
release
end
EventScript_16320F:: @ 816320F
setflag FLAG_FOUGHT_ARTICUNO
- goto EventScript_1A922D
+ goto EventScript_RemoveStaticMon
EventScript_163217:: @ 8163217
end
EventScript_163218:: @ 8163218
setvar VAR_0x8004, SPECIES_ARTICUNO
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
EventScript_163222:: @ 8163222
end
SeafoamIslands_B4F_EventScript_163223:: @ 8163223
- msgbox gUnknown_8179B36, 3
+ msgbox gUnknown_8179B36, MSGBOX_SIGN
end
SeafoamIslands_B4F_EventScript_16322C:: @ 816322C
- msgbox gUnknown_8179B65, 3
+ msgbox gUnknown_8179B65, MSGBOX_SIGN
end