summaryrefslogtreecommitdiff
path: root/data/maps/SeafoamIslands_B3F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SeafoamIslands_B3F/scripts.inc')
-rw-r--r--data/maps/SeafoamIslands_B3F/scripts.inc34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc
index e54e7ceb7..c566ab522 100644
--- a/data/maps/SeafoamIslands_B3F/scripts.inc
+++ b/data/maps/SeafoamIslands_B3F/scripts.inc
@@ -4,24 +4,24 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F
.byte 0
SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A
- checkflag FLAG_0x2D2
- call_if 0, EventScript_162F6D
- checkflag FLAG_0x2D2
- call_if 1, EventScript_162F94
+ checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
+ call_if FALSE, EventScript_162F6D
+ checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
+ call_if TRUE, EventScript_162F94
end
EventScript_162F6D:: @ 8162F6D
setvar VAR_0x4002, 0
- checkflag FLAG_0x046
- call_if 0, EventScript_162FF0
- checkflag FLAG_0x047
- call_if 0, EventScript_162FF0
+ 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 1, EventScript_162F90
+ call_if eq, EventScript_162F90
return
EventScript_162F90:: @ 8162F90
- setflag FLAG_0x2D2
+ setflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
return
EventScript_162F94:: @ 8162F94
@@ -35,17 +35,17 @@ SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98
EventScript_162FA2:: @ 8162FA2
lockall
setvar VAR_0x4002, 0
- checkflag FLAG_0x046
- call_if 0, EventScript_162FF0
- checkflag FLAG_0x047
- call_if 0, EventScript_162FF0
+ 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
+ goto_if eq, EventScript_16300C
getplayerxy VAR_0x8008, VAR_0x8009
compare_var_to_value VAR_0x8008, 24
- call_if 0, EventScript_162FF6
+ call_if lt, EventScript_162FF6
compare_var_to_value VAR_0x8008, 24
- call_if 4, EventScript_163001
+ call_if ge, EventScript_163001
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1
warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21
waitstate